|
13 | 13 | #define MAX(a, b) ((a) > (b) ? (a) : (b))
|
14 | 14 |
|
15 | 15 | #ifdef GGML_METAL_NDEBUG
|
| 16 | +#define GGML_METAL_LOG(...) |
16 | 17 | #define GGML_METAL_LOG_INFO(...)
|
17 | 18 | #define GGML_METAL_LOG_WARN(...)
|
18 | 19 | #define GGML_METAL_LOG_ERROR(...)
|
19 | 20 | #else
|
| 21 | +#define GGML_METAL_LOG(...) ggml_metal_log(GGML_LOG_LEVEL_NONE, __VA_ARGS__) |
20 | 22 | #define GGML_METAL_LOG_INFO(...) ggml_metal_log(GGML_LOG_LEVEL_INFO, __VA_ARGS__)
|
21 | 23 | #define GGML_METAL_LOG_WARN(...) ggml_metal_log(GGML_LOG_LEVEL_WARN, __VA_ARGS__)
|
22 | 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__) |
23 | 26 | #endif
|
24 | 27 |
|
25 | 28 | #define UNUSED(x) (void)(x)
|
@@ -3184,16 +3187,14 @@ static void ggml_backend_metal_log_allocated_size(id<MTLDevice> device, size_t s
|
3184 | 3187 | #ifndef GGML_METAL_NDEBUG
|
3185 | 3188 | #if TARGET_OS_OSX || (TARGET_OS_IOS && __clang_major__ >= 15)
|
3186 | 3189 | 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", |
3188 | 3191 | __func__,
|
3189 | 3192 | size_aligned / 1024.0 / 1024.0,
|
3190 | 3193 | device.currentAllocatedSize / 1024.0 / 1024.0,
|
3191 | 3194 | device.recommendedMaxWorkingSetSize / 1024.0 / 1024.0);
|
3192 | 3195 |
|
3193 | 3196 | if (device.currentAllocatedSize > device.recommendedMaxWorkingSetSize) {
|
3194 | 3197 | 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 | }
|
3198 | 3199 | } else {
|
3199 | 3200 | GGML_METAL_LOG_INFO("%s: allocated buffer, size = %8.2f MiB, (%8.2f)\n",
|
|
0 commit comments