From 5e116e8dd51775f8f1c090570be148d5d7eea6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Tue, 16 Jul 2024 21:20:59 +0200 Subject: [PATCH] make/cmake: add missing force MMQ/cuBLAS for HIP (#8515) --- Makefile | 8 ++++++++ ggml/src/CMakeLists.txt | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Makefile b/Makefile index bec332ec57b55..4584594af4174 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 41e50ad2c9e33..cbadaf4d931c3 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()