From: Georgi Gerganov <redacted>
Date: Mon, 19 Feb 2024 12:41:31 +0000 (+0200)
Subject: cmake : update CBLAS build flags (#0)
X-Git-Tag: upstream/0.0.1642~960
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=818eeb8a3be99125746a90ec63af8f51516a2ec6;p=pkg%2Fggml%2Fsources%2Fggml

cmake : update CBLAS build flags (#0)
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b1555dc1..8231a906 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -146,7 +146,7 @@ if (APPLE AND NOT GGML_NO_ACCELERATE)
         message(STATUS "Accelerate framework found")
 
         set(GGML_EXTRA_LIBS  ${GGML_EXTRA_LIBS}  ${ACCELERATE_FRAMEWORK})
-        set(GGML_EXTRA_FLAGS ${GGML_EXTRA_FLAGS} -DGGML_USE_ACCELERATE)
+        set(GGML_EXTRA_FLAGS ${GGML_EXTRA_FLAGS} -DGGML_USE_ACCELERATE -DACCELERATE_NEW_LAPACK -DACCELERATE_LAPACK_ILP64)
     else()
         message(WARNING "Accelerate framework not found")
     endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 754d6376..0d9b6bf3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -329,14 +329,9 @@ target_link_libraries(${TEST_TARGET} PRIVATE ggml)
 add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
 
 #
-# test-svd0 (arm/x86)
+# test-svd0 (x86)
 
-if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT GGML_NO_ACCELERATE)
-    set(TEST_TARGET test-svd0)
-    add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
-    target_link_libraries(${TEST_TARGET} PRIVATE ggml ${GGML_EXTRA_LIBS})
-    target_compile_options(${TEST_TARGET} PRIVATE ${GGML_EXTRA_FLAGS})
-elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86" AND GGML_OPENBLAS)
+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86" AND GGML_OPENBLAS)
     set(TEST_TARGET test-svd0)
     add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
     target_link_libraries(${TEST_TARGET} PRIVATE ggml ${GGML_EXTRA_LIBS})
diff --git a/tests/test-svd0.c b/tests/test-svd0.c
index 8160bd3b..bae414ed 100644
--- a/tests/test-svd0.c
+++ b/tests/test-svd0.c
@@ -11,10 +11,6 @@
 
 #include <sys/time.h>
 
-#ifdef GGML_USE_ACCELERATE
-#include <Accelerate/Accelerate.h>
-#endif
-
 float frand(void) {
     return (float) rand() / (float) RAND_MAX;
 }