From 33ebb61977b3921ae6eedc5e46c2656e69e43b0b Mon Sep 17 00:00:00 2001 From: "Zhai, Xuejun" Date: Thu, 9 Mar 2023 10:21:23 +0800 Subject: [PATCH] [Remove APIs] remove api set_element_type() Signed-off-by: Zhai, Xuejun --- .../include/ov_ops/type_relaxed.hpp | 15 +++--- .../openvino/core/descriptor/tensor.hpp | 3 -- src/core/src/descriptor/tensor.cpp | 6 +-- src/core/src/runtime/host_tensor.cpp | 4 +- .../src/subgraph/memory_LSTMCell.cpp | 21 +++++++-- .../src/subgraph/multiple_LSTMCell.cpp | 46 +++++++++++++++---- 6 files changed, 66 insertions(+), 29 deletions(-) diff --git a/src/common/transformations/include/ov_ops/type_relaxed.hpp b/src/common/transformations/include/ov_ops/type_relaxed.hpp index 47a791a4b0b..6b72c757231 100644 --- a/src/common/transformations/include/ov_ops/type_relaxed.hpp +++ b/src/common/transformations/include/ov_ops/type_relaxed.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace ov { namespace op { @@ -158,9 +159,10 @@ public: TemporaryReplaceOutputType(Output output, element::Type tmp_type) : m_output(output) { // save original element type in order to restore it in the destructor orig_type = m_output.get_element_type(); - OPENVINO_SUPPRESS_DEPRECATED_START - m_output.get_tensor().set_element_type(tmp_type); - OPENVINO_SUPPRESS_DEPRECATED_END + auto parameter = dynamic_cast(m_output.get_node()); + if (parameter != nullptr) { + parameter->set_element_type(tmp_type); + } } /// Return the output port that was used in the constructor @@ -170,9 +172,10 @@ public: /// Restores the original element type for the output ~TemporaryReplaceOutputType() { - OPENVINO_SUPPRESS_DEPRECATED_START - m_output.get_tensor().set_element_type(orig_type); - OPENVINO_SUPPRESS_DEPRECATED_END + auto parameter = dynamic_cast(m_output.get_node()); + if (parameter != nullptr) { + parameter->set_element_type(orig_type); + } } }; diff --git a/src/core/include/openvino/core/descriptor/tensor.hpp b/src/core/include/openvino/core/descriptor/tensor.hpp index d264d568ab4..7ed18bfb759 100644 --- a/src/core/include/openvino/core/descriptor/tensor.hpp +++ b/src/core/include/openvino/core/descriptor/tensor.hpp @@ -67,9 +67,6 @@ public: OPENVINO_DEPRECATED("set_tensor_type() is deprecated. To change Tensor type please change the Parameter type") void set_tensor_type(const element::Type& element_type, const PartialShape& pshape); - OPENVINO_DEPRECATED( - "set_element_type() is deprecated. To change Tensor element type please change the Parameter type") - void set_element_type(const element::Type& elemenet_type); /// \brief sets lower bound value description void set_lower_value(const ov::Tensor& value); diff --git a/src/core/src/descriptor/tensor.cpp b/src/core/src/descriptor/tensor.cpp index eb936aa24ea..1ee7417002a 100644 --- a/src/core/src/descriptor/tensor.cpp +++ b/src/core/src/descriptor/tensor.cpp @@ -37,14 +37,10 @@ ov::descriptor::Tensor::Tensor(const element::Type& element_type, OPENVINO_SUPPRESS_DEPRECATED_START void ov::descriptor::Tensor::set_tensor_type(const element::Type& element_type, const PartialShape& pshape) { - set_element_type(element_type); + m_element_type = element_type; m_partial_shape = pshape; m_shape_changed = true; } - -void ov::descriptor::Tensor::set_element_type(const element::Type& element_type) { - m_element_type = element_type; -} OPENVINO_SUPPRESS_DEPRECATED_END void ov::descriptor::Tensor::invalidate_values() { diff --git a/src/core/src/runtime/host_tensor.cpp b/src/core/src/runtime/host_tensor.cpp index 90bc88e968d..61fb4afed40 100644 --- a/src/core/src/runtime/host_tensor.cpp +++ b/src/core/src/runtime/host_tensor.cpp @@ -130,11 +130,9 @@ bool runtime::HostTensor::get_is_allocated() const { } void runtime::HostTensor::set_element_type(const element::Type& element_type) { - OPENVINO_SUPPRESS_DEPRECATED_START NGRAPH_CHECK(get_element_type().is_dynamic() || get_element_type() == element_type, "Can not change a static element type"); - m_descriptor->set_element_type(element_type); - OPENVINO_SUPPRESS_DEPRECATED_END + m_descriptor->m_element_type = element_type; } void runtime::HostTensor::set_shape(const Shape& shape) { diff --git a/src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp b/src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp index 50319f7f229..25ffd0833cf 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp @@ -113,9 +113,15 @@ namespace SubgraphTestsDefinitions { auto out_hidden = tensor_iterator->get_iter_value(H_o, -1); auto out_cell = tensor_iterator->get_iter_value(C_o, -1); + auto out_hidden_parameter = dynamic_cast(out_hidden.get_node()); + if (out_hidden_parameter != nullptr) { + out_hidden_parameter->set_element_type(ngPrc); + } - out_hidden.get_tensor().set_element_type(ngPrc); - out_cell.get_tensor().set_element_type(ngPrc); + auto out_cell_parameter = dynamic_cast(out_cell.get_node()); + if (out_cell_parameter != nullptr) { + out_cell_parameter->set_element_type(ngPrc); + } auto cell_memory_write = std::make_shared(out_cell, var_cell); auto hidden_memory_write = std::make_shared(out_hidden, var_hidden); @@ -245,8 +251,15 @@ namespace SubgraphTestsDefinitions { auto out_hidden = tensor_iterator->get_iter_value(H_o, -1); auto out_cell = tensor_iterator->get_iter_value(C_o, -1); - out_hidden.get_tensor().set_element_type(ngPrc); - out_cell.get_tensor().set_element_type(ngPrc); + auto out_hidden_parameter = dynamic_cast(out_hidden.get_node()); + if (out_hidden_parameter != nullptr) { + out_hidden_parameter->set_element_type(ngPrc); + } + + auto out_cell_parameter = dynamic_cast(out_cell.get_node()); + if (out_cell_parameter != nullptr) { + out_cell_parameter->set_element_type(ngPrc); + } auto final_reshape_pattern = std::make_shared(element::i64, Shape{4}, std::vector({1, 1, 1, hiddenSize})); diff --git a/src/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp b/src/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp index 9acfbf7c795..91b80b19c27 100644 --- a/src/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp +++ b/src/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp @@ -115,8 +115,15 @@ void MultipleLSTMCellTest::SetUp() { auto out_hidden = tensor_iterator->get_iter_value(H_o, -1); auto out_cell = tensor_iterator->get_iter_value(C_o, -1); - out_hidden.get_tensor().set_element_type(ngPrc); - out_cell.get_tensor().set_element_type(ngPrc); + auto out_hidden_parameter = dynamic_cast(out_hidden.get_node()); + if (out_hidden_parameter != nullptr) { + out_hidden_parameter->set_element_type(ngPrc); + } + + auto out_cell_parameter = dynamic_cast(out_cell.get_node()); + if (out_cell_parameter != nullptr) { + out_cell_parameter->set_element_type(ngPrc); + } auto cell_memory_write = std::make_shared(out_cell, var_cell); auto hidden_memory_write = std::make_shared(out_hidden, var_hidden); @@ -175,8 +182,15 @@ void MultipleLSTMCellTest::SetUp() { auto out_hidden_2 = tensor_iterator_2->get_iter_value(H_o_2, -1); auto out_cell_2 = tensor_iterator_2->get_iter_value(C_o_2, -1); - out_hidden_2.get_tensor().set_element_type(ngPrc); - out_cell_2.get_tensor().set_element_type(ngPrc); + auto out_hidden_parameter_2 = dynamic_cast(out_hidden_2.get_node()); + if (out_hidden_parameter_2 != nullptr) { + out_hidden_parameter_2->set_element_type(ngPrc); + } + + auto out_cell_parameter_2 = dynamic_cast(out_cell_2.get_node()); + if (out_cell_parameter_2 != nullptr) { + out_cell_parameter_2->set_element_type(ngPrc); + } auto cell_memory_2_write = std::make_shared(out_cell_2, var_cell_2); auto hidden_memory_2_write = std::make_shared(out_hidden_2, var_hidden_2); @@ -332,8 +346,16 @@ void MultipleLSTMCellTest::CreatePureTensorIteratorModel() { auto out_hidden = tensor_iterator->get_iter_value(H_o, -1); auto out_cell = tensor_iterator->get_iter_value(C_o, -1); - out_hidden.get_tensor().set_element_type(ngPrc); - out_cell.get_tensor().set_element_type(ngPrc); + auto out_hidden_parameter = dynamic_cast(out_hidden.get_node()); + if (out_hidden_parameter != nullptr) { + out_hidden_parameter->set_element_type(ngPrc); + } + + auto out_cell_parameter = dynamic_cast(out_cell.get_node()); + if (out_cell_parameter != nullptr) { + out_cell_parameter->set_element_type(ngPrc); + } + tensor_iterator->validate_and_infer_types(); auto first_reshape_pattern = std::make_shared(element::i64, @@ -383,8 +405,16 @@ void MultipleLSTMCellTest::CreatePureTensorIteratorModel() { auto out_hidden_2 = tensor_iterator_2->get_iter_value(H_o_2, -1); auto out_cell_2 = tensor_iterator_2->get_iter_value(C_o_2, -1); - out_hidden_2.get_tensor().set_element_type(ngPrc); - out_cell_2.get_tensor().set_element_type(ngPrc); + auto out_hidden_parameter_2 = dynamic_cast(out_hidden_2.get_node()); + if (out_hidden_parameter_2 != nullptr) { + out_hidden_parameter_2->set_element_type(ngPrc); + } + + auto out_cell_parameter_2 = dynamic_cast(out_cell_2.get_node()); + if (out_cell_parameter_2 != nullptr) { + out_cell_parameter_2->set_element_type(ngPrc); + } + tensor_iterator_2->validate_and_infer_types(); auto final_reshape_pattern = std::make_shared(element::i64, Shape{4}, std::vector({1, 1, 1, hiddenSize}));