From 42ca27f71427cd14af55523b2b5b7c93146c8ae1 Mon Sep 17 00:00:00 2001 From: Xuejun Zhai Date: Thu, 4 Dec 2025 06:24:38 -0800 Subject: [PATCH] Removed API get_input_type --- ggml/src/ggml-openvino/ggml-decoder.cpp | 4 ---- ggml/src/ggml-openvino/ggml-decoder.h | 2 -- ggml/src/ggml-openvino/openvino/decoder.hpp | 2 -- ggml/src/ggml-openvino/utils.cpp | 12 ++++++------ 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ggml/src/ggml-openvino/ggml-decoder.cpp b/ggml/src/ggml-openvino/ggml-decoder.cpp index 97bd938567..95d7fc00f4 100644 --- a/ggml/src/ggml-openvino/ggml-decoder.cpp +++ b/ggml/src/ggml-openvino/ggml-decoder.cpp @@ -747,10 +747,6 @@ std::vector GgmlOvDecoder::get_input_stride(int node_idx, const std::str return get_stride(m_node_info_list[node_idx].node_inputs.at(name)); } -ov::element::Type GgmlOvDecoder::get_input_type(const std::string & name) const { - return get_ov_type(m_inputs.at(name)); -} - ov::element::Type GgmlOvDecoder::get_input_type(int node_idx, const std::string & name) const { return get_ov_type(m_node_info_list[node_idx].node_inputs.at(name)); } diff --git a/ggml/src/ggml-openvino/ggml-decoder.h b/ggml/src/ggml-openvino/ggml-decoder.h index c76315f8af..3b6c1ec8e3 100644 --- a/ggml/src/ggml-openvino/ggml-decoder.h +++ b/ggml/src/ggml-openvino/ggml-decoder.h @@ -83,8 +83,6 @@ public: virtual std::vector get_input_stride(int node_idx, const std::string & name) const override; - virtual ov::element::Type get_input_type(const std::string & name) const override; - virtual ov::element::Type get_input_type(int node_idx, const std::string & name) const override; virtual size_t get_input_size() const override; diff --git a/ggml/src/ggml-openvino/openvino/decoder.hpp b/ggml/src/ggml-openvino/openvino/decoder.hpp index ef4b3a7593..8f6a9e9cb2 100644 --- a/ggml/src/ggml-openvino/openvino/decoder.hpp +++ b/ggml/src/ggml-openvino/openvino/decoder.hpp @@ -20,8 +20,6 @@ public: virtual std::vector get_input_stride(int node_idx, const std::string& name) const = 0; - virtual element::Type get_input_type(const std::string& name) const = 0; - virtual element::Type get_input_type(int node_idx, const std::string& name) const = 0; virtual size_t get_input_size() const = 0; diff --git a/ggml/src/ggml-openvino/utils.cpp b/ggml/src/ggml-openvino/utils.cpp index 156204f8d8..018199def5 100644 --- a/ggml/src/ggml-openvino/utils.cpp +++ b/ggml/src/ggml-openvino/utils.cpp @@ -480,9 +480,9 @@ ov::Tensor convert_ggml_input_to_ov(std::shared_ptr ggml_decoder, // This case is added to make test-backend-ops work input_shape = ggml_decoder->get_shape(ggml_tensor->view_src); } else { - input_shape = ggml_decoder->get_input_shape(name).to_shape(); + input_shape = ggml_decoder->get_shape(ggml_tensor); } - auto input_tensor = ov::Tensor(ggml_decoder->get_input_type(name), input_shape, input_data); + auto input_tensor = ov::Tensor(ggml_decoder->get_ov_type(ggml_tensor), input_shape, input_data); return input_tensor; } } // namespace @@ -506,7 +506,7 @@ ov::Tensor get_ov_input_tensor_static_decode(std::shared_ptr ggml (op->op == GGML_OP_SET_ROWS && op->src[1] == ggml_tensor)) { assert(ggml_tensor->ne[0] == 1); ov::Shape input_shape = {1, 1, 1, 1}; - ov::Tensor input_tensor(ggml_decoder->get_input_type(param_name), input_shape); + ov::Tensor input_tensor(ggml_decoder->get_ov_type(ggml_tensor), input_shape); if (ggml_tensor->type == GGML_TYPE_I32) { *input_tensor.data() = *((int32_t *) ggml_tensor->data); } else if (ggml_tensor->type == GGML_TYPE_I64) { @@ -519,7 +519,7 @@ ov::Tensor get_ov_input_tensor_static_decode(std::shared_ptr ggml if (param_name == "inp_out_ids") { ov::Shape input_shape = {1, 1, 1, 1}; - ov::Tensor input_tensor(ggml_decoder->get_input_type(param_name), input_shape); + ov::Tensor input_tensor(ggml_decoder->get_ov_type(ggml_tensor), input_shape); int32_t inp_out_id = *((int32_t *) ggml_tensor->data); assert(ggml_tensor->ne[0] == 1); assert(inp_out_id == 0); @@ -553,7 +553,7 @@ ov::Tensor get_ov_input_tensor_static_prefill(std::shared_ptr ggm if (param_name == "inp_pos" || param_name == "inp_tokens" || (op->op == GGML_OP_SET_ROWS && op->src[1] == ggml_tensor)) { ov::Shape input_shape = {1, 1, 1, chunk_size}; - ov::Tensor input_tensor(ggml_decoder->get_input_type(param_name), input_shape); + ov::Tensor input_tensor(ggml_decoder->get_ov_type(ggml_tensor), input_shape); // copy the chunk_index-th chunk from ggml_tensor size_t element_size = ggml_type_size(ggml_tensor->type); void * input_data = (char *) ggml_tensor->data + chunk_index * chunk_size * element_size; @@ -581,7 +581,7 @@ ov::Tensor get_ov_input_tensor_static_prefill(std::shared_ptr ggm if (param_name == "inp_out_ids") { size_t output_len = ggml_decoder->get_compute_params().output_len; ov::Shape input_shape = {1, 1, 1, output_len}; - ov::Tensor input_tensor(ggml_decoder->get_input_type(param_name), input_shape); + ov::Tensor input_tensor(ggml_decoder->get_ov_type(ggml_tensor), input_shape); if (ggml_tensor->ne[0] == 0) { *input_tensor.data() = 0; } else {