cuda : rename build flag to LLAMA_CUDA (llama/6299)

ggerganov · Mar 27, 2024 · f6c3719 · f6c3719
1 parent f3ae686
commit f6c3719
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/ggml/ggml.h b/include/ggml/ggml.h
@@ -2354,7 +2354,7 @@ extern "C" {
  GGML_API int ggml_cpu_has_fp16_va (void);
  GGML_API int ggml_cpu_has_wasm_simd (void);
  GGML_API int ggml_cpu_has_blas (void);
- GGML_API int ggml_cpu_has_cublas (void);
+ GGML_API int ggml_cpu_has_cuda  (void);
  GGML_API int ggml_cpu_has_clblast (void);
  GGML_API int ggml_cpu_has_vulkan (void);
  GGML_API int ggml_cpu_has_kompute (void);

diff --git a/src/ggml-backend.c b/src/ggml-backend.c
@@ -420,7 +420,7 @@ GGML_CALL static void ggml_backend_registry_init(void) {
  ggml_backend_register("CPU", ggml_backend_reg_cpu_init, ggml_backend_cpu_buffer_type(), NULL);
 
  // add forward decls here to avoid including the backend headers
-#ifdef GGML_USE_CUBLAS
+#ifdef GGML_USE_CUDA
  extern GGML_CALL void ggml_backend_cuda_reg_devices(void);
  ggml_backend_cuda_reg_devices();
 #endif

diff --git a/src/ggml.c b/src/ggml.c
@@ -21674,15 +21674,15 @@ int ggml_cpu_has_wasm_simd(void) {
 }
 
 int ggml_cpu_has_blas(void) {
-#if defined(GGML_USE_ACCELERATE) || defined(GGML_USE_OPENBLAS) || defined(GGML_USE_CUBLAS) || defined(GGML_USE_VULKAN) || defined(GGML_USE_CLBLAST) || defined(GGML_USE_SYCL)
+#if defined(GGML_USE_ACCELERATE) || defined(GGML_USE_OPENBLAS) || defined(GGML_USE_CUDA) || defined(GGML_USE_VULKAN) || defined(GGML_USE_CLBLAST) || defined(GGML_USE_SYCL)
  return 1;
 #else
  return 0;
 #endif
 }
 
-int ggml_cpu_has_cublas(void) {
-#if defined(GGML_USE_CUBLAS)
+int ggml_cpu_has_cuda(void) {
+#if defined(GGML_USE_CUDA)
  return 1;
 #else
  return 0;
@@ -21722,7 +21722,7 @@ int ggml_cpu_has_sycl(void) {
 }
 
 int ggml_cpu_has_gpublas(void) {
- return ggml_cpu_has_cublas() || ggml_cpu_has_clblast() || ggml_cpu_has_vulkan() || ggml_cpu_has_kompute() ||
+ return ggml_cpu_has_cuda() || ggml_cpu_has_clblast() || ggml_cpu_has_vulkan() || ggml_cpu_has_kompute() ||
  ggml_cpu_has_sycl();
 }