fix: Enable CUDA backend for llava. Closes #1324

abetlen · abetlen · commit 7f59856fa6f3 · 2024-05-10T10:18:47.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,8 +51,9 @@ if (LLAMA_BUILD)
     )
 
     if (LLAVA_BUILD)
-        if (LLAMA_CUBLAS)
+        if (LLAMA_CUBLAS OR LLAMA_CUDA)
             add_compile_definitions(GGML_USE_CUBLAS)
+            add_compile_definitions(GGML_USE_CUDA)
         endif()
 
         if (LLAMA_METAL)
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ build.debug:
 	CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug" python3 -m pip install --verbose --config-settings=cmake.verbose=true --config-settings=logging.level=INFO --config-settings=install.strip=false  --editable .
 
 build.cuda:
-	CMAKE_ARGS="-DLLAMA_CUBLAS=on" python3 -m pip install --verbose -e .
+	CMAKE_ARGS="-DLLAMA_CUDA=on" python3 -m pip install --verbose -e .
 
 build.opencl:
 	CMAKE_ARGS="-DLLAMA_CLBLAST=on" python3 -m pip install --verbose -e .

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,9 @@ if (LLAMA_BUILD)`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`if (LLAVA_BUILD)`
`54`		`- if (LLAMA_CUBLAS)`
	`54`	`+ if (LLAMA_CUBLAS OR LLAMA_CUDA)`
`55`	`55`	`add_compile_definitions(GGML_USE_CUBLAS)`
	`56`	`+ add_compile_definitions(GGML_USE_CUDA)`
`56`	`57`	`endif()`
`57`	`58`
`58`	`59`	`if (LLAMA_METAL)`