IntenseWebs/openvino
3
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Remove APIs] remove api set_element_type()

Browse Source 
Signed-off-by: Zhai, Xuejun <xuejun.zhai@intel.com>
This commit is contained in:
Zhai, Xuejun committed 2023-03-09 10:21:23 +08:00
1 parent a59614412b
commit 33ebb61977
6 files changed
+66 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/common/transformations/include/ov_ops/type_relaxed.hpp
+9 -6
View File
@@ -11,6 +11,7 @@
#include <string>
#include <transformations_visibility.hpp>
#include <vector>
#include <openvino/op/parameter.hpp>
namespace ov {
namespace op {
@@ -158,9 +159,10 @@ public:
TemporaryReplaceOutputType(Output<Node> 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<ov::op::v0::Parameter*>(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<ov::op::v0::Parameter*>(m_output.get_node());
if (parameter != nullptr) {
parameter->set_element_type(orig_type);
}
}
};
src/core/include/openvino/core/descriptor/tensor.hpp
-3
View File
@@ -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);
src/core/src/descriptor/tensor.cpp
+1 -5
View File
@@ -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() {
src/core/src/runtime/host_tensor.cpp
+1 -3
View File
@@ -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) {
src/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp
+17 -4
View File
@@ -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<ov::op::v0::Parameter*>(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<ov::op::v0::Parameter*>(out_cell.get_node());
if (out_cell_parameter != nullptr) {
out_cell_parameter->set_element_type(ngPrc);
}
auto cell_memory_write = std::make_shared<Assign>(out_cell, var_cell);
auto hidden_memory_write = std::make_shared<Assign>(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<ov::op::v0::Parameter*>(out_hidden.get_node());
if (out_hidden_parameter != nullptr) {
out_hidden_parameter->set_element_type(ngPrc);
}
auto out_cell_parameter = dynamic_cast<ov::op::v0::Parameter*>(out_cell.get_node());
if (out_cell_parameter != nullptr) {
out_cell_parameter->set_element_type(ngPrc);
}
auto final_reshape_pattern = std::make_shared<Constant>(element::i64, Shape{4},
std::vector<size_t>({1, 1, 1, hiddenSize}));
src/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp
+38 -8
View File
@@ -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<ov::op::v0::Parameter*>(out_hidden.get_node());
if (out_hidden_parameter != nullptr) {
out_hidden_parameter->set_element_type(ngPrc);
}
auto out_cell_parameter = dynamic_cast<ov::op::v0::Parameter*>(out_cell.get_node());
if (out_cell_parameter != nullptr) {
out_cell_parameter->set_element_type(ngPrc);
}
auto cell_memory_write = std::make_shared<Assign>(out_cell, var_cell);
auto hidden_memory_write = std::make_shared<Assign>(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<ov::op::v0::Parameter*>(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<ov::op::v0::Parameter*>(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<Assign>(out_cell_2, var_cell_2);
auto hidden_memory_2_write = std::make_shared<Assign>(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<ov::op::v0::Parameter*>(out_hidden.get_node());
if (out_hidden_parameter != nullptr) {
out_hidden_parameter->set_element_type(ngPrc);
}
auto out_cell_parameter = dynamic_cast<ov::op::v0::Parameter*>(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<Constant>(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<ov::op::v0::Parameter*>(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<ov::op::v0::Parameter*>(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<Constant>(element::i64,
Shape{4}, std::vector<size_t>({1, 1, 1, hiddenSize}));