From 3b86cabd47fd7dbc08daab08181f0bb927dcc74a Mon Sep 17 00:00:00 2001 From: Aaron Teo Date: Wed, 30 Sep 2026 01:45:14 +0800 Subject: [PATCH] ci: add zdnn backend build but not test (llama/29541) * ci: add zdnn backend build but not test Signed-off-by: Aaron Teo * ci: attempt to run a ubuntu 26.04 container Signed-off-by: Aaron Teo * ci: set shell to bash Signed-off-by: Aaron Teo * ci: clean up comments Signed-off-by: Aaron Teo * ggml-zdnn: fix compiler errors Signed-off-by: Aaron Teo * vendor: attempt to ignore warnings from vendored files Signed-off-by: Aaron Teo --------- Signed-off-by: Aaron Teo --- ggml/include/ggml-zdnn.h | 2 ++ ggml/src/ggml-zdnn/ggml-zdnn.cpp | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ggml/include/ggml-zdnn.h b/ggml/include/ggml-zdnn.h index fbf45b6e1..e6970ad2f 100644 --- a/ggml/include/ggml-zdnn.h +++ b/ggml/include/ggml-zdnn.h @@ -10,6 +10,8 @@ extern "C" { // device buffer GGML_BACKEND_API ggml_backend_buffer_type_t ggml_backend_zdnn_buffer_type(void); +GGML_BACKEND_API bool ggml_backend_is_zdnn(ggml_backend_t backend); + GGML_BACKEND_API ggml_backend_reg_t ggml_backend_zdnn_reg(void); #ifdef __cplusplus diff --git a/ggml/src/ggml-zdnn/ggml-zdnn.cpp b/ggml/src/ggml-zdnn/ggml-zdnn.cpp index 3b45370a8..5ae83bbd1 100644 --- a/ggml/src/ggml-zdnn/ggml-zdnn.cpp +++ b/ggml/src/ggml-zdnn/ggml-zdnn.cpp @@ -443,15 +443,13 @@ static ggml_backend_i ggml_backend_zdnn_i = { }; static ggml_guid_t ggml_backend_zdnn_guid(void) { - static const char * guid_str = "IBM-ZDNN-ACCELER"; - return reinterpret_cast((void *)guid_str); + static char guid_str[] = "IBM-ZDNN-ACCELER"; + return reinterpret_cast(guid_str); } bool ggml_backend_is_zdnn(ggml_backend_t backend) { return backend != NULL && ggml_guid_matches(backend->guid, ggml_backend_zdnn_guid()); - - GGML_UNUSED(backend); } // @@ -488,7 +486,7 @@ static void ggml_backend_zdnn_device_get_props(ggml_backend_dev_t dev, ggml_back props->description = ggml_backend_zdnn_device_get_description(dev); props->type = ggml_backend_zdnn_device_get_type(dev); ggml_backend_zdnn_device_get_memory(dev, &props->memory_free, &props->memory_total); - props->caps = (ggml_backend_dev_caps) { + props->caps = { /* .async = */ false, /* .host_buffer = */ false, /* .buffer_from_host_ptr = */ false, @@ -505,7 +503,7 @@ static ggml_backend_t ggml_backend_zdnn_device_init(ggml_backend_dev_t dev, cons } ggml_backend_t backend = (ggml_backend *)malloc(sizeof(ggml_backend)); - *backend = (ggml_backend) { + *backend = { /* .guid = */ ggml_backend_zdnn_guid(), /* .iface = */ ggml_backend_zdnn_i, /* .device = */ dev, @@ -624,13 +622,13 @@ ggml_backend_reg_t ggml_backend_zdnn_reg(void) { atexit(ggml_zdnn_cleanup); { - g_ggml_backend_zdnn_reg = (ggml_backend_reg) { + g_ggml_backend_zdnn_reg = { /* .api_version = */ GGML_ZDNN_VERSION, /* .iface = */ ggml_backend_zdnn_reg_i, /* .context = */ NULL }; - g_ggml_backend_zdnn_device = (ggml_backend_device) { + g_ggml_backend_zdnn_device = { /* .iface = */ ggml_backend_zdnn_device_i, /* .reg = */ &g_ggml_backend_zdnn_reg, /* .context = */ &g_ggml_ctx_dev_main