Spaces:
Sleeping
Sleeping
common : reimplement logging (llama/9418)
Browse fileshttps://github.com/ggerganov/llama.cpp/pull/9418
- ggml/include/ggml.h +5 -4
- ggml/src/ggml-metal.m +4 -3
ggml/include/ggml.h
CHANGED
|
@@ -564,10 +564,11 @@ extern "C" {
|
|
| 564 |
};
|
| 565 |
|
| 566 |
enum ggml_log_level {
|
| 567 |
-
|
| 568 |
-
|
| 569 |
-
|
| 570 |
-
|
|
|
|
| 571 |
};
|
| 572 |
|
| 573 |
// this tensor...
|
|
|
|
| 564 |
};
|
| 565 |
|
| 566 |
enum ggml_log_level {
|
| 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,
|
| 572 |
};
|
| 573 |
|
| 574 |
// this tensor...
|
ggml/src/ggml-metal.m
CHANGED
|
@@ -13,13 +13,16 @@
|
|
| 13 |
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
| 14 |
|
| 15 |
#ifdef GGML_METAL_NDEBUG
|
|
|
|
| 16 |
#define GGML_METAL_LOG_INFO(...)
|
| 17 |
#define GGML_METAL_LOG_WARN(...)
|
| 18 |
#define GGML_METAL_LOG_ERROR(...)
|
| 19 |
#else
|
|
|
|
| 20 |
#define GGML_METAL_LOG_INFO(...) ggml_metal_log(GGML_LOG_LEVEL_INFO, __VA_ARGS__)
|
| 21 |
#define GGML_METAL_LOG_WARN(...) ggml_metal_log(GGML_LOG_LEVEL_WARN, __VA_ARGS__)
|
| 22 |
#define GGML_METAL_LOG_ERROR(...) ggml_metal_log(GGML_LOG_LEVEL_ERROR, __VA_ARGS__)
|
|
|
|
| 23 |
#endif
|
| 24 |
|
| 25 |
#define UNUSED(x) (void)(x)
|
|
@@ -3184,7 +3187,7 @@ static void ggml_backend_metal_log_allocated_size(id<MTLDevice> device, size_t s
|
|
| 3184 |
#ifndef GGML_METAL_NDEBUG
|
| 3185 |
#if TARGET_OS_OSX || (TARGET_OS_IOS && __clang_major__ >= 15)
|
| 3186 |
if (@available(macOS 10.12, iOS 16.0, *)) {
|
| 3187 |
-
|
| 3188 |
__func__,
|
| 3189 |
size_aligned / 1024.0 / 1024.0,
|
| 3190 |
device.currentAllocatedSize / 1024.0 / 1024.0,
|
|
@@ -3192,8 +3195,6 @@ static void ggml_backend_metal_log_allocated_size(id<MTLDevice> device, size_t s
|
|
| 3192 |
|
| 3193 |
if (device.currentAllocatedSize > device.recommendedMaxWorkingSetSize) {
|
| 3194 |
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");
|
| 3197 |
}
|
| 3198 |
} else {
|
| 3199 |
GGML_METAL_LOG_INFO("%s: allocated buffer, size = %8.2f MiB, (%8.2f)\n",
|
|
|
|
| 13 |
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
| 14 |
|
| 15 |
#ifdef GGML_METAL_NDEBUG
|
| 16 |
+
#define GGML_METAL_LOG(...)
|
| 17 |
#define GGML_METAL_LOG_INFO(...)
|
| 18 |
#define GGML_METAL_LOG_WARN(...)
|
| 19 |
#define GGML_METAL_LOG_ERROR(...)
|
| 20 |
#else
|
| 21 |
+
#define GGML_METAL_LOG(...) ggml_metal_log(GGML_LOG_LEVEL_NONE, __VA_ARGS__)
|
| 22 |
#define GGML_METAL_LOG_INFO(...) ggml_metal_log(GGML_LOG_LEVEL_INFO, __VA_ARGS__)
|
| 23 |
#define GGML_METAL_LOG_WARN(...) ggml_metal_log(GGML_LOG_LEVEL_WARN, __VA_ARGS__)
|
| 24 |
#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__)
|
| 26 |
#endif
|
| 27 |
|
| 28 |
#define UNUSED(x) (void)(x)
|
|
|
|
| 3187 |
#ifndef GGML_METAL_NDEBUG
|
| 3188 |
#if TARGET_OS_OSX || (TARGET_OS_IOS && __clang_major__ >= 15)
|
| 3189 |
if (@available(macOS 10.12, iOS 16.0, *)) {
|
| 3190 |
+
GGML_METAL_LOG_DEBUG("%s: allocated buffer, size = %8.2f MiB, (%8.2f / %8.2f)\n",
|
| 3191 |
__func__,
|
| 3192 |
size_aligned / 1024.0 / 1024.0,
|
| 3193 |
device.currentAllocatedSize / 1024.0 / 1024.0,
|
|
|
|
| 3195 |
|
| 3196 |
if (device.currentAllocatedSize > device.recommendedMaxWorkingSetSize) {
|
| 3197 |
GGML_METAL_LOG_WARN("%s: warning: current allocated size is greater than the recommended max working set size\n", __func__);
|
|
|
|
|
|
|
| 3198 |
}
|
| 3199 |
} else {
|
| 3200 |
GGML_METAL_LOG_INFO("%s: allocated buffer, size = %8.2f MiB, (%8.2f)\n",
|