Updated dates of removal for deprecated API (#912)

diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp
index dfda34a..4b934c1 100644 (file)
--- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp
+++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp
@@ -229,12 +229,14 @@ void InferenceEnginePython::IENetwork::serialize(const std::string &path_to_xml,
 
 const std::vector <InferenceEngine::CNNLayerPtr>
 InferenceEnginePython::IENetwork::getLayers() {
+    IE_SUPPRESS_DEPRECATED_START
     std::vector<InferenceEngine::CNNLayerPtr> result;
     std::vector<InferenceEngine::CNNLayerPtr> sorted_layers = InferenceEngine::details::CNNNetSortTopologically(*actual);
     for (const auto &layer : sorted_layers) {
         result.emplace_back(layer);
     }
     return result;
+    IE_SUPPRESS_DEPRECATED_END
 }
 
 PyObject* InferenceEnginePython::IENetwork::getFunction() {

diff --git a/inference-engine/include/cpp/ie_plugin_cpp.hpp b/inference-engine/include/cpp/ie_plugin_cpp.hpp
index db56c01..e93afcf 100644 (file)
--- a/inference-engine/include/cpp/ie_plugin_cpp.hpp
+++ b/inference-engine/include/cpp/ie_plugin_cpp.hpp
@@ -22,12 +22,12 @@
 namespace InferenceEngine {
 
 /**
- * @deprecated Use InferenceEngine::Core instead. Will be removed in 2020.3
+ * @deprecated Use InferenceEngine::Core instead. Will be removed in 2021.1
  * @brief This class is a C++ API wrapper for IInferencePlugin.
  *
  * It can throw exceptions safely for the application, where it is properly handled.
  */
-class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core instead. Will be removed in 2020.3") InferencePlugin {
+class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core instead. Will be removed in 2021.1") InferencePlugin {
     IE_SUPPRESS_DEPRECATED_START
     InferenceEnginePluginPtr actual;
 

diff --git a/inference-engine/include/details/ie_cnn_network_iterator.hpp b/inference-engine/include/details/ie_cnn_network_iterator.hpp
index 4bbc93c..104b3a4 100644 (file)
--- a/inference-engine/include/details/ie_cnn_network_iterator.hpp
+++ b/inference-engine/include/details/ie_cnn_network_iterator.hpp
@@ -21,10 +21,10 @@ namespace InferenceEngine {
 namespace details {
 
 /**
- * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3
+ * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1
  * @brief This class enables range loops for CNNNetwork objects
  */
-class INFERENCE_ENGINE_INTERNAL("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3")
+class INFERENCE_ENGINE_INTERNAL("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1")
 CNNNetworkIterator {
     IE_SUPPRESS_DEPRECATED_START
 

diff --git a/inference-engine/include/details/ie_cnn_network_tools.h b/inference-engine/include/details/ie_cnn_network_tools.h
index 6e17bca..7723f80 100644 (file)
--- a/inference-engine/include/details/ie_cnn_network_tools.h
+++ b/inference-engine/include/details/ie_cnn_network_tools.h
@@ -16,6 +16,7 @@
 namespace InferenceEngine {
 namespace details {
 
+INFERENCE_ENGINE_INTERNAL("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1")
 INFERENCE_ENGINE_API_CPP(std::vector<CNNLayerPtr>) CNNNetSortTopologically(const ICNNNetwork& network);
 
 }  // namespace details

diff --git a/inference-engine/include/ie_data.h b/inference-engine/include/ie_data.h
index d1175dd..7664659 100644 (file)
--- a/inference-engine/include/ie_data.h
+++ b/inference-engine/include/ie_data.h
@@ -126,7 +126,7 @@ public:
     const SizeVector& getDims() const;
 
     /**
-     * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3
+     * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1
      * @brief Returns an owner of this data layer, parent layer in di-graph
      * @return A weak pointer to CNNLayer that creates this data
      */
@@ -147,7 +147,7 @@ public:
     void setName(const std::string& newName);
 
     /**
-     * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3
+     * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1
      * @brief Privates child layers in di-graph
      * @return A map of child layers
      */

diff --git a/inference-engine/include/ie_layers.h b/inference-engine/include/ie_layers.h
index 67a6ad4..0ff7fac 100644 (file)
--- a/inference-engine/include/ie_layers.h
+++ b/inference-engine/include/ie_layers.h
@@ -2049,7 +2049,7 @@ public:
 };
 
 /**
- * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3
+ * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1
  * @brief This class represents a standard ScatterUpdate layer
  */
 class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(ScatterUpdateLayer): public CNNLayer {
@@ -2063,7 +2063,7 @@ public:
 };
 
 /**
- * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3
+ * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1
  * @brief This class represents a standard ScatterElementsUpdate layer
  */
 class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(ScatterElementsUpdateLayer): public CNNLayer {
@@ -2077,7 +2077,7 @@ public:
 };
 
 /**
- * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3
+ * @deprecated Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1
  * @brief This class represents an onnx ExperimentalDetectronPriorGridGenerator Layer
  */
 class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(ExperimentalDetectronPriorGridGeneratorLayer): public CNNLayer {

diff --git a/inference-engine/tests/functional/inference_engine/net_reader_test.cpp b/inference-engine/tests/functional/inference_engine/net_reader_test.cpp
index 2d008bb..7d9ac79 100644 (file)
--- a/inference-engine/tests/functional/inference_engine/net_reader_test.cpp
+++ b/inference-engine/tests/functional/inference_engine/net_reader_test.cpp
@@ -60,9 +60,11 @@ protected:
     /* validates a read network with the reference map of CNN layers */
     void compareWithRef(const InferenceEngine::CNNNetwork &network,
                         const std::vector<InferenceEngine::CNNLayerPtr> &refLayersVec) {
+        IE_SUPPRESS_DEPRECATED_START
         ASSERT_NO_THROW(FuncTestUtils::compareLayerByLayer<std::vector<InferenceEngine::CNNLayerPtr>>(
                 InferenceEngine::details::CNNNetSortTopologically(network),
                 refLayersVec, false));
+        IE_SUPPRESS_DEPRECATED_END
     }
 
     const std::string _modelPath = "NetReader_test.xml";

diff --git a/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp b/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp
index efcd559..db102b5 100644 (file)
--- a/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp
+++ b/inference-engine/tests/functional/plugin/shared/include/behavior/exec_graph_info.hpp
@@ -56,10 +56,10 @@ TEST_P(ExecGraphTests, CheckExecGraphInfoBeforeExecution) {
         }
         int IteratorForLayersConstant = 0;
         // Store all the layers from the executable graph information represented as CNNNetwork
+        IE_SUPPRESS_DEPRECATED_START
         const std::vector<InferenceEngine::CNNLayerPtr> execGraphLayers =
                 InferenceEngine::details::CNNNetSortTopologically(execGraph);
         for (const auto &execLayer : execGraphLayers) {
-            IE_SUPPRESS_DEPRECATED_START
             // Each layer from the execGraphInfo network must have PM data option set
             ASSERT_EQ("not_executed", execLayer->params[ExecGraphInfoSerialization::PERF_COUNTER]);
             // Parse origin layer names (fused/merged layers) from the executable graph
@@ -73,8 +73,8 @@ TEST_P(ExecGraphTests, CheckExecGraphInfoBeforeExecution) {
                 ASSERT_NE(originalLayersMap.end(), origLayer) << layer;
                 origLayer->second++;
             });
-            IE_SUPPRESS_DEPRECATED_END
         }
+        IE_SUPPRESS_DEPRECATED_END
         // All layers from the original IR must be present with in ExecGraphInfo
         for (auto &layer : originalLayersMap) {
             if ((layer.second == 0) && (IteratorForLayersConstant > 0)) {
@@ -110,11 +110,11 @@ TEST_P(ExecGraphTests, CheckExecGraphInfoAfterExecution) {
         }
         int IteratorForLayersConstant = 0;
         // Store all the layers from the executable graph information represented as CNNNetwork
+        IE_SUPPRESS_DEPRECATED_START
         const std::vector<InferenceEngine::CNNLayerPtr> execGraphLayers =
                 InferenceEngine::details::CNNNetSortTopologically(execGraph);
         bool has_layer_with_valid_time = false;
         for (const auto &execLayer : execGraphLayers) {
-            IE_SUPPRESS_DEPRECATED_START
             // At least one layer in the topology should be executed and have valid perf counter value
             try {
                 float x = static_cast<float>(std::atof(
@@ -134,8 +134,8 @@ TEST_P(ExecGraphTests, CheckExecGraphInfoAfterExecution) {
                 ASSERT_NE(originalLayersMap.end(), origLayer) << layer;
                 origLayer->second++;
             });
-            IE_SUPPRESS_DEPRECATED_END
         }
+        IE_SUPPRESS_DEPRECATED_END
         ASSERT_TRUE(has_layer_with_valid_time);
 
         // All layers from the original IR must be present within ExecGraphInfo