fix duplicated tensor name

chraac · Oct 28, 2024 · 327b3db · 327b3db
1 parent 657db64
commit 327b3db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ggml/src/ggml-qnn/op-config.cpp b/ggml/src/ggml-qnn/op-config.cpp
@@ -154,8 +154,9 @@ void ggml_qnn_op_config_base::add_scalar_param(const std::string &name, const Qn
 bool ggml_qnn_op_config_base::add_tensor_param(const std::string &name, const qnn_dimension_array_t &dimensions,
                                                int rank, const uint8_t *data, const Qnn_DataType_t data_type,
                                                QNNBackend device, Qnn_GraphHandle_t graph_handle) {
-    auto param_tensor = std::make_shared<ggml_qnn_tensor>(ggml_qnn_tensor::PARAMETER, name, dimensions, data_type, rank,
-                                                          device, graph_handle, _qnn_instance);
+    std::string tensor_name = name + std::to_string(_tensor_parameters.size());
+    auto param_tensor = std::make_shared<ggml_qnn_tensor>(ggml_qnn_tensor::PARAMETER, tensor_name, dimensions,
+                                                          data_type, rank, device, graph_handle, _qnn_instance);
     size_t data_size = ggml_type_size(ggml_datatype_from_qnn_datatype(data_type));
     for (int i = 0; i < rank; i++) {
         data_size *= dimensions[i];

diff --git a/ggml/src/ggml-qnn/tensor.hpp b/ggml/src/ggml-qnn/tensor.hpp
@@ -29,7 +29,9 @@ class ggml_qnn_tensor {
                              QNNBackend device, Qnn_GraphHandle_t graph_handle,
                              std::shared_ptr<qnn_instance> qnn_instance) :
         _tensor_name(name), _device(device), _qnn_instance(qnn_instance), _graph_handle(graph_handle) {
-        QNN_TENSOR_SET_NAME(_qnn_tensor, _tensor_name.c_str());
+        if (!_tensor_name.empty()) {
+            QNN_TENSOR_SET_NAME(_qnn_tensor, _tensor_name.c_str());
+        }
         QNN_TENSOR_SET_DIMENSIONS(_qnn_tensor, _dimensions.data());
         QNN_TENSOR_SET_DATA_FORMAT(_qnn_tensor, QNN_TENSOR_DATA_FORMAT_FLAT_BUFFER);