cmake : update CBLAS build flags (#0)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b1555dc1c3e14e442effb8df8c592ac84c0c03bd..8231a906c49d10b895f4bacc201bd4c37dde352d 100644 (file)
--- 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 754d63765b9dc7dd7c69abd610ee153900344ee3..0d9b6bf304fca58bc2e5d85da576058e66f16fb8 100644 (file)
--- 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 8160bd3b9c7780197ba2c37177d0ae738d84a264..bae414ed478c5a2b2f31128742729c15cbf48e07 100644 (file)
--- 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;
 }