Minor fixes

ggerganov · Oct 17, 2022 · 7b70c5a · 7b70c5a
1 parent d8f64bc
commit 7b70c5a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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})