JohannesGaessler commited on
Commit
04f123a
·
1 Parent(s): 86969ac

CUDA: fix CUDART_VERSION checks (llama/11821)

Browse files
ggml/src/ggml-cuda/common.cuh CHANGED
@@ -165,11 +165,11 @@ static const char * cu_get_error_str(CUresult err) {
165
  #define CU_CHECK(err) CUDA_CHECK_GEN(err, CUDA_SUCCESS, cu_get_error_str)
166
  #endif
167
 
168
- #if CUDART_VERSION >= 11100 || defined(GGML_USE_MUSA)
169
  #define GGML_CUDA_ASSUME(x) __builtin_assume(x)
170
  #else
171
  #define GGML_CUDA_ASSUME(x)
172
- #endif // CUDART_VERSION >= 11100
173
 
174
  #ifdef GGML_CUDA_F16
175
  typedef half dfloat; // dequantize float
 
165
  #define CU_CHECK(err) CUDA_CHECK_GEN(err, CUDA_SUCCESS, cu_get_error_str)
166
  #endif
167
 
168
+ #if CUDART_VERSION >= 11010 || defined(GGML_USE_MUSA)
169
  #define GGML_CUDA_ASSUME(x) __builtin_assume(x)
170
  #else
171
  #define GGML_CUDA_ASSUME(x)
172
+ #endif // CUDART_VERSION >= 11010
173
 
174
  #ifdef GGML_CUDA_F16
175
  typedef half dfloat; // dequantize float
ggml/src/ggml-cuda/ggml-cuda.cu CHANGED
@@ -2840,7 +2840,7 @@ bool ggml_backend_cuda_register_host_buffer(void * buffer, size_t size) {
2840
  return false;
2841
  }
2842
 
2843
- #if CUDART_VERSION >= 11100 || defined(GGML_USE_MUSA)
2844
  cudaError_t err = cudaHostRegister(buffer, size, cudaHostRegisterPortable | cudaHostRegisterReadOnly);
2845
  if (err != cudaSuccess) {
2846
  // clear the error
@@ -2852,8 +2852,10 @@ bool ggml_backend_cuda_register_host_buffer(void * buffer, size_t size) {
2852
  }
2853
  return true;
2854
  #else
 
 
2855
  return false;
2856
- #endif
2857
  }
2858
 
2859
  void ggml_backend_cuda_unregister_host_buffer(void * buffer) {
 
2840
  return false;
2841
  }
2842
 
2843
+ #if CUDART_VERSION >= 11010 || defined(GGML_USE_MUSA)
2844
  cudaError_t err = cudaHostRegister(buffer, size, cudaHostRegisterPortable | cudaHostRegisterReadOnly);
2845
  if (err != cudaSuccess) {
2846
  // clear the error
 
2852
  }
2853
  return true;
2854
  #else
2855
+ GGML_UNUSED(buffer);
2856
+ GGML_UNUSED(size);
2857
  return false;
2858
+ #endif // CUDART_VERSION >= 11010 || defined(GGML_USE_MUSA)
2859
  }
2860
 
2861
  void ggml_backend_cuda_unregister_host_buffer(void * buffer) {
ggml/src/ggml-cuda/sum.cu CHANGED
@@ -1,6 +1,6 @@
1
- #if !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA) && CUDART_VERSION >= 11700
2
  #define USE_CUB
3
- #endif // !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA) && CUDART_VERSION >= 11700
4
 
5
  #ifdef USE_CUB
6
  #include <cub/cub.cuh>
 
1
+ #if !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA) && CUDART_VERSION >= 11070
2
  #define USE_CUB
3
+ #endif // !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA) && CUDART_VERSION >= 11070
4
 
5
  #ifdef USE_CUB
6
  #include <cub/cub.cuh>