Minor fixes

diff --git a/examples/whisper/main.cpp b/examples/whisper/main.cpp
index 43838cf5bba439c6561a79cce80358f31d07e959..b913522ed77d51dc81eef4a7dbb7572370b046ae 100644 (file)
--- a/examples/whisper/main.cpp
+++ b/examples/whisper/main.cpp
@@ -21,7 +21,7 @@ std::string to_timestamp(int64_t t) {
     msec = msec - min * (1000 * 60);
     int64_t sec = msec / 1000;
     msec = msec - sec * 1000;
-    
+
     char buf[32];
     snprintf(buf, sizeof(buf), "%02d:%02d:%02d.%03d", (int) hr, (int) min, (int) sec, (int) msec);
 

diff --git a/examples/whisper/whisper.cpp b/examples/whisper/whisper.cpp
index a316b1ba9bbf8595b1cce6f9e0a47dfa6c00128e..1826ce960c7a7206bd98b5c414d313fa09314b52 100644 (file)
--- a/examples/whisper/whisper.cpp
+++ b/examples/whisper/whisper.cpp
@@ -149,7 +149,7 @@ static const std::map<e_model, size_t> MEM_REQ_ENCODE = {
 
 static const std::map<e_model, size_t> MEM_REQ_ENCODE_LAYER = {
     { MODEL_TINY,    104ull*MB },
-    { MODEL_BASE,    136ull*MB },
+    { MODEL_BASE,    138ull*MB },
     { MODEL_SMALL,   208ull*MB },
     { MODEL_MEDIUM,  280ull*MB },
     { MODEL_LARGE,   354ull*MB },

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b893376b797eca18a832321dc7125517a3ead4aa..db66331d17bf9b76777d80f18e8c6c64e09e05ad 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 
 #
 # test-vec2 (arm)
-if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND ACCELERATE_FRAMEWORK)
+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
     set(TEST_TARGET test-vec2)
     add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
     target_link_libraries(${TEST_TARGET} PRIVATE ggml)
@@ -57,7 +57,7 @@ add_test(NAME ${TEST_TARGET} COMMAND $<TARGET_FILE:${TEST_TARGET}>)
 #
 # test-mul-mat1 (arm)
 
-if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT GGML_NO_ACCELERATE)
     set(TEST_TARGET test-mul-mat1)
     add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
     target_link_libraries(${TEST_TARGET} PRIVATE ggml ${GGML_EXTRA_LIBS})