From: Johannes Gäßler <redacted>
Date: Tue, 16 Jul 2024 19:20:59 +0000 (+0200)
Subject: make/cmake: add missing force MMQ/cuBLAS for HIP (#8515)
X-Git-Tag: upstream/0.0.4488~1082
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=5e116e8dd51775f8f1c090570be148d5d7eea6c3;p=pkg%2Fggml%2Fsources%2Fllama.cpp

make/cmake: add missing force MMQ/cuBLAS for HIP (#8515)
---

diff --git a/Makefile b/Makefile
index bec332ec..4584594a 100644
--- a/Makefile
+++ b/Makefile
@@ -795,6 +795,14 @@ ifdef GGML_CUDA_FORCE_DMMV
 	HIPFLAGS += -DGGML_CUDA_FORCE_DMMV
 endif # GGML_CUDA_FORCE_DMMV
 
+ifdef GGML_CUDA_FORCE_MMQ
+	HIPFLAGS += -DGGML_CUDA_FORCE_MMQ
+endif # GGML_CUDA_FORCE_MMQ
+
+ifdef GGML_CUDA_FORCE_CUBLAS
+	HIPFLAGS += -DGGML_CUDA_FORCE_CUBLAS
+endif # GGML_CUDA_FORCE_CUBLAS
+
 ifdef GGML_CUDA_NO_PEER_COPY
 	HIPFLAGS += -DGGML_CUDA_NO_PEER_COPY
 endif # GGML_CUDA_NO_PEER_COPY
diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
index 41e50ad2..cbadaf4d 100644
--- a/ggml/src/CMakeLists.txt
+++ b/ggml/src/CMakeLists.txt
@@ -440,6 +440,10 @@ if (GGML_HIPBLAS)
         add_compile_definitions(GGML_CUDA_FORCE_MMQ)
     endif()
 
+    if (GGML_CUDA_FORCE_CUBLAS)
+        add_compile_definitions(GGML_CUDA_FORCE_CUBLAS)
+    endif()
+
     if (GGML_CUDA_NO_PEER_COPY)
         add_compile_definitions(GGML_CUDA_NO_PEER_COPY)
     endif()