[Remove API] remove ov::clone_model() replace by ov::model:;clone() (o…

…penvinotoolkit#22283) * [Remove API] remove ov::clone_model() replace by ov::model:;clone() Signed-off-by: Zhai, Xuejun <[email protected]> * clean code Signed-off-by: Zhai, Xuejun <[email protected]> --------- Signed-off-by: Zhai, Xuejun <[email protected]>
evkotov · Jan 23, 2024 · ac99cc8 · ac99cc8
1 parent edd5e9a
commit ac99cc8
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 57 deletions.
diff --git a/src/core/include/ngraph/graph_util.hpp b/src/core/include/ngraph/graph_util.hpp
@@ -46,20 +46,6 @@ using ov::op::v0::Result;
 }  // namespace v0
 }  // namespace op
 
-NGRAPH_API_DEPRECATED
-inline std::shared_ptr<ngraph::Function> clone_function(const ngraph::Function& func, ngraph::NodeMap& node_map) {
-    OPENVINO_SUPPRESS_DEPRECATED_START
-    return ov::clone_model(func, node_map);
-    OPENVINO_SUPPRESS_DEPRECATED_END
-}
-
-NGRAPH_API_DEPRECATED
-inline std::shared_ptr<ngraph::Function> clone_function(const ngraph::Function& func) {
-    OPENVINO_SUPPRESS_DEPRECATED_START
-    return ov::clone_model(func);
-    OPENVINO_SUPPRESS_DEPRECATED_END
-}
-
 using ov::compare_constants;
 using ov::replace_node;
 using ov::replace_node_update_name;

diff --git a/src/core/include/openvino/core/graph_util.hpp b/src/core/include/openvino/core/graph_util.hpp
@@ -270,22 +270,6 @@ std::vector<std::shared_ptr<Node>> topological_sort(T root_nodes) {
     return result;
 }
 
-// input Model is cloned and returned
-// NodeMap input may contain default node mapping i.e. pre-cloned nodes
-// NodeMap output (by reference) fully maps input and cloned Model ops
-OPENVINO_DEPRECATED(
-    "This method is deprecated and will be removed in 2024.0 release. Please use ov::Model::clone() instead.")
-OPENVINO_API
-std::shared_ptr<ov::Model> clone_model(const ov::Model& model,
-                                       std::unordered_map<Node*, std::shared_ptr<Node>>& node_map);
-
-/// \brief input model is cloned and returned
-/// \ingroup ov_model_cpp_api
-OPENVINO_DEPRECATED(
-    "This method is deprecated and will be removed in 2024.0 release. Please use ov::Model::clone() instead.")
-OPENVINO_API
-std::shared_ptr<ov::Model> clone_model(const ov::Model& model);
-
 OPENVINO_API
 bool compare_constants(const std::shared_ptr<Node>& n1, const std::shared_ptr<Node>& n2);
 

diff --git a/src/core/src/graph_util.cpp b/src/core/src/graph_util.cpp
@@ -243,18 +243,6 @@ std::shared_ptr<Model> clone_ov_model(const Model& func, std::unordered_map<Node
     return result;
 }
 
-OPENVINO_SUPPRESS_DEPRECATED_START
-std::shared_ptr<ov::Model> clone_model(const ov::Model& func) {
-    std::unordered_map<ov::Node*, std::shared_ptr<ov::Node>> nm;
-    return clone_model(func, nm);
-}
-
-std::shared_ptr<ov::Model> clone_model(const ov::Model& func,
-                                       std::unordered_map<Node*, std::shared_ptr<Node>>& node_map) {
-    return ov::clone_ov_model(func, node_map);
-}
-OPENVINO_SUPPRESS_DEPRECATED_END
-
 bool compare_constants(const std::shared_ptr<Node>& n1, const std::shared_ptr<Node>& n2) {
     if (!(op::util::is_constant(n1) && op::util::is_constant(n2))) {
         return false;

diff --git a/src/core/src/model.cpp b/src/core/src/model.cpp
@@ -946,9 +946,8 @@ ov::Output<ov::Node> ov::Model::add_output(const ov::Output<ov::Node>& port) {
 }
 
 std::shared_ptr<ov::Model> ov::Model::clone() const {
-    OPENVINO_SUPPRESS_DEPRECATED_START
-    return ov::clone_model(*this);
-    OPENVINO_SUPPRESS_DEPRECATED_END
+    std::unordered_map<ov::Node*, std::shared_ptr<ov::Node>> node_map;
+    return ov::clone_ov_model(*this, node_map);
 }
 
 bool ov::Model::has_rt_info(const std::vector<std::string>& args) const {

diff --git a/src/inference/src/cnn_network_ngraph_impl.cpp b/src/inference/src/cnn_network_ngraph_impl.cpp
@@ -194,7 +194,7 @@ CNNNetworkNGraphImpl::CNNNetworkNGraphImpl(const CNNNetwork& network) {
         IE_THROW() << "Cannot create CNNNetwork with nGraph from legacy network format!";
     }
 
-    _ngraph_function = ngraph::clone_function(*network.getFunction());
+    _ngraph_function = network.getFunction()->clone();
     validateFunctionNames();
     InputsDataMap inputs = network.getInputsInfo();
     OutputsDataMap outputs = network.getOutputsInfo();

diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/transpose.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/classes/transpose.cpp
@@ -66,7 +66,7 @@ void TransposeLayerCPUTest::SetUp() {
     const ov::ResultVector results{std::make_shared<ov::op::v0::Result>(transpose)};
 
     function = std::make_shared<ov::Model>(results, ov::ParameterVector{params}, "TransposeLayerCPUTest");
-    functionRefs = ov::clone_model(*function);
+    functionRefs = function->clone();
 }
 
 TEST_P(TransposeLayerCPUTest, CompareWithRefs) {

diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/cum_sum.cpp
@@ -61,7 +61,7 @@ class CumSumLayerCPUTest : public testing::WithParamInterface<cumSumParams>,
         auto cumSum = std::make_shared<ov::op::v0::CumSum>(params[0], axisNode, exclusive, reverse);
 
         function = std::make_shared<ov::Model>(ov::NodeVector{cumSum}, params, "CumSumLayerCPUTest");
-        functionRefs = ov::clone_model(*function);
+        functionRefs = function->clone();
     }
 };
 

diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp
@@ -196,7 +196,7 @@ class MatMulSparseCPUTest : public testing::WithParamInterface<MatMulSparseParam
 
         checkFusingPosition = false;
 
-        functionRefs = ov::clone_model(*function);
+        functionRefs = function->clone();
         convert_precisions.insert({ov::element::i8, ov::element::f32});
         convert_precisions.insert({ov::element::u8, ov::element::f32});
     }

diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/roi_pooling.cpp
@@ -214,7 +214,7 @@ class ROIPoolingCPULayerTest : public testing::WithParamInterface<ROIPoolingCPUT
         ov::ResultVector results{std::make_shared<ov::op::v0::Result>(roi_pooling)};
 
         function = makeNgraphFunction(netPrecision, params, roi_pooling, "ROIPooling");
-        functionRefs = ov::clone_model(*function);
+        functionRefs = function->clone();
     }
 };
 

diff --git a/src/plugins/intel_cpu/tests/functional/test_utils/fusing_test_utils.cpp b/src/plugins/intel_cpu/tests/functional/test_utils/fusing_test_utils.cpp
@@ -75,7 +75,7 @@ void CpuTestWithFusing::CheckPluginRelatedResultsImpl(const std::shared_ptr<cons
 
 std::shared_ptr<ov::Node>
 postFunctionMgr::addPostOps(const ov::element::Type &ngPrc, ov::ParameterVector &params, const std::shared_ptr<ov::Node> &lastNode) const {
-    auto clonedPostFunction = ov::clone_model(*_pFunction);
+    auto clonedPostFunction = _pFunction->clone();
     clonedPostFunction->set_friendly_name(_pFunction->get_friendly_name());
     clonedPostFunction->replace_node(clonedPostFunction->get_parameters()[0], lastNode);
     return clonedPostFunction->get_result()->get_input_node_shared_ptr(0);

diff --git a/src/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp b/src/tests/functional/plugin/shared/include/subgraph_tests/basic_lstm.hpp
@@ -44,7 +44,7 @@ TEST_P(Basic_LSTM_S, CompareWithRefImpl_LowLatencyTransformation) {
 
     // Generate inputs
     GenerateInputs();
-    functionRefs = ngraph::clone_function(*function);
+    functionRefs = function->clone();
     LoadNetwork();
     auto referenceOutputs = CalculateRefs();
     auto states = inferRequest.QueryState();

diff --git a/src/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp b/src/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp
@@ -63,7 +63,7 @@ void LayerTestsCommon::Run() {
         GTEST_SKIP() << "Disabled test due to configuration" << std::endl;
 
     if (functionRefs == nullptr) {
-        functionRefs = ngraph::clone_function(*function);
+        functionRefs = function->clone();
         functionRefs->set_friendly_name("refFunction");
     }
 
@@ -507,7 +507,7 @@ void LayerTestsCommon::Compare(const std::vector<std::pair<ngraph::element::Type
 
 void LayerTestsCommon::Validate() {
     if (functionRefs == nullptr) {
-        functionRefs = ngraph::clone_function(*function);
+        functionRefs = function->clone();
     }
     auto expectedOutputs = CalculateRefs();
     const auto &actualOutputs = GetOutputs();

diff --git a/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp b/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp
@@ -58,7 +58,7 @@ void MemoryTest::SetUp() {
 }
 
 void MemoryTest::Run() {
-    functionRefs = ngraph::clone_function(*function);
+    functionRefs = function->clone();
     SKIP_IF_CURRENT_TEST_IS_DISABLED()
     using namespace LayerTestsUtils;
     auto crashHandler = [](int errCode) {

diff --git a/src/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp b/src/tests/functional/shared_test_classes/src/subgraph/basic_lstm.cpp
@@ -125,7 +125,7 @@ std::shared_ptr<ov::Model> Basic_LSTM_S::GetNetwork(size_t thirdDimOut,
 
 void Basic_LSTM_S::GenerateInputs() {
     // Generate inputs can be called before actual network loading in case lf LowLatencyTransformation
-    auto inputs_function = ngraph::clone_function(*function);
+    auto inputs_function = function->clone();
     auto inputsCnnNetwork = InferenceEngine::CNNNetwork{ inputs_function };
     auto inputsExecutableNetwork = core->LoadNetwork(inputsCnnNetwork, targetDevice);
     const auto& inputsInfo = inputsExecutableNetwork.GetInputsInfo();
@@ -143,7 +143,7 @@ void Basic_LSTM_S::GenerateInputs() {
 
 void Basic_LSTM_S::Run() {
     SKIP_IF_CURRENT_TEST_IS_DISABLED()
-    functionRefs = ngraph::clone_function(*function);
+    functionRefs = function->clone();
 
     LoadNetwork();
     GenerateInputs();