Minor fixes

pull/12/head
Georgi Gerganov 2 years ago
parent d8f64bce3d
commit 7b70c5a561
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735

@ -21,7 +21,7 @@ std::string to_timestamp(int64_t t) {
msec = msec - min * (1000 * 60); msec = msec - min * (1000 * 60);
int64_t sec = msec / 1000; int64_t sec = msec / 1000;
msec = msec - sec * 1000; msec = msec - sec * 1000;
char buf[32]; char buf[32];
snprintf(buf, sizeof(buf), "%02d:%02d:%02d.%03d", (int) hr, (int) min, (int) sec, (int) msec); snprintf(buf, sizeof(buf), "%02d:%02d:%02d.%03d", (int) hr, (int) min, (int) sec, (int) msec);

@ -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 = { static const std::map<e_model, size_t> MEM_REQ_ENCODE_LAYER = {
{ MODEL_TINY, 104ull*MB }, { MODEL_TINY, 104ull*MB },
{ MODEL_BASE, 136ull*MB }, { MODEL_BASE, 138ull*MB },
{ MODEL_SMALL, 208ull*MB }, { MODEL_SMALL, 208ull*MB },
{ MODEL_MEDIUM, 280ull*MB }, { MODEL_MEDIUM, 280ull*MB },
{ MODEL_LARGE, 354ull*MB }, { MODEL_LARGE, 354ull*MB },

@ -31,7 +31,7 @@ endif()
# #
# test-vec2 (arm) # test-vec2 (arm)
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND ACCELERATE_FRAMEWORK) if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
set(TEST_TARGET test-vec2) set(TEST_TARGET test-vec2)
add_executable(${TEST_TARGET} ${TEST_TARGET}.c) add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
target_link_libraries(${TEST_TARGET} PRIVATE ggml) 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) # 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) set(TEST_TARGET test-mul-mat1)
add_executable(${TEST_TARGET} ${TEST_TARGET}.c) add_executable(${TEST_TARGET} ${TEST_TARGET}.c)
target_link_libraries(${TEST_TARGET} PRIVATE ggml ${GGML_EXTRA_LIBS}) target_link_libraries(${TEST_TARGET} PRIVATE ggml ${GGML_EXTRA_LIBS})

Loading…
Cancel
Save