Skip to content

Commit 20700b6

Browse files
JohannesGaesslermglambda
authored andcommitted
CUDA: fix CUDART_VERSION checks (ggml-org#11821)
1 parent 2a15c4d commit 20700b6

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

ggml/src/ggml-cuda/common.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ static const char * cu_get_error_str(CUresult err) {
165165
#define CU_CHECK(err) CUDA_CHECK_GEN(err, CUDA_SUCCESS, cu_get_error_str)
166166
#endif
167167

168-
#if CUDART_VERSION >= 11100 || defined(GGML_USE_MUSA)
168+
#if CUDART_VERSION >= 11010 || defined(GGML_USE_MUSA)
169169
#define GGML_CUDA_ASSUME(x) __builtin_assume(x)
170170
#else
171171
#define GGML_CUDA_ASSUME(x)
172-
#endif // CUDART_VERSION >= 11100
172+
#endif // CUDART_VERSION >= 11010
173173

174174
#ifdef GGML_CUDA_F16
175175
typedef half dfloat; // dequantize float

ggml/src/ggml-cuda/ggml-cuda.cu

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2840,7 +2840,7 @@ bool ggml_backend_cuda_register_host_buffer(void * buffer, size_t size) {
28402840
return false;
28412841
}
28422842

2843-
#if CUDART_VERSION >= 11100 || defined(GGML_USE_MUSA)
2843+
#if CUDART_VERSION >= 11010 || defined(GGML_USE_MUSA)
28442844
cudaError_t err = cudaHostRegister(buffer, size, cudaHostRegisterPortable | cudaHostRegisterReadOnly);
28452845
if (err != cudaSuccess) {
28462846
// clear the error
@@ -2852,8 +2852,10 @@ bool ggml_backend_cuda_register_host_buffer(void * buffer, size_t size) {
28522852
}
28532853
return true;
28542854
#else
2855+
GGML_UNUSED(buffer);
2856+
GGML_UNUSED(size);
28552857
return false;
2856-
#endif
2858+
#endif // CUDART_VERSION >= 11010 || defined(GGML_USE_MUSA)
28572859
}
28582860

28592861
void ggml_backend_cuda_unregister_host_buffer(void * buffer) {

ggml/src/ggml-cuda/sum.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#if !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA) && CUDART_VERSION >= 11700
1+
#if !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA) && CUDART_VERSION >= 11070
22
#define USE_CUB
3-
#endif // !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA) && CUDART_VERSION >= 11700
3+
#endif // !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA) && CUDART_VERSION >= 11070
44

55
#ifdef USE_CUB
66
#include <cub/cub.cuh>

0 commit comments

Comments
 (0)