From 984c485d84b05f94b44f41542025d1d7daf4c6ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20du=20Hamel?= Date: Thu, 5 Dec 2024 19:21:42 +0100 Subject: [PATCH] Fix metal build --- ggml_extend.hpp | 5 ----- stable-diffusion.cpp | 2 +- upscaler.cpp | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ggml_extend.hpp b/ggml_extend.hpp index 8afcd367c..543dc4958 100644 --- a/ggml_extend.hpp +++ b/ggml_extend.hpp @@ -1138,11 +1138,6 @@ struct GGMLRunner { ggml_backend_cpu_set_n_threads(backend, n_threads); } -#ifdef SD_USE_METAL - if (ggml_backend_is_metal(backend)) { - ggml_backend_metal_set_n_cb(backend, n_threads); - } -#endif ggml_backend_graph_compute(backend, gf); #ifdef GGML_PERF diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp index 5abc29507..707724d4f 100644 --- a/stable-diffusion.cpp +++ b/stable-diffusion.cpp @@ -161,7 +161,7 @@ class StableDiffusionGGML { #endif #ifdef SD_USE_METAL LOG_DEBUG("Using Metal backend"); - ggml_backend_metal_log_set_callback(ggml_log_callback_default, nullptr); + ggml_log_set(ggml_log_callback_default, nullptr); backend = ggml_backend_metal_init(); #endif #ifdef SD_USE_VULKAN diff --git a/upscaler.cpp b/upscaler.cpp index 1cf34c1a3..86e5e9b48 100644 --- a/upscaler.cpp +++ b/upscaler.cpp @@ -21,7 +21,7 @@ struct UpscalerGGML { #endif #ifdef SD_USE_METAL LOG_DEBUG("Using Metal backend"); - ggml_backend_metal_log_set_callback(ggml_log_callback_default, nullptr); + ggml_log_set(ggml_log_callback_default, nullptr); backend = ggml_backend_metal_init(); #endif #ifdef SD_USE_VULKAN