From: Georgi Gerganov <redacted>
Date: Mon, 17 Oct 2022 18:31:23 +0000 (+0300)
Subject: Minor fixes
X-Git-Tag: upstream/0.0.1642~1611
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=7b70c5a5612b85736cf2f66a083e91cbdbce8b55;p=pkg%2Fggml%2Fsources%2Fggml

Minor fixes
---

diff --git a/examples/whisper/main.cpp b/examples/whisper/main.cpp
index 43838cf5..b913522e 100644
--- 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 a316b1ba..1826ce96 100644
--- 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 b893376b..db66331d 100644
--- 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})