Moved deprecated network iterator to legacy (#913)

* Removed deprecated iterator API

* Applied comments

diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
index 977260b..7625c51 100644 (file)
--- a/inference-engine/ie_bridges/python/CMakeLists.txt
+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
@@ -18,10 +18,10 @@ elseif(ARCH STREQUAL "i386")
 endif()
 
 if(DEFINED IE_MAIN_SOURCE_DIR)
-    set(InferenceEngine_LIBRARIES inference_engine)
+    set(InferenceEngine_LIBRARIES inference_engine inference_engine_plugin_api)
 else()
     find_package(InferenceEngineDeveloperPackage REQUIRED)
-    set(InferenceEngine_LIBRARIES IE::inference_engine)
+    set(InferenceEngine_LIBRARIES IE::inference_engine IE::inference_engine_plugin_api)
 endif()
 
 if(UNIX)

diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.hpp b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.hpp
index 33a65c4..3529558 100644 (file)
--- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.hpp
+++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.hpp
@@ -12,6 +12,7 @@
 #include <map>
 #include <vector>
 #include <set>
+#include <list>
 #include <iostream>
 #include <algorithm>
 #include <sstream>

diff --git a/inference-engine/include/cpp/ie_cnn_network.h b/inference-engine/include/cpp/ie_cnn_network.h
index a8a3311..c7763eb 100644 (file)
--- a/inference-engine/include/cpp/ie_cnn_network.h
+++ b/inference-engine/include/cpp/ie_cnn_network.h
@@ -9,7 +9,6 @@
  */
 #pragma once
 
-#include <details/ie_cnn_network_iterator.hpp>
 #include <details/ie_exception_conversion.hpp>
 #include <ie_icnn_network.hpp>
 #include <map>
@@ -211,37 +210,6 @@ public:
     CNNLayerPtr getLayerByName(const char* layerName) const;
 
     /**
-     * @deprecated Use CNNNetwork::getFunction() and work with ngraph::Function directly. The method will be removed in 2021.1
-     * @brief Begin layer iterator
-     *
-     * Order of layers is implementation specific,
-     * and can be changed in future
-     *
-     * @return Iterator pointing to a layer
-     */
-    IE_SUPPRESS_DEPRECATED_START
-    INFERENCE_ENGINE_DEPRECATED("Use CNNNetwork::getFunction() and work with ngraph::Function directly. The method will be removed in 2021.1")
-    details::CNNNetworkIterator begin() const;
-
-    /**
-     * @deprecated Use CNNNetwork::getFunction() and work with ngraph::Function directly. The method will be removed in 2021.1
-     * @brief End layer iterator
-     * @return Iterator pointing to a layer
-     */
-    INFERENCE_ENGINE_DEPRECATED("Use CNNNetwork::getFunction() and work with ngraph::Function directly. The method will be removed in 2021.1")
-    details::CNNNetworkIterator end() const;
-    IE_SUPPRESS_DEPRECATED_END
-
-    /**
-     * @deprecated Use CNNNetwork::layerCount() instead. The method will be removed in 2021.1
-     * @brief Number of layers in network object
-     *
-     * @return Number of layers.
-     */
-    INFERENCE_ENGINE_DEPRECATED("Use CNNNetwork::layerCount() instead. The method will be removed in 2021.1")
-    size_t size() const;
-
-    /**
      * @brief Helper method to get collect all input shapes with names of corresponding Data objects
      *
      * @return Map of pairs: input name and its dimension.

diff --git a/inference-engine/include/details/ie_cnn_network_iterator.hpp b/inference-engine/src/legacy_api/include/details/ie_cnn_network_iterator.hpp
similarity index 100%
rename from inference-engine/include/details/ie_cnn_network_iterator.hpp
rename to inference-engine/src/legacy_api/include/details/ie_cnn_network_iterator.hpp

diff --git a/inference-engine/include/details/ie_cnn_network_tools.h b/inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h
similarity index 100%
rename from inference-engine/include/details/ie_cnn_network_tools.h
rename to inference-engine/src/legacy_api/include/details/ie_cnn_network_tools.h

diff --git a/inference-engine/src/legacy_api/include/ie_util_internal.hpp b/inference-engine/src/legacy_api/include/ie_util_internal.hpp
index 5f6a6d5..9af4d08 100644 (file)
--- a/inference-engine/src/legacy_api/include/ie_util_internal.hpp
+++ b/inference-engine/src/legacy_api/include/ie_util_internal.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <cpp/ie_cnn_network.h>
+#include "details/ie_cnn_network_iterator.hpp"
 
 #include <ie_icnn_network.hpp>
 #include <cnn_network_impl.hpp>

diff --git a/inference-engine/src/legacy_api/src/ie_deprecated.cpp b/inference-engine/src/legacy_api/src/ie_deprecated.cpp
index 2f3761b..331191a 100644 (file)
--- a/inference-engine/src/legacy_api/src/ie_deprecated.cpp
+++ b/inference-engine/src/legacy_api/src/ie_deprecated.cpp
@@ -18,18 +18,6 @@ CNNLayerPtr CNNNetwork::getLayerByName(const char* layerName) const {
     return layer;
 }
 
-details::CNNNetworkIterator CNNNetwork::begin() const {
-    return details::CNNNetworkIterator(actual);
-}
-
-details::CNNNetworkIterator CNNNetwork::end() const {
-    return details::CNNNetworkIterator();
-}
-
-size_t CNNNetwork::size() const {
-    return std::distance(std::begin(*this), std::end(*this));
-}
-
 CNNLayer::CNNLayer(const LayerParams& prms)
     : node(nullptr), name(prms.name), type(prms.type), precision(prms.precision), userValue({0}) {}
 

diff --git a/inference-engine/src/legacy_api/src/ie_util_internal.cpp b/inference-engine/src/legacy_api/src/ie_util_internal.cpp
index 941d9cd..451b4f5 100644 (file)
--- a/inference-engine/src/legacy_api/src/ie_util_internal.cpp
+++ b/inference-engine/src/legacy_api/src/ie_util_internal.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "ie_util_internal.hpp"
+#include "details/ie_cnn_network_iterator.hpp"
 
 #include <ie_layers.h>
 

diff --git a/inference-engine/src/low_precision_transformations/src/transformation_context.cpp b/inference-engine/src/low_precision_transformations/src/transformation_context.cpp
index 43ec646..d2b005d 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/transformation_context.cpp
+++ b/inference-engine/src/low_precision_transformations/src/transformation_context.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "low_precision_transformations/transformation_context.hpp"
+#include "details/ie_cnn_network_iterator.hpp"
 
 using namespace InferenceEngine;
 using namespace InferenceEngine::details;

diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp
index 2317d46..e9328de 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp
@@ -7,6 +7,7 @@
 #include <string>
 
 #include <net_pass.h>
+#include <details/ie_cnn_network_iterator.hpp>
 #include <details/caseless.hpp>
 
 #include <vpu/compile_env.hpp>

diff --git a/inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp b/inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp
index 0841449..c3626e7 100644 (file)
--- a/inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp
+++ b/inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp
@@ -5,6 +5,7 @@
 #include <gtest/gtest.h>
 
 #include <cnn_network_impl.hpp>
+#include <details/ie_cnn_network_iterator.hpp>
 #include <string>
 #include <sstream>
 #include <fstream>
@@ -126,7 +127,8 @@ TEST(CNNNGraphImplTests, TestGetOutputAfterConvertNetwork) {
     }
 
     InferenceEngine::CNNNetwork cnnNet(ngraph);
-    cnnNet.begin();
+    // convert to old representation
+    cnnNet.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     cnnNet.addOutput(testLayerName);
 
     InferenceEngine::OutputsDataMap outs = cnnNet.getOutputsInfo();
@@ -266,7 +268,8 @@ TEST(CNNNGraphImplTests, TestAddOutputFromConvertedNetwork) {
     cnnNet.addOutput(testLayerName);
     ASSERT_NE(nullptr, cnnNet.getFunction());
     ASSERT_EQ(5, cnnNet.layerCount());
-    cnnNet.begin();
+    // convert to old representation
+    cnnNet.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     auto outputs = cnnNet.getOutputsInfo();
     ASSERT_EQ(2, outputs.size());
     ASSERT_TRUE(outputs.find("relu2") != outputs.end());
@@ -291,7 +294,8 @@ TEST(CNNNGraphImplTests, ConstantAsInternalAndExternalLayer) {
     }
 
     InferenceEngine::CNNNetwork cnnNet(ngraph);
-    cnnNet.begin();
+    // convert to old representation
+    cnnNet.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     ASSERT_EQ(4, cnnNet.layerCount());
 }
 
@@ -409,15 +413,15 @@ TEST(CNNNGraphImplTests, SavePrimitivesPriority) {
     </edges>
 </net>
 )V0G0N";
-        const Core ie;
-        Blob::Ptr weights;
-
-        auto network = ie.ReadNetwork(model, weights);
-        auto inputInfo = network.getInputsInfo();
-        auto cnnLayer = inputInfo.begin()->second->getInputData()->getCreatorLayer().lock();
-        ASSERT_TRUE(cnnLayer);
-        ASSERT_NE(cnnLayer->params.find("PrimitivesPriority"), cnnLayer->params.end());
-        ASSERT_EQ("cpu:avx2", cnnLayer->params["PrimitivesPriority"]);
+    const Core ie;
+    Blob::Ptr weights;
+
+    auto network = ie.ReadNetwork(model, weights);
+    auto inputInfo = network.getInputsInfo();
+    auto cnnLayer = inputInfo.begin()->second->getInputData()->getCreatorLayer().lock();
+    ASSERT_TRUE(cnnLayer);
+    ASSERT_NE(cnnLayer->params.find("PrimitivesPriority"), cnnLayer->params.end());
+    ASSERT_EQ("cpu:avx2", cnnLayer->params["PrimitivesPriority"]);
 }
 
 TEST(CNNNGraphImplTests, ReadFromCNNNetReader) {
@@ -472,8 +476,7 @@ TEST(CNNNGraphImplTests, ReadFromCNNNetReader) {
 )V0G0N";
     InferenceEngine::Core core;
     CNNNetwork network = core.ReadNetwork(model, InferenceEngine::Blob::CPtr());
-    network.begin();
-    ASSERT_EQ(2, network.layerCount());
+    ASSERT_EQ(3, network.layerCount());
 }
 
 TEST(CNNNGraphImplTests, CanChangeInputPrecision) {
@@ -510,7 +513,8 @@ TEST(CNNNGraphImplTests, CanChangeInputPrecision) {
     {
         SCOPED_TRACE("Convert to old format");
 
-        cnnNet.begin();
+        // convert to old representation
+        cnnNet.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     }
     {
         SCOPED_TRACE("After conversion");
@@ -556,7 +560,8 @@ TEST(CNNNGraphImplTests, CanChangeInputLayout) {
     {
         SCOPED_TRACE("Convert to old format");
 
-        cnnNet.begin();
+        // convert to old representation
+        cnnNet.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     }
     {
         SCOPED_TRACE("After conversion");
@@ -602,7 +607,8 @@ TEST(CNNNGraphImplTests, CanChangeOutputPrecision) {
     {
         SCOPED_TRACE("Convert to old format");
 
-        cnnNet.begin();
+        // convert to old representation
+        cnnNet.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     }
     {
         SCOPED_TRACE("After conversion");
@@ -648,7 +654,8 @@ TEST(CNNNGraphImplTests, CanChangeOutputLayout) {
     {
         SCOPED_TRACE("Convert to old format");
 
-        cnnNet.begin();
+        // convert to old representation
+        cnnNet.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     }
     {
         SCOPED_TRACE("After conversion");

diff --git a/inference-engine/tests/functional/inference_engine/network_serializer_test.cpp b/inference-engine/tests/functional/inference_engine/network_serializer_test.cpp
index 4409898..9e91bff 100644 (file)
--- a/inference-engine/tests/functional/inference_engine/network_serializer_test.cpp
+++ b/inference-engine/tests/functional/inference_engine/network_serializer_test.cpp
@@ -39,9 +39,12 @@ TEST_P(CNNNetworkSerializerTest, SerializeEmptyFilePathsThrowsException) {
 TEST_P(CNNNetworkSerializerTest, Serialize) {
     InferenceEngine::Core ie;
     InferenceEngine::CNNNetwork originalNetwork = ie.ReadNetwork(_modelPath, _weightsPath);
-    IE_SUPPRESS_DEPRECATED_START
-    originalNetwork.begin();
-    IE_SUPPRESS_DEPRECATED_END
+    {
+        IE_SUPPRESS_DEPRECATED_START
+        // convert to old representation
+        originalNetwork.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
+        IE_SUPPRESS_DEPRECATED_END
+    }
     originalNetwork.getInputsInfo().begin()->second->setPrecision(_netPrc);
     originalNetwork.getOutputsInfo().begin()->second->setPrecision(_netPrc);
 

diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/fake_quantize_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/fake_quantize_tests.cpp
index e4d3418..c73af7e 100644 (file)
--- a/inference-engine/tests/functional/inference_engine/ngraph_reader/fake_quantize_tests.cpp
+++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/fake_quantize_tests.cpp
@@ -254,9 +254,10 @@ TEST_F(NGraphReaderTests, ReadFQNetwork) {
     CommonTestUtils::fill_data(weights->buffer().as<float *>(), weights->size() / sizeof(float));
 
     Core reader;
-    auto nGraph = reader.ReadNetwork(model, weights);
-    CNNNetwork cnn(nGraph);
+    auto cnn = reader.ReadNetwork(model, weights);
+
     IE_SUPPRESS_DEPRECATED_START
-    cnn.begin();
+    // convert to old representation
+    cnn.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     IE_SUPPRESS_DEPRECATED_END
 }

diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/negative_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/negative_tests.cpp
index cc9f3c3..ee7e449 100644 (file)
--- a/inference-engine/tests/functional/inference_engine/ngraph_reader/negative_tests.cpp
+++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/negative_tests.cpp
@@ -77,90 +77,3 @@ TEST_F(NGraphReaderTests, DISABLED_ReadIncorrectNetwork) {
     Core reader;
     ASSERT_THROW(reader.ReadNetwork(model, blob), InferenceEngine::details::InferenceEngineException);
 }
-
-TEST_F(NGraphReaderTests, ConvertNGraphFromIterator) {
-    std::string model = R"V0G0N(
-<net name="Network" version="10">
-    <layers>
-        <layer id="0" name="data" type="Parameter" version="opset1">
-            <data element_type="f32" shape="1,3,227,227"/>
-            <output>
-                <port id="0" precision="FP32">
-                    <dim>1</dim>
-                    <dim>3</dim>
-                    <dim>227</dim>
-                    <dim>227</dim>
-                </port>
-            </output>
-        </layer>
-        <layer id="1" name="embedded_input__const" type="Const" version="opset1">
-            <data offset="0" size="139392"/>
-            <output>
-                <port id="1" precision="FP32">
-                    <dim>96</dim>
-                    <dim>3</dim>
-                    <dim>11</dim>
-                    <dim>11</dim>
-                </port>
-            </output>
-        </layer>
-        <layer id="3" name="conv1" type="Convolution" version="opset1">
-            <data dilations="1,1" group="1" kernel="11,11" output="96" pads_begin="0,0" pads_end="0,0" strides="4,4"/>
-            <input>
-                <port id="0" precision="FP32">
-                    <dim>1</dim>
-                    <dim>3</dim>
-                    <dim>227</dim>
-                    <dim>227</dim>
-                </port>
-                <port id="1" precision="FP32">
-                    <dim>96</dim>
-                    <dim>3</dim>
-                    <dim>11</dim>
-                    <dim>11</dim>
-                </port>
-            </input>
-            <output>
-                <port id="3" precision="FP32">
-                    <dim>1</dim>
-                    <dim>96</dim>
-                    <dim>55</dim>
-                    <dim>55</dim>
-                </port>
-            </output>
-        </layer>
-        <layer name="output" type="Result" id="2" version="opset1">
-            <input>
-                <port id="0" precision="FP32">
-                    <dim>1</dim>
-                    <dim>96</dim>
-                    <dim>55</dim>
-                    <dim>55</dim>
-                </port>
-            </input>
-        </layer>
-    </layers>
-    <edges>
-        <edge from-layer="0" from-port="0" to-layer="3" to-port="0"/>
-        <edge from-layer="1" from-port="1" to-layer="3" to-port="1"/>
-        <edge from-layer="3" from-port="3" to-layer="2" to-port="0"/>
-    </edges>
-</net>
-)V0G0N";
-
-    Blob::Ptr weights;
-
-    weights = make_shared_blob<uint8_t>(TensorDesc(Precision::U8, {139392}, Layout::C));
-    weights->allocate();
-    CommonTestUtils::fill_data(weights->buffer().as<float *>(), weights->size() / sizeof(float));
-
-    Core reader;
-    auto nGraph = reader.ReadNetwork(model, weights);
-    CNNNetwork network(nGraph);
-
-    size_t layersCount = 0;
-    IE_SUPPRESS_DEPRECATED_START
-    for (auto it = network.begin(); it != network.end(); it++, layersCount++) {}
-    IE_SUPPRESS_DEPRECATED_END
-    ASSERT_EQ(layersCount, 2);
-}

diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/ngraph_reader_tests.hpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/ngraph_reader_tests.hpp
index 6af8e76..e659ea4 100644 (file)
--- a/inference-engine/tests/functional/inference_engine/ngraph_reader/ngraph_reader_tests.hpp
+++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/ngraph_reader_tests.hpp
@@ -9,6 +9,7 @@
 #include <sstream>
 
 #include <ie_core.hpp>
+#include <details/ie_cnn_network_iterator.hpp>
 
 #include "common_test_utils/test_common.hpp"
 #include "common_test_utils/file_utils.hpp"
@@ -40,12 +41,14 @@ protected:
 
         FuncTestUtils::compareCNNNetworks(network, cnnNetwork, false);
         IE_SUPPRESS_DEPRECATED_START
-        for (auto it = network.begin(); it != network.end(); it++) {
+        auto & inetwork = static_cast<const ICNNNetwork&>(network);
+        for (auto it = details::CNNNetworkIterator(&inetwork); it != details::CNNNetworkIterator(); it++) {
             InferenceEngine::CNNLayerPtr layer = *it;
             ASSERT_NE(nullptr, layer->getNode());
         }
 
-        for (auto it = cnnNetwork.begin(); it != cnnNetwork.end(); it++) {
+        auto & icnnnetwork = static_cast<const ICNNNetwork&>(cnnNetwork);
+        for (auto it = details::CNNNetworkIterator(&icnnnetwork); it != details::CNNNetworkIterator(); it++) {
             InferenceEngine::CNNLayerPtr layer = *it;
             ASSERT_EQ(nullptr, layer->getNode());
         }

diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/relu_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/relu_tests.cpp
index b397c80..4dea405 100644 (file)
--- a/inference-engine/tests/functional/inference_engine/ngraph_reader/relu_tests.cpp
+++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/relu_tests.cpp
@@ -219,9 +219,10 @@ TEST_F(NGraphReaderTests, ReadReLUScalarNetwork) {
 
     Blob::CPtr blob;
     Core reader;
-    auto nGraph = reader.ReadNetwork(model, blob);
-    CNNNetwork cnetwork(nGraph);
+    auto cnn = reader.ReadNetwork(model, blob);
+
     IE_SUPPRESS_DEPRECATED_START
-    cnetwork.begin();
+    // convert to old representation
+    cnn.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     IE_SUPPRESS_DEPRECATED_END
 }

diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reshape_tests.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reshape_tests.cpp
index 8c37172..0fba1e7 100644 (file)
--- a/inference-engine/tests/functional/inference_engine/ngraph_reshape_tests.cpp
+++ b/inference-engine/tests/functional/inference_engine/ngraph_reshape_tests.cpp
@@ -416,7 +416,6 @@ TEST_F(NGraphReshapeTests, TestInterpParameters) {
                            ngraph::ParameterVector{inp});
 
     CNNNetwork cnn(ngraph_function);
-    cnn.begin();
     std::map<std::string, InferenceEngine::SizeVector> inShape;
     inShape["test"] = {1, 3, 4, 5};
     cnn.reshape(inShape);

diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp
index 73aea95..9632c89 100644 (file)
--- a/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp
+++ b/inference-engine/tests/functional/plugin/myriad/ngraph/conversions/dynamic_shape_resolver.cpp
@@ -11,6 +11,7 @@
 #include "ie_common.h"
 
 #include "common_test_utils/test_common.hpp"
+#include "details/ie_cnn_network_iterator.hpp"
 
 #include <gtest/gtest.h>
 
@@ -41,7 +42,8 @@ protected:
 
 private:
     void triggerConversionToCNNNetwork() {
-        cnnNetwork.begin();
+        // convert to old representation
+        cnnNetwork.getInputsInfo().begin()->second->getInputData()->getCreatorLayer();
     }
 
     static const char s_FriendlyName[];

diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt
index 12b0485..34144a4 100644 (file)
--- a/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt
+++ b/inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt
@@ -4,7 +4,8 @@
 
 set(TARGET_NAME funcTestUtils)
 
-list(APPEND EXPORT_DEPENDENCIES commonTestUtils inference_engine inference_engine_lp_transformations)
+list(APPEND EXPORT_DEPENDENCIES commonTestUtils inference_engine inference_engine_legacy
+                                inference_engine_lp_transformations)
 
 addIeTarget(
     NAME ${TARGET_NAME}

diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp b/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp
index aeae4ed..dd9d043 100644 (file)
--- a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp
+++ b/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.cpp
@@ -305,13 +305,6 @@ namespace FuncTestUtils {
 
     void compareCNNNetworks(const InferenceEngine::CNNNetwork &network, const InferenceEngine::CNNNetwork &refNetwork,
                             bool sameNetVersions) {
-        if (!sameNetVersions) {
-            IE_SUPPRESS_DEPRECATED_START
-            /* call conversion of the networks to CNNNetImpl to compare CNNLayers one by one */
-            network.begin();
-            refNetwork.begin();
-            IE_SUPPRESS_DEPRECATED_END
-        }
         if (network.getName() != refNetwork.getName())
             THROW_IE_EXCEPTION << "CNNNetworks have different names! " << network.getName()
                                << " and " << refNetwork.getName();
@@ -320,11 +313,6 @@ namespace FuncTestUtils {
             THROW_IE_EXCEPTION << "CNNNetworks have different batch size! " << std::to_string(network.getBatchSize())
                                << " and " << std::to_string(refNetwork.getBatchSize());
 
-        if (network.layerCount() != refNetwork.layerCount())
-            THROW_IE_EXCEPTION << "CNNNetworks have different numbers of layers! "
-                               << std::to_string(network.layerCount())
-                               << " and " << std::to_string(refNetwork.layerCount());
-
         compareLayerByLayer<InferenceEngine::CNNNetwork>(network, refNetwork, sameNetVersions);
         InferenceEngine::InputsDataMap newInput = network.getInputsInfo();
         InferenceEngine::InputsDataMap oldInput = refNetwork.getInputsInfo();

diff --git a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp b/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp
index b222641..c54cb5d 100644 (file)
--- a/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp
+++ b/inference-engine/tests/ie_test_utils/functional_test_utils/network_utils.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include "cpp/ie_cnn_network.h"
+#include "details/ie_cnn_network_iterator.hpp"
 
 namespace FuncTestUtils {
 
@@ -15,16 +16,36 @@ void compareCNNNLayers(const InferenceEngine::CNNLayerPtr &layer, const Inferenc
 IE_SUPPRESS_DEPRECATED_START
 template <class T>
 inline void compareLayerByLayer(const T& network, const T& refNetwork, bool sameNetVersions = true) {
+    auto & inetwork = static_cast<const InferenceEngine::ICNNNetwork&>(network);
+    auto iterator = InferenceEngine::details::CNNNetworkIterator(&inetwork);
+    auto & irefNetwork = static_cast<const InferenceEngine::ICNNNetwork&>(refNetwork);
+    auto refIterator = InferenceEngine::details::CNNNetworkIterator(&irefNetwork);
+    auto end = InferenceEngine::details::CNNNetworkIterator();
+    if (network.layerCount() != refNetwork.layerCount())
+        THROW_IE_EXCEPTION << "CNNNetworks have different number of layers: " << network.layerCount() << " vs " << refNetwork.layerCount();
+    for (; iterator != end && refIterator != end; iterator++, refIterator++) {
+        InferenceEngine::CNNLayerPtr layer = *iterator;
+        InferenceEngine::CNNLayerPtr refLayer = *refIterator;
+        compareCNNNLayers(layer, refLayer, sameNetVersions);
+    }
+}
+
+template <>
+inline void compareLayerByLayer(const std::vector<InferenceEngine::CNNLayerPtr>& network,
+                                const std::vector<InferenceEngine::CNNLayerPtr>& refNetwork,
+                                bool sameNetVersions) {
     auto iterator = network.begin();
     auto refIterator = refNetwork.begin();
     if (network.size() != refNetwork.size())
-        THROW_IE_EXCEPTION << "CNNNetworks have different number of layers: " << network.size() << " vs " << refNetwork.size();
+        THROW_IE_EXCEPTION << "CNNNetworks have different number of layers: " <<
+            network.size() << " vs " << refNetwork.size();
     for (; iterator != network.end() && refIterator != refNetwork.end(); iterator++, refIterator++) {
         InferenceEngine::CNNLayerPtr layer = *iterator;
         InferenceEngine::CNNLayerPtr refLayer = *refIterator;
         compareCNNNLayers(layer, refLayer, sameNetVersions);
     }
 }
+
 IE_SUPPRESS_DEPRECATED_END
 
 }  // namespace FuncTestUtils
\ No newline at end of file

diff --git a/inference-engine/tests_deprecated/functional/ie_tests/include/object_detection_matcher.hpp b/inference-engine/tests_deprecated/functional/ie_tests/include/object_detection_matcher.hpp
index 56a2967..a33ec22 100644 (file)
--- a/inference-engine/tests_deprecated/functional/ie_tests/include/object_detection_matcher.hpp
+++ b/inference-engine/tests_deprecated/functional/ie_tests/include/object_detection_matcher.hpp
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <list>
 #include <limits>
 #include <gtest/gtest.h>
 #include "base_matcher.hpp"

diff --git a/inference-engine/tests_deprecated/functional/ie_tests/src/classification_matcher.cpp b/inference-engine/tests_deprecated/functional/ie_tests/src/classification_matcher.cpp
index e27b1f3..4c871cd 100644 (file)
--- a/inference-engine/tests_deprecated/functional/ie_tests/src/classification_matcher.cpp
+++ b/inference-engine/tests_deprecated/functional/ie_tests/src/classification_matcher.cpp
@@ -5,11 +5,11 @@
 #include "classification_matcher.hpp"
 #include <gtest/gtest.h>
 #include <xml_helper.hpp>
+#include "details/ie_cnn_network_iterator.hpp"
 
 using namespace Regression ;
 using namespace Regression :: Matchers ;
 
-IE_SUPPRESS_DEPRECATED_START
 ClassificationMatcher::ClassificationMatcher(RegressionConfig &config)
     : BaseMatcher(config) {
     // Get file names for files with weights and labels
@@ -67,7 +67,6 @@ ClassificationMatcher::ClassificationMatcher(RegressionConfig &config)
 
     top = (-1 == config.topKNumbers) ? 5 : config.topKNumbers;
 }
-IE_SUPPRESS_DEPRECATED_END
 
 void ClassificationMatcher::to(const std::vector <Regression::Reference::ClassificationScoringResultsForTests> &expected) {
     checkResultNumber = 0;

diff --git a/inference-engine/tests_deprecated/functional/ie_tests/src/object_detection_matcher.cpp b/inference-engine/tests_deprecated/functional/ie_tests/src/object_detection_matcher.cpp
index 32e57a6..38ca12a 100644 (file)
--- a/inference-engine/tests_deprecated/functional/ie_tests/src/object_detection_matcher.cpp
+++ b/inference-engine/tests_deprecated/functional/ie_tests/src/object_detection_matcher.cpp
@@ -4,6 +4,7 @@
 
 #include <xml_helper.hpp>
 #include "object_detection_matcher.hpp"
+#include "details/ie_cnn_network_iterator.hpp"
 
 #include <algorithm>
 

diff --git a/inference-engine/tests_deprecated/functional/mkldnn/single_layer_tests/conv_tests.cpp b/inference-engine/tests_deprecated/functional/mkldnn/single_layer_tests/conv_tests.cpp
index 00cf2da..146ceab 100644 (file)
--- a/inference-engine/tests_deprecated/functional/mkldnn/single_layer_tests/conv_tests.cpp
+++ b/inference-engine/tests_deprecated/functional/mkldnn/single_layer_tests/conv_tests.cpp
@@ -306,10 +306,12 @@ protected:
     }
 
     void updatePaddings(const CNNNetwork &network, conv_test_params& p) {
-        auto found = std::find_if(network.begin(), network.end(), [](const CNNLayer::Ptr& layer) {
+        auto & inetwork = (const ICNNNetwork &)network;
+        details::CNNNetworkIterator i(&inetwork), end;
+        auto found = std::find_if(i, end, [](const CNNLayer::Ptr& layer) {
             return layer->type == "Convolution";
         });
-        ASSERT_NE(found, network.end());
+        ASSERT_NE(found, end);
         auto convLayer = std::dynamic_pointer_cast<ConvolutionLayer>(*found);
         auto allPad = getPaddings(*convLayer.get());
         p.pads_begin[X_AXIS] = allPad.begin[X_AXIS];

diff --git a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp
index 6e0ab59..6fbc8f4 100644 (file)
--- a/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp
+++ b/inference-engine/tests_deprecated/functional/shared_tests/common_single_layer_tests/single_layer_tests.hpp
@@ -9,7 +9,7 @@
 #include <tests_common.hpp>
 #include <ie_format_parser.h>
 #include <ie_layers_internal.hpp>
-#include <ie_layers_internal.hpp>
+#include <details/ie_cnn_network_iterator.hpp>
 #include <functional_test_utils/plugin_cache.hpp>
 
 #include "conv_ref.hpp"
@@ -186,10 +186,12 @@ std::string LayerTestHelper::propertyToString(const PropertyVector<unsigned int>
 ConvolutionTestHelper::ConvolutionTestHelper(const CommonTestUtils::conv_common_params &_convParams) : LayerTestHelper("Convolution"), convParams(_convParams) {}
 
 void ConvolutionTestHelper::updatePaddingValues(const CNNNetwork &network) {
-    auto found = std::find_if(network.begin(), network.end(), [this](const CNNLayer::Ptr &layer) {
+    auto & inetwork = (const ICNNNetwork &)network;
+    details::CNNNetworkIterator i(&inetwork), end;
+    auto found = std::find_if(i, end, [this](const CNNLayer::Ptr &layer) {
         return layer->type == type;
     });
-    ASSERT_NE(found, network.end());
+    ASSERT_NE(found, end);
 
     auto castedLayer = std::dynamic_pointer_cast<ConvolutionLayer>(*found);
     auto allPad = getPaddings(*castedLayer.get());
@@ -279,10 +281,12 @@ void DeformableConvolutionTestHelper::ref_fp16(const std::vector<InferenceEngine
 }
 
 void DeformableConvolutionTestHelper::updatePaddingValues(const CNNNetwork &network) {
-    auto found = std::find_if(network.begin(), network.end(), [this](const CNNLayer::Ptr &layer) {
+    auto & inetwork = (const ICNNNetwork &)network;
+    details::CNNNetworkIterator i(&inetwork), end;
+    auto found = std::find_if(i, end, [this](const CNNLayer::Ptr &layer) {
         return layer->type == type;
     });
-    ASSERT_NE(found, network.end());
+    ASSERT_NE(found, end);
 
     auto castedLayer = std::dynamic_pointer_cast<ConvolutionLayer>(*found);
     auto allPad = getPaddings(*castedLayer.get());
@@ -349,10 +353,12 @@ void PoolingTestHelper::ref_fp16(const std::vector<InferenceEngine::Blob::Ptr> s
 }
 
 void PoolingTestHelper::updatePaddingValues(const InferenceEngine::CNNNetwork &network) {
-    auto found = std::find_if(network.begin(), network.end(), [this](const CNNLayer::Ptr &layer) {
+    auto & inetwork = (const ICNNNetwork &)network;
+    details::CNNNetworkIterator i(&inetwork), end;
+    auto found = std::find_if(i, end, [this](const CNNLayer::Ptr &layer) {
         return layer->type == type;
     });
-    ASSERT_NE(found, network.end());
+    ASSERT_NE(found, end);
 
     auto castedLayer = std::dynamic_pointer_cast<PoolingLayer>(*found);
     auto allPad = getPaddings(*castedLayer.get());

diff --git a/inference-engine/tests_deprecated/functional/shared_tests/ie_class/ie_class.hpp b/inference-engine/tests_deprecated/functional/shared_tests/ie_class/ie_class.hpp
index 2babf10..28638e5 100644 (file)
--- a/inference-engine/tests_deprecated/functional/shared_tests/ie_class/ie_class.hpp
+++ b/inference-engine/tests_deprecated/functional/shared_tests/ie_class/ie_class.hpp
@@ -6,6 +6,7 @@
 
 #include <gtest/gtest.h>
 #include <details/ie_cnn_network_tools.h>
+#include <details/ie_cnn_network_iterator.hpp>
 #include <ie_core.hpp>
 #include <ie_plugin_config.hpp>
 #include <tests_common.hpp>
@@ -35,15 +36,6 @@ using namespace InferenceEngine;
 using namespace InferenceEngine::details;
 using namespace InferenceEngine::PluginConfigParams;
 
-#define CHECK_MULTI() do { \
-                          try { \
-                              Core ie; \
-                              ie.GetVersions("MULTI"); \
-                          } catch (...) { \
-                            GTEST_SKIP(); \
-                          } \
-                      } while(false)\
-
 class IEClassBasicTest : public TestsCommon {
 public:
     void SetUp() override {
@@ -341,7 +333,6 @@ TEST_F(IEClassBasicTest, smoke_ImportNetworkHeteroThrows) {
 }
 
 TEST_F(IEClassBasicTest, smoke_ImportNetworkMultiThrows) {
-    CHECK_MULTI();
     InferenceEngine::Core ie;
     ASSERT_THROW(ie.ImportNetwork("model", "MULTI"), InferenceEngineException);
 }
@@ -462,7 +453,6 @@ TEST_P(IEClassNetworkTestP, QueryNetworkHeteroActualNoThrow) {
 }
 
 TEST_P(IEClassNetworkTestP, QueryNetworkMultiThrows) {
-    CHECK_MULTI();
     Core ie;
     ASSERT_THROW(ie.QueryNetwork(actualNetwork, "MULTI"), InferenceEngineException);
 }
@@ -1240,8 +1230,6 @@ TEST_P(IEClassLoadNetworkTest, LoadNetworkHETEROAndDeviceIDThrows) {
 //
 
 TEST_P(IEClassLoadNetworkTest, LoadNetworkHETEROwithMULTINoThrow) {
-    CHECK_MULTI();
-
     Core ie;
     if (supportsDeviceID(ie, deviceName) && supportsAvaliableDevices(ie, deviceName)) {
         std::string devices;
@@ -1262,7 +1250,6 @@ TEST_P(IEClassLoadNetworkTest, LoadNetworkHETEROwithMULTINoThrow) {
 }
 
 TEST_P(IEClassLoadNetworkTest, LoadNetworkMULTIwithHETERONoThrow) {
-    CHECK_MULTI();
     Core ie;
 
     if (supportsDeviceID(ie, deviceName) && supportsAvaliableDevices(ie, deviceName)) {
@@ -1287,7 +1274,6 @@ TEST_P(IEClassLoadNetworkTest, LoadNetworkMULTIwithHETERONoThrow) {
 //
 
 TEST_P(IEClassLoadNetworkTest, QueryNetworkHETEROwithMULTINoThrowv7) {
-    CHECK_MULTI();
     Core ie;
 
     if (supportsDeviceID(ie, deviceName) && supportsAvaliableDevices(ie, deviceName)) {
@@ -1316,7 +1302,6 @@ TEST_P(IEClassLoadNetworkTest, QueryNetworkHETEROwithMULTINoThrowv7) {
 }
 
 TEST_P(IEClassLoadNetworkTest, QueryNetworkMULTIwithHETERONoThrowv7) {
-    CHECK_MULTI();
     Core ie;
 
     if (supportsDeviceID(ie, deviceName) && supportsAvaliableDevices(ie, deviceName)) {
@@ -1345,7 +1330,6 @@ TEST_P(IEClassLoadNetworkTest, QueryNetworkMULTIwithHETERONoThrowv7) {
 }
 
 TEST_P(IEClassLoadNetworkTest, DISABLED_QueryNetworkHETEROWithMULTINoThrowV10) {
-    CHECK_MULTI();
     Core ie;
 
     if (supportsDeviceID(ie, deviceName) && supportsAvaliableDevices(ie, deviceName)) {
@@ -1381,7 +1365,6 @@ TEST_P(IEClassLoadNetworkTest, DISABLED_QueryNetworkHETEROWithMULTINoThrowV10) {
 }
 
 TEST_P(IEClassLoadNetworkTest, DISABLED_QueryNetworkMULTIWithHETERONoThrowV10) {
-    CHECK_MULTI();
     Core ie;
 
     if (supportsDeviceID(ie, deviceName) && supportsAvaliableDevices(ie, deviceName)) {
@@ -1419,7 +1402,6 @@ TEST_P(IEClassLoadNetworkTest, DISABLED_QueryNetworkMULTIWithHETERONoThrowV10) {
 using IEClassLoadNetworkAfterCoreRecreateTest = IEClassLoadNetworkTest;
 
 TEST_P(IEClassLoadNetworkAfterCoreRecreateTest, LoadAfterRecreateCoresAndPlugins) {
-    CHECK_MULTI();
     Core ie;
     {
         auto versions = ie.GetVersions("MULTI:" + deviceName + ",CPU");

diff --git a/inference-engine/tests_deprecated/functional/shared_tests/single_layer_tests/conv_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/single_layer_tests/conv_tests.hpp
index 892362e..6d502a3 100644 (file)
--- a/inference-engine/tests_deprecated/functional/shared_tests/single_layer_tests/conv_tests.hpp
+++ b/inference-engine/tests_deprecated/functional/shared_tests/single_layer_tests/conv_tests.hpp
@@ -4,6 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <ie_core.hpp>
+#include <details/ie_cnn_network_iterator.hpp>
 
 #include "tests_common.hpp"
 #include "single_layer_common.hpp"
@@ -492,10 +493,12 @@ protected:
     }
 
     void updatePaddings(const CNNNetwork &network, conv_test_params& p) {
-        auto found = std::find_if(network.begin(), network.end(), [](const CNNLayer::Ptr& layer) {
+        auto & inetwork = static_cast<const ICNNNetwork &>(network);
+        details::CNNNetworkIterator i(&inetwork), end;
+        auto found = std::find_if(i, end, [](const CNNLayer::Ptr& layer) {
             return layer->type == "Convolution";
         });
-        ASSERT_NE(found, network.end());
+        ASSERT_NE(found, end);
         auto convLayer = std::dynamic_pointer_cast<ConvolutionLayer>(*found);
         auto allPad = getPaddings(*convLayer.get());
         p.pads_begin[X_AXIS] = allPad.begin[X_AXIS];

diff --git a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp
index 378d71d..e7db7ff 100644 (file)
--- a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp
+++ b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp
@@ -27,6 +27,7 @@
 #include <details/ie_cnn_network_tools.h>
 
 #include "unit_test_utils/mocks/mock_icnn_network.hpp"
+#include "details/ie_cnn_network_iterator.hpp"
 
 using namespace std;
 using namespace InferenceEngine;
@@ -92,7 +93,10 @@ void GNAPropagateMatcher :: match() {
 
             std::vector<InferenceEngine::CNNLayerPtr> tiBodies;
 
-            for (auto &layer : net_original) {
+            const auto & inetwork = static_cast<const ICNNNetwork&>(net_original);
+            for (auto layerIt = details::CNNNetworkIterator(&inetwork), end = details::CNNNetworkIterator();
+                     layerIt != end; ++layerIt) {
+                auto layer = *layerIt;
                 if (layer->type == "TensorIterator") {
                     auto tiBody = NetPass::TIBodySortTopologically(std::dynamic_pointer_cast<InferenceEngine::TensorIterator>(layer)->body);
                     tiBodies.insert(tiBodies.end(), tiBody.begin(), tiBody.end());

diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_conv_concat_tests.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_conv_concat_tests.cpp
index c1c4c87..d3da39b 100644 (file)
--- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_conv_concat_tests.cpp
+++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_conv_concat_tests.cpp
@@ -8,6 +8,7 @@
 #include "tests_common.hpp"
 #include "ir_gen_helper.hpp"
 #include <ie_core.hpp>
+#include "details/ie_cnn_network_iterator.hpp"
 
 using namespace ::testing;
 using namespace std;
@@ -210,8 +211,10 @@ protected:
 
             graph.Infer(srcs, outputBlobs);
 
-            for (auto& layer : network) {
-                layer->params["PrimitivesPriority"] = "cpu:ref,cpu:ref_any";
+            const auto & inetwork = static_cast<const ICNNNetwork&>(network);
+            details::CNNNetworkIterator l(&inetwork), end;
+            for ( ; l != end; ++l) {
+                (*l)->params["PrimitivesPriority"] = "cpu:ref,cpu:ref_any";
             }
             MKLDNNGraphTestClass graph2;
             graph2.CreateGraph(network);

diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_structure_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_structure_test.cpp
index e5d2c3b..d02c654 100644 (file)
--- a/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_structure_test.cpp
+++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/graph/structure/graph_structure_test.cpp
@@ -7,6 +7,7 @@
 
 #include "tests_common.hpp"
 #include <ie_core.hpp>
+#include "details/ie_cnn_network_iterator.hpp"
 
 #include <ngraph/ngraph.hpp>
 
@@ -5139,7 +5140,9 @@ TEST_F(MKLDNNGraphStructureTests, TestGemmConvolutionWithConcat) {
 
     auto graphInfer = [](InferenceEngine::CNNNetwork network, InferenceEngine::BlobMap& inBlobs,
             InferenceEngine::BlobMap& outBlobs, std::string primitivesPriority) {
-        for (auto it = network.begin(); !primitivesPriority.empty() && it !=network.end(); it++) {
+        const auto & inetwork = static_cast<const InferenceEngine::ICNNNetwork&>(network);
+        for (auto it = InferenceEngine::details::CNNNetworkIterator(&inetwork); !primitivesPriority.empty() &&
+            it != InferenceEngine::details::CNNNetworkIterator(); it++) {
             (*it)->params["PrimitivesPriority"] = primitivesPriority;
         }
 
@@ -5423,7 +5426,9 @@ TEST_F(MKLDNNGraphStructureTests, TestRefPoolingWithConcat) {
 
     auto graphInfer = [](InferenceEngine::CNNNetwork network, InferenceEngine::BlobMap& inBlobs,
                          InferenceEngine::BlobMap& outBlobs, std::string primitivesPriority) {
-        for (auto it = network.begin(); !primitivesPriority.empty() && it !=network.end(); it++) {
+        const auto & inetwork = static_cast<const InferenceEngine::ICNNNetwork&>(network);
+        for (auto it = InferenceEngine::details::CNNNetworkIterator(&inetwork); !primitivesPriority.empty() &&
+            it != InferenceEngine::details::CNNNetworkIterator(); it++) {
             (*it)->params["PrimitivesPriority"] = primitivesPriority;
         }
 

diff --git a/inference-engine/tests_deprecated/unit/engines/mkldnn/normalizer/supported_fusions_test.cpp b/inference-engine/tests_deprecated/unit/engines/mkldnn/normalizer/supported_fusions_test.cpp
index 0de2209..c21f108 100644 (file)
--- a/inference-engine/tests_deprecated/unit/engines/mkldnn/normalizer/supported_fusions_test.cpp
+++ b/inference-engine/tests_deprecated/unit/engines/mkldnn/normalizer/supported_fusions_test.cpp
@@ -84,7 +84,6 @@ protected:
 
             InferenceEngine::Core ie;
             auto network = ie.ReadNetwork(model, getConvWeightsBlob(p.in1, p.conv));
-            network.begin();  // Call conversion from CNNNetwork NgraphImpl to CNNNetwork
             std::shared_ptr<MKLDNNPlugin::Engine> score_engine(new MKLDNNPlugin::Engine());
             InferenceEngine::IExecutableNetwork::Ptr exeNetwork1;
             ASSERT_NO_THROW(score_engine->LoadNetwork(exeNetwork1, network, {}));
@@ -144,7 +143,6 @@ protected:
 
             Core ie;
             auto network = ie.ReadNetwork(model, getConvWeightsBlob(p.in1, p.conv));
-            network.begin();  // Call conversion from CNNNetwork NgraphImpl to CNNNetwork
 
             std::shared_ptr<MKLDNNPlugin::Engine> score_engine(new MKLDNNPlugin::Engine());
             InferenceEngine::IExecutableNetwork::Ptr exeNetwork1;
@@ -206,7 +204,6 @@ protected:
 
             Core ie;
             auto network = ie.ReadNetwork(model, getConvWeightsBlob(p.in1, p.conv));
-            network.begin();  // Call conversion from CNNNetwork NgraphImpl to CNNNetwork
 
             std::shared_ptr<MKLDNNPlugin::Engine> score_engine(new MKLDNNPlugin::Engine());
             InferenceEngine::IExecutableNetwork::Ptr exeNetwork1;
@@ -266,7 +263,6 @@ protected:
             size_t weight_size = getConvWeightsSize(p.in1, p.conv1, "FP32") + getConvBiasesSize(p.conv1, "FP32") +
                                  getConvWeightsSize(p.in2, p.conv2, "FP32") + getConvBiasesSize(p.conv2, "FP32");
             auto network = ie.ReadNetwork(model, CommonTestUtils::getWeightsBlob(weight_size));
-            network.begin();  // Call conversion from CNNNetwork NgraphImpl to CNNNetwork
 
             std::shared_ptr<MKLDNNPlugin::Engine> score_engine(new MKLDNNPlugin::Engine());
             InferenceEngine::IExecutableNetwork::Ptr exeNetwork1;
@@ -343,7 +339,6 @@ protected:
                                  getConvWeightsSize(p.in2, p.conv2, "FP32") + getConvBiasesSize(p.conv2, "FP32") +
                                  getConvWeightsSize(convOutShape3, p.conv3, "FP32") + getConvBiasesSize(p.conv3, "FP32");
             auto network = ie.ReadNetwork(model, CommonTestUtils::getWeightsBlob(weight_size));
-            network.begin();  // Call conversion from CNNNetwork NgraphImpl to CNNNetwork
 
             std::shared_ptr<MKLDNNPlugin::Engine> score_engine(new MKLDNNPlugin::Engine());
             InferenceEngine::IExecutableNetwork::Ptr exeNetwork1;

diff --git a/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp b/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp
index 0b7178d..6deda6d 100644 (file)
--- a/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp
+++ b/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp
@@ -13,6 +13,7 @@
 #include "ie_common.h"
 #include <memory>
 #include "details/ie_cnn_network_tools.h"
+#include "details/ie_cnn_network_iterator.hpp"
 
 using namespace testing;
 using namespace InferenceEngine;
@@ -254,12 +255,14 @@ TEST_F(GraphToolsTest, canIterateOverCNNNetwork) {
         prepareInputs(maps);
     })));
 
-    std::vector<CNNLayerPtr>resultedOrder;
-    for (auto l : wrap) {
-        resultedOrder.push_back(l);
+    std::vector<CNNLayerPtr> resultedOrder;
+    const auto & inetwork = static_cast<const ICNNNetwork&>(wrap);
+    details::CNNNetworkIterator l(&inetwork), end;
+    for ( ; l != end; ++l) {
+        resultedOrder.push_back(*l);
     }
 
-    ASSERT_EQ(wrap.size(), 8);
+    ASSERT_EQ(resultedOrder.size(), 8);
     ASSERT_STREQ(resultedOrder[0]->name.c_str(), "2");
     ASSERT_STREQ(resultedOrder[1]->name.c_str(), "6");
     ASSERT_STREQ(resultedOrder[2]->name.c_str(), "1");
@@ -280,12 +283,14 @@ TEST_F(GraphToolsTest, canIterateOverCNNNetworkWithCycle) {
         prepareInputs(maps);
     })));
 
-    std::vector<CNNLayerPtr>resultedOrder;
-    for (auto l : wrap) {
-        resultedOrder.push_back(l);
+    std::vector<CNNLayerPtr> resultedOrder;
+    const auto & inetwork = static_cast<const ICNNNetwork&>(wrap);
+    details::CNNNetworkIterator l(&inetwork), end;
+    for (; l != end; ++l) {
+        resultedOrder.push_back(*l);
     }
 
-    ASSERT_EQ(wrap.size(), 4);
+    ASSERT_EQ(resultedOrder.size(), 4);
     ASSERT_STREQ(resultedOrder[0]->name.c_str(), "2");
     ASSERT_STREQ(resultedOrder[1]->name.c_str(), "3");
     ASSERT_STREQ(resultedOrder[2]->name.c_str(), "1");
@@ -300,7 +305,8 @@ TEST_F(GraphToolsTest, canCompareCNNNetworkIterators) {
         prepareInputs(maps);
     })));
 
-    auto i = std::begin(wrap);
+    const auto & inetwork = static_cast<const ICNNNetwork&>(wrap);
+    details::CNNNetworkIterator i(&inetwork);
     auto i2 = i;
     i2++;
 
@@ -317,7 +323,9 @@ TEST_F(GraphToolsTest, canIterateOverEmptyNetwork) {
         prepareInputs(maps);
     })));
 
-    ASSERT_EQ(std::begin(wrap), std::end(wrap));
+    const auto & inetwork = static_cast<const ICNNNetwork&>(wrap);
+    details::CNNNetworkIterator beg(&inetwork), end;
+    ASSERT_EQ(beg, end);
 }
 
 TEST_F(GraphToolsTest, CNNNetSwapLayersThrowsForNullPointers) {