From 70224e6cb7c3f2aa9341a67e59599b6251b58d7e Mon Sep 17 00:00:00 2001 From: Aaron Teo Date: Wed, 30 Jul 2025 17:21:04 +0800 Subject: [PATCH] ggml-zdnn: bring load ztensor back to init routine Signed-off-by: Aaron Teo --- ggml/src/ggml-zdnn/ggml-zdnn-rewrite.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ggml/src/ggml-zdnn/ggml-zdnn-rewrite.cpp b/ggml/src/ggml-zdnn/ggml-zdnn-rewrite.cpp index d212ec4d3f..f981c78877 100644 --- a/ggml/src/ggml-zdnn/ggml-zdnn-rewrite.cpp +++ b/ggml/src/ggml-zdnn/ggml-zdnn-rewrite.cpp @@ -137,13 +137,13 @@ static void ggml_zdnn_mul_mat_op(ggml_backend_zdnn_context * ctx, const ggml_ten ggml_zdnn_create_tensor(ptd_bias, td_bias, zt_bias, output, bias_dim, ZDNN_1D); void * bias_data = (void *)calloc(ne0, ggml_element_size(output)); - if (weights_extra->ztensor.is_transformed == false) { - ggml_zdnn_load_tensor(weights_extra->ztensor, weights->data); - } + // if (weights_extra->ztensor.is_transformed == false) { + // ggml_zdnn_load_tensor(weights_extra->ztensor, weights->data); + // } - if (inputs_extra->ztensor.is_transformed == false) { - ggml_zdnn_load_tensor(inputs_extra->ztensor, inputs->data); - } + // if (inputs_extra->ztensor.is_transformed == false) { + // ggml_zdnn_load_tensor(inputs_extra->ztensor, inputs->data); + // } ggml_zdnn_load_tensor(zt_bias, bias_data); // GGML_LOG_INFO("%s: tensor '%s' tensor dimensions: [%ld, %ld, %ld, %ld] pre_tfm_desc dimensions: [%ld, %ld, %ld, %ld]\n", @@ -432,8 +432,8 @@ static void ggml_backend_zdnn_buffer_memset_tensor(ggml_backend_buffer_t buffer, static void ggml_backend_zdnn_buffer_set_tensor(ggml_backend_buffer_t buffer, ggml_tensor * tensor, const void * data, size_t offset, size_t size) { memcpy((char *)tensor->data + offset, data, size); - // ggml_backend_zdnn_buffer * zdnn_buffer = (ggml_backend_zdnn_buffer *)tensor->extra; - // ggml_zdnn_load_tensor(zdnn_buffer->ztensor, (void *)data); + ggml_backend_zdnn_buffer * zdnn_buffer = (ggml_backend_zdnn_buffer *)tensor->extra; + ggml_zdnn_load_tensor(zdnn_buffer->ztensor, (void *)data); GGML_UNUSED(buffer); }