vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

squash! cuda : suppress 'noreturn' warn in no_device_code

Browse source 
Update __trap macro instead of using a while loop to suppress the
warning.

Signed-off-by: Daniel Bevenius <daniel.bevenius@gmail.com>
This commit is contained in:
Daniel Bevenius 2024-07-11 16:26:32 +02:00
parent bb1bd5e2b7
commit 301afaa6df
Failed to extract signature
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ggml/src/ggml-cuda/common.cuh
View file

@ -104,7 +104,7 @@
#define cudaStreamWaitEvent(stream, event, flags) hipStreamWaitEvent(stream, event, flags)
#define cudaStream_t hipStream_t
#define cudaSuccess hipSuccess
#define __trap abort
#define __trap() do { abort(); __builtin_unreachable(); } while(0)
#define CUBLAS_STATUS_SUCCESS HIPBLAS_STATUS_SUCCESS
#define CUBLAS_STATUS_NOT_INITIALIZED HIPBLAS_STATUS_NOT_INITIALIZED
#define CUBLAS_STATUS_ALLOC_FAILED HIPBLAS_STATUS_ALLOC_FAILED
@ -342,9 +342,6 @@ static __device__ void no_device_code(
#endif // defined(GGML_USE_HIPBLAS) && defined(__HIP_PLATFORM_AMD__)
__trap();
// Suppress "function declared 'noreturn' but has a return statement" warning.
while(true);
GGML_UNUSED(no_device_code); // suppress unused function warning
}