From d78f4255d4d27ebef8dfd27f58f9ee3c8e4b7afb Mon Sep 17 00:00:00 2001 From: Aaron Teo Date: Mon, 9 Nov 2026 16:10:26 +0800 Subject: [PATCH] ggml-zdnn: fix release binary not detecting backend lib (#31905) Signed-off-by: Aaron Teo --- ggml/src/ggml-backend-reg.cpp | 29 +++++++++++++++-------------- ggml/src/ggml-zdnn/common.hpp | 3 +-- ggml/src/ggml-zdnn/ggml-zdnn.cpp | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ggml/src/ggml-backend-reg.cpp b/ggml/src/ggml-backend-reg.cpp index 4e9681c9f..c3bc92679 100644 --- a/ggml/src/ggml-backend-reg.cpp +++ b/ggml/src/ggml-backend-reg.cpp @@ -575,21 +575,22 @@ void ggml_backend_load_all_from_path(const char * dir_path) { bool silent = false; #endif - ggml_backend_load_best("blas", silent, dir_path); - ggml_backend_load_best("zendnn", silent, dir_path); - ggml_backend_load_best("cann", silent, dir_path); - ggml_backend_load_best("cuda", silent, dir_path); - ggml_backend_load_best("hip", silent, dir_path); - ggml_backend_load_best("metal", silent, dir_path); - ggml_backend_load_best("rpc", silent, dir_path); - ggml_backend_load_best("sycl", silent, dir_path); - ggml_backend_load_best("vulkan", silent, dir_path); - ggml_backend_load_best("virtgpu", silent, dir_path); - ggml_backend_load_best("opencl", silent, dir_path); - ggml_backend_load_best("hexagon", silent, dir_path); - ggml_backend_load_best("musa", silent, dir_path); + ggml_backend_load_best("blas", silent, dir_path); + ggml_backend_load_best("zendnn", silent, dir_path); // AMD ZenDNN backend + ggml_backend_load_best("zdnn", silent, dir_path); // IBM zDNN backend + ggml_backend_load_best("cann", silent, dir_path); + ggml_backend_load_best("cuda", silent, dir_path); + ggml_backend_load_best("hip", silent, dir_path); + ggml_backend_load_best("metal", silent, dir_path); + ggml_backend_load_best("rpc", silent, dir_path); + ggml_backend_load_best("sycl", silent, dir_path); + ggml_backend_load_best("vulkan", silent, dir_path); + ggml_backend_load_best("virtgpu", silent, dir_path); + ggml_backend_load_best("opencl", silent, dir_path); + ggml_backend_load_best("hexagon", silent, dir_path); + ggml_backend_load_best("musa", silent, dir_path); ggml_backend_load_best("openvino", silent, dir_path); - ggml_backend_load_best("cpu", silent, dir_path); + ggml_backend_load_best("cpu", silent, dir_path); // check the environment variable GGML_BACKEND_PATH to load an out-of-tree backend const char * backend_path = std::getenv("GGML_BACKEND_PATH"); if (backend_path) { diff --git a/ggml/src/ggml-zdnn/common.hpp b/ggml/src/ggml-zdnn/common.hpp index 7ed044f91..e28e7608b 100644 --- a/ggml/src/ggml-zdnn/common.hpp +++ b/ggml/src/ggml-zdnn/common.hpp @@ -16,8 +16,7 @@ #include #include -#define GGML_ZDNN_NAME "zDNN" -#define GGML_ZDNN_VERSION ZDNN_VERNUM +#define GGML_ZDNN_NAME "zDNN" #define ZDNN_CHECK(stmt) \ do { \ diff --git a/ggml/src/ggml-zdnn/ggml-zdnn.cpp b/ggml/src/ggml-zdnn/ggml-zdnn.cpp index 71ae85b3e..27415935b 100644 --- a/ggml/src/ggml-zdnn/ggml-zdnn.cpp +++ b/ggml/src/ggml-zdnn/ggml-zdnn.cpp @@ -728,7 +728,7 @@ ggml_backend_reg_t ggml_backend_zdnn_reg(void) { { g_ggml_backend_zdnn_reg = { - /* .api_version = */ GGML_ZDNN_VERSION, + /* .api_version = */ GGML_BACKEND_API_VERSION, /* .iface = */ ggml_backend_zdnn_reg_i, /* .context = */ NULL };