Skip to content

Commit 3089f61

Browse files
committed
common : reimplement logging (llama/9418)
ggml-org/llama.cpp#9418
1 parent c23f6e1 commit 3089f61

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

ggml/include/ggml.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,11 @@ extern "C" {
564564
};
565565

566566
enum ggml_log_level {
567-
GGML_LOG_LEVEL_ERROR = 2,
568-
GGML_LOG_LEVEL_WARN = 3,
569-
GGML_LOG_LEVEL_INFO = 4,
570-
GGML_LOG_LEVEL_DEBUG = 5
567+
GGML_LOG_LEVEL_NONE = 0,
568+
GGML_LOG_LEVEL_INFO = 1,
569+
GGML_LOG_LEVEL_WARN = 2,
570+
GGML_LOG_LEVEL_ERROR = 3,
571+
GGML_LOG_LEVEL_DEBUG = 4,
571572
};
572573

573574
// this tensor...

ggml/src/ggml-metal.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@
1313
#define MAX(a, b) ((a) > (b) ? (a) : (b))
1414

1515
#ifdef GGML_METAL_NDEBUG
16+
#define GGML_METAL_LOG(...)
1617
#define GGML_METAL_LOG_INFO(...)
1718
#define GGML_METAL_LOG_WARN(...)
1819
#define GGML_METAL_LOG_ERROR(...)
1920
#else
21+
#define GGML_METAL_LOG(...) ggml_metal_log(GGML_LOG_LEVEL_NONE, __VA_ARGS__)
2022
#define GGML_METAL_LOG_INFO(...) ggml_metal_log(GGML_LOG_LEVEL_INFO, __VA_ARGS__)
2123
#define GGML_METAL_LOG_WARN(...) ggml_metal_log(GGML_LOG_LEVEL_WARN, __VA_ARGS__)
2224
#define GGML_METAL_LOG_ERROR(...) ggml_metal_log(GGML_LOG_LEVEL_ERROR, __VA_ARGS__)
25+
#define GGML_METAL_LOG_DEBUG(...) ggml_metal_log(GGML_LOG_LEVEL_DEBUG, __VA_ARGS__)
2326
#endif
2427

2528
#define UNUSED(x) (void)(x)
@@ -3184,16 +3187,14 @@ static void ggml_backend_metal_log_allocated_size(id<MTLDevice> device, size_t s
31843187
#ifndef GGML_METAL_NDEBUG
31853188
#if TARGET_OS_OSX || (TARGET_OS_IOS && __clang_major__ >= 15)
31863189
if (@available(macOS 10.12, iOS 16.0, *)) {
3187-
GGML_METAL_LOG_INFO("%s: allocated buffer, size = %8.2f MiB, (%8.2f / %8.2f)",
3190+
GGML_METAL_LOG_DEBUG("%s: allocated buffer, size = %8.2f MiB, (%8.2f / %8.2f)\n",
31883191
__func__,
31893192
size_aligned / 1024.0 / 1024.0,
31903193
device.currentAllocatedSize / 1024.0 / 1024.0,
31913194
device.recommendedMaxWorkingSetSize / 1024.0 / 1024.0);
31923195

31933196
if (device.currentAllocatedSize > device.recommendedMaxWorkingSetSize) {
31943197
GGML_METAL_LOG_WARN("%s: warning: current allocated size is greater than the recommended max working set size\n", __func__);
3195-
} else {
3196-
GGML_METAL_LOG_INFO("\n");
31973198
}
31983199
} else {
31993200
GGML_METAL_LOG_INFO("%s: allocated buffer, size = %8.2f MiB, (%8.2f)\n",

0 commit comments

Comments
 (0)