Remove deprecated api (#6256)

* Revert "Fixed creation of C++ wrappers from old API (#5805)" This reverts commit ffe03b6. * Removed deprecated API * Fixes 2
openvinotoolkit · Jun 20, 2021 · 7e66411 · 7e66411
1 parent 72c8743
commit 7e66411
Show file tree

Hide file tree

Showing 28 changed files with 30 additions and 897 deletions.
diff --git a/inference-engine/include/cpp/ie_executable_network.hpp b/inference-engine/include/cpp/ie_executable_network.hpp
@@ -32,9 +32,6 @@ class IExecutableNetworkInternal;
 class INFERENCE_ENGINE_API_CLASS(ExecutableNetwork) {
     details::SharedObjectLoader                  _so;
     std::shared_ptr<IExecutableNetworkInternal>  _impl;
-    IE_SUPPRESS_DEPRECATED_START
-    std::shared_ptr<IExecutableNetwork>          actual;
-    IE_SUPPRESS_DEPRECATED_END
 
     /**
      * @brief Constructs ExecutableNetwork from the initialized std::shared_ptr
@@ -51,18 +48,6 @@ class INFERENCE_ENGINE_API_CLASS(ExecutableNetwork) {
      */
     ExecutableNetwork() = default;
 
-    IE_SUPPRESS_DEPRECATED_START
-    /**
-     * @deprecated This ctor will be removed in 2022.1
-     * @brief Constructs ExecutableNetwork from the initialized std::shared_ptr
-     * @param exec Initialized shared pointer
-     * @param splg Plugin to use. This is required to ensure that ExecutableNetwork can work properly even if plugin object is destroyed.
-     */
-    INFERENCE_ENGINE_DEPRECATED("This ctor will be removed in 2022.1")
-    explicit ExecutableNetwork(std::shared_ptr<IExecutableNetwork> exec,
-                               std::shared_ptr<details::SharedObjectLoader> splg = {});
-    IE_SUPPRESS_DEPRECATED_END
-
     /**
      * @brief Gets the Executable network output Data node information.
      *

diff --git a/inference-engine/include/cpp/ie_infer_request.hpp b/inference-engine/include/cpp/ie_infer_request.hpp
@@ -35,10 +35,6 @@ class ICompletionCallbackWrapper;
 class INFERENCE_ENGINE_API_CLASS(InferRequest) {
     details::SharedObjectLoader                          _so;
     std::shared_ptr<IInferRequestInternal>               _impl;
-    IE_SUPPRESS_DEPRECATED_START
-    IInferRequest::Ptr                                   actual;
-    std::shared_ptr<details::ICompletionCallbackWrapper> callback;
-    IE_SUPPRESS_DEPRECATED_END
 
     /**
      * @brief Constructs InferRequest from the initialized std::shared_ptr
@@ -71,18 +67,6 @@ class INFERENCE_ENGINE_API_CLASS(InferRequest) {
      */
     InferRequest() = default;
 
-    IE_SUPPRESS_DEPRECATED_START
-    /**
-     * @deprecated This ctor will be removed in 2022.1
-     * @brief Constructs InferRequest from the initialized std::shared_ptr
-     * @param request Initialized shared pointer
-     * @param splg Plugin to use. This is required to ensure that InferRequest can work properly even if plugin object is destroyed.
-     */
-    INFERENCE_ENGINE_DEPRECATED("This ctor will be removed in 2022.1")
-    explicit InferRequest(IInferRequest::Ptr request,
-                          std::shared_ptr<details::SharedObjectLoader> splg = {});
-    IE_SUPPRESS_DEPRECATED_END
-
     /**
      * @brief Sets input/output data to infer
      *

diff --git a/inference-engine/include/cpp/ie_memory_state.hpp b/inference-engine/include/cpp/ie_memory_state.hpp
@@ -3,7 +3,7 @@
 //
 
 /**
- * @brief A header file that provides wrapper classes for IVariableState
+ * @brief A header file that provides VariableState
  *
  * @file ie_memory_state.hpp
  */
@@ -16,21 +16,17 @@
 #include "ie_api.h"
 #include "ie_blob.h"
 #include "details/ie_so_loader.h"
-#include "ie_imemory_state.hpp"
 
 namespace InferenceEngine {
 
 class IVariableStateInternal;
 
 /**
- * @brief C++ exception based error reporting wrapper of API class IVariableState
+ * @brief VariableState class
  */
 class INFERENCE_ENGINE_API_CLASS(VariableState) {
     details::SharedObjectLoader              _so;
     std::shared_ptr<IVariableStateInternal>  _impl;
-    IE_SUPPRESS_DEPRECATED_START
-    std::shared_ptr<IVariableState>          actual;
-    IE_SUPPRESS_DEPRECATED_END
 
     /**
      * @brief Constructs VariableState from the initialized std::shared_ptr
@@ -48,55 +44,27 @@ class INFERENCE_ENGINE_API_CLASS(VariableState) {
      */
     VariableState() = default;
 
-    IE_SUPPRESS_DEPRECATED_START
     /**
-     * @deprecated This ctor will be removed in 2022.1
-     * @brief constructs VariableState from the initialized std::shared_ptr
-     * @param pState Initialized shared pointer
-     * @param plg Optional: Plugin to use. This is required to ensure that VariableState can work properly even if plugin object is destroyed.
-     */
-    INFERENCE_ENGINE_DEPRECATED("This ctor will be removed in 2022.1")
-    explicit VariableState(std::shared_ptr<IVariableState> pState,
-                           std::shared_ptr<details::SharedObjectLoader> plg = {});
-    IE_SUPPRESS_DEPRECATED_END
-
-    /**
-     * @copybrief IVariableState::Reset
-     *
-     * Wraps IVariableState::Reset
+     * @brief Reset internal variable state for relevant infer request,
+     * to a value specified as default for according ReadValue node
      */
     void Reset();
 
     /**
-     * @copybrief IVariableState::GetName
-     *
-     * Wraps IVariableState::GetName
+     * @brief Gets name of current variable state, if length of array is not enough name is truncated by len, null
+     * terminator is inserted as well. As variable state name `variable_id` from according `ReadValue` used. 
      * @return A string representing a state name
      */
     std::string GetName() const;
 
     /**
-     * @copybrief IVariableState::GetState
-     *
-     * Wraps IVariableState::GetState
+     * @brief Returns the value of the variable state.
      * @return A blob representing a state
      */
     Blob::CPtr GetState() const;
 
     /**
-     * @copybrief IVariableState::GetLastState
-     * @deprecated Use IVariableState::SetState instead
-     *
-     * Wraps IVariableState::GetLastState
-     * @return A blob representing a last state 
-     */
-    INFERENCE_ENGINE_DEPRECATED("Use VariableState::GetState function instead")
-    Blob::CPtr GetLastState() const;
-
-    /**
-     * @copybrief IVariableState::SetState
-     *
-     * Wraps IVariableState::SetState
+     * @brief Sets the new state for the next inference.
      * @param state The current state to set
      */
     void SetState(Blob::Ptr state);

diff --git a/inference-engine/include/ie_iexecutable_network.hpp b/inference-engine/include/ie_iexecutable_network.hpp
@@ -18,7 +18,6 @@
 #include "ie_common.h"
 #include "ie_icnn_network.hpp"
 #include "ie_iinfer_request.hpp"
-#include "ie_imemory_state.hpp"
 #include "ie_input_info.hpp"
 #include "ie_parameter.hpp"
 #include "ie_remote_context.hpp"
@@ -113,22 +112,6 @@ class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::ExecutableNetwork instea
     INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::ExecutableNetwork::GetExecGraphInfo instead")
     virtual StatusCode GetExecGraphInfo(ICNNNetwork::Ptr& graphPtr, ResponseDesc* resp) noexcept = 0;
 
-    /**
-     * @deprecated Use InferRequest::QueryState instead
-     * @brief Gets state control interface for given executable network.
-     *
-     * State control essential for recurrent networks
-     *
-     * @param pState reference to a pointer that receives internal states
-     * @param idx requested index for receiving memory state
-     * @param resp Optional: pointer to an already allocated object to contain information in case of failure
-     * @return Status code of the operation: InferenceEngine::OK (0) for success, OUT_OF_BOUNDS (-6) no memory state for
-     * given index
-     */
-    INFERENCE_ENGINE_DEPRECATED("Use InferRequest::QueryState instead")
-    virtual StatusCode QueryState(IVariableState::Ptr& pState, size_t idx, ResponseDesc* resp) noexcept = 0;
-    IE_SUPPRESS_DEPRECATED_END
-
     /**
      * @brief Sets configuration for current executable network
      *

diff --git a/inference-engine/include/ie_iinfer_request.hpp b/inference-engine/include/ie_iinfer_request.hpp
@@ -17,7 +17,6 @@
 #include "ie_blob.h"
 #include "ie_common.h"
 #include "ie_preprocess.hpp"
-#include "ie_imemory_state.hpp"
 
 namespace InferenceEngine {
 
@@ -195,21 +194,6 @@ class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::InferRequest C++ wrapper
      */
     virtual InferenceEngine::StatusCode SetBatch(int batch_size, ResponseDesc* resp) noexcept = 0;
 
-    IE_SUPPRESS_DEPRECATED_START
-    /**
-     * @brief Gets state control interface for given infer request.
-     *
-     * State control essential for recurrent networks
-     *
-     * @param pState reference to a pointer that receives internal states
-     * @param idx requested index for receiving memory state
-     * @param resp Optional: pointer to an already allocated object to contain information in case of failure
-     * @return Status code of the operation: InferenceEngine::OK (0) for success, OUT_OF_BOUNDS (-6) no memory state for
-     * given index
-     */
-    virtual StatusCode QueryState(IVariableState::Ptr& pState, size_t idx, ResponseDesc* resp) noexcept = 0;
-    IE_SUPPRESS_DEPRECATED_END
-
 protected:
     ~IInferRequest() = default;
 };

diff --git a/inference-engine/include/ie_imemory_state.hpp b/inference-engine/include/ie_imemory_state.hpp
diff --git a/inference-engine/include/ie_parameter.hpp b/inference-engine/include/ie_parameter.hpp
@@ -49,26 +49,6 @@ class INFERENCE_ENGINE_API_CLASS(Parameter) {
         std::swap(ptr, parameter.ptr);
     }
 
-    /**
-     * @deprecated Use ngraph::Variant directly
-     * @brief Creates parameter from variant.
-     * This method creates empty parameter if variant doesn't contain Parameter
-     *
-     * @param var ngraph variant
-     */
-    INFERENCE_ENGINE_DEPRECATED("Use ngraph::Variant directly")
-    Parameter(const std::shared_ptr<ngraph::Variant>& var);
-
-    /**
-     * @deprecated Use ngraph::Variant directly
-     * @brief Creates parameter from variant.
-     * This method creates empty parameter if variant doesn't contain Parameter
-     *
-     * @param var ngraph variant
-     */
-    INFERENCE_ENGINE_DEPRECATED("Use ngraph::Variant directly")
-    Parameter(std::shared_ptr<ngraph::Variant>& var);
-
     /**
      * @brief Copy constructor
      *
@@ -204,28 +184,6 @@ class INFERENCE_ENGINE_API_CLASS(Parameter) {
         return dyn_cast<typename std::remove_cv<T>::type>(ptr);
     }
 
-    /**
-     * @deprecated Use ngraph::Variant directly
-     * @brief Converts parameter to shared pointer on ngraph::Variant
-     *
-     * @return shared pointer on ngraph::Variant
-     */
-    INFERENCE_ENGINE_DEPRECATED("Use ngraph::Variant directly")
-    std::shared_ptr<ngraph::Variant> asVariant() const;
-
-    /**
-     * @deprecated Use ngraph::Variant directly
-     * @brief Casts to shared pointer on ngraph::Variant
-     *
-     * @return shared pointer on ngraph::Variant
-     */
-    INFERENCE_ENGINE_DEPRECATED("Use ngraph::Variant directly")
-    operator std::shared_ptr<ngraph::Variant>() const {
-        IE_SUPPRESS_DEPRECATED_START
-        return asVariant();
-        IE_SUPPRESS_DEPRECATED_END
-    }
-
     /**
      * Dynamic cast to specified type
      * @tparam T type