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

Updated deprecated messages (#715)

Browse Source
This commit is contained in:
Ilya Lavrenov 2020-06-03 06:04:50 +03:00 committed by GitHub
parent 9f6fde9af2
commit cdd31da1c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 116 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inference-engine/include/cpp/ie_cnn_net_reader.h
View File

@ -23,13 +23,13 @@
namespace InferenceEngine {
/**
* @deprecated Use InferenceEngine::Core::ReadNetwork methods. This API will be removed in 2020.3
* @deprecated Use InferenceEngine::Core::ReadNetwork methods. This API will be removed in 2021.1
* @brief This is a wrapper class used to build and parse a network from the given IR.
*
* All the methods here can throw exceptions.
*/
IE_SUPPRESS_DEPRECATED_START
class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core::ReadNetwork methods. This API will be removed in 2020.3")
class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core::ReadNetwork methods. This API will be removed in 2021.1")
CNNNetReader {
public:
/**

20
inference-engine/include/cpp/ie_cnn_network.h
View File

@ -80,14 +80,14 @@ public:
virtual ~CNNNetwork() {}
/**
* @deprecated Network precision does not make sence, use precision on egdes. The method will be removed in 2020.3
* @deprecated Network precision does not make sence, use precision on egdes. The method will be removed in 2021.1
* @copybrief ICNNNetwork::getPrecision
*
* Wraps ICNNNetwork::getPrecision
*
* @return A precision type
*/
INFERENCE_ENGINE_DEPRECATED("Network precision does not make sence, use precision on egdes. The method will be removed in 2020.3")
INFERENCE_ENGINE_DEPRECATED("Network precision does not make sence, use precision on egdes. The method will be removed in 2021.1")
virtual Precision getPrecision() const;
/**
@ -228,7 +228,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
* @copybrief ICNNNetwork::getLayerByName
*
* Wraps ICNNNetwork::getLayerByName
@ -236,11 +236,11 @@ public:
* @param layerName Given name of the layer
* @return Status code of the operation. InferenceEngine::OK if succeeded
*/
INFERENCE_ENGINE_DEPRECATED("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3")
INFERENCE_ENGINE_DEPRECATED("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1")
CNNLayerPtr getLayerByName(const char* layerName) const;
/**
* @deprecated Use CNNNetwork::getFunction() and work with ngraph::Function directly. The method will be removed in 2020.3
* @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,
@ -249,25 +249,25 @@ public:
* @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 2020.3")
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 2020.3
* @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 2020.3")
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 2020.3
* @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 2020.3")
INFERENCE_ENGINE_DEPRECATED("Use CNNNetwork::layerCount() instead. The method will be removed in 2021.1")
size_t size() const;
/**

1
inference-engine/include/cpp/ie_executable_network.hpp
View File

@ -151,6 +151,7 @@ public:
/**
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph.
* This method will be removed in 2021.1 release.
* @copybrief IExecutableNetwork::GetMappedTopology
*
* Wraps IExecutableNetwork::GetMappedTopology.

2
inference-engine/include/ie_api.h
View File

@ -56,7 +56,7 @@
# define INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(...) INFERENCE_ENGINE_API_CLASS(__VA_ARGS__)
#else
# define INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(...) \
INFERENCE_ENGINE_INTERNAL("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3") \
INFERENCE_ENGINE_INTERNAL("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1") \
INFERENCE_ENGINE_API_CLASS(__VA_ARGS__)
#endif

1
inference-engine/include/ie_core.hpp
View File

@ -73,6 +73,7 @@ public:
/**
* @deprecated IErrorListener is not used anymore. An exception is thrown in case of any unexpected situations.
* The function will be removed in 2021.1 release.
* @brief Sets logging callback
*
* Logging is used to track what is going on inside the plugins, Inference Engine library

2
inference-engine/include/ie_data.h
View File

@ -47,7 +47,7 @@ public:
* @param _precision Precision of the data
* @param layout Data layout
*/
INFERENCE_ENGINE_DEPRECATED("Use Data(const std::string &, const TensorDesc&). The ctor will be removed in 2020.3")
INFERENCE_ENGINE_DEPRECATED("Use Data(const std::string &, const TensorDesc&). The ctor will be removed in 2021.1")
Data(const std::string& name, const SizeVector& a_dims, Precision _precision, Layout layout = NCHW);
/**

1
inference-engine/include/ie_error.hpp
View File

@ -12,6 +12,7 @@
namespace InferenceEngine {
/**
* @deprecated IErrorListener is not used anymore. An exception is thrown / StatusCode set in case of any unexpected situations
* The class will be removed in 2021.1 release.
* @brief This class represents a custom error listener.
*/
class

14
inference-engine/include/ie_extension.h
View File

@ -34,7 +34,7 @@ public:
};
/**
* @deprecated Implement IExtension interface
* @deprecated Implement IExtension interface. The interface will be removed in 2021.1 release.
* @brief The SOCreatorTrait class specialization for IShapeInferExtension case, defines the name of the fabric method for
* creating IExtension object in DLL
*/
@ -73,6 +73,7 @@ public:
/**
* @deprecated IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations
* The method will be removed in 2021.1 release.
* @brief Sets a log callback that is used to track what is going on inside
*
* @param listener Logging listener
@ -97,7 +98,8 @@ public:
void Release() noexcept override {}
/**
* @deprecated Use IExtension::getImplTypes to get implementation types for a particular node
* @deprecated Use IExtension::getImplTypes to get implementation types for a particular node.
* The method will removed in 2021.1 release.
* @brief Gets the array with types of layers which are included in the extension
*
* @param types Types array
@ -113,7 +115,8 @@ public:
}
/**
* @deprecated Use IExtension::getImplementation to get a concrete implementation
* @deprecated Use IExtension::getImplementation to get a concrete implementation.
* The method will be removed in 2021.1 release.
* @brief Gets the factory with implementations for a given layer
*
* @param factory Factory with implementations
@ -131,6 +134,7 @@ public:
/**
* @deprecated Implement ngraph::op::Op::validate_and_infer_types method in a custom ngraph operation
* The method will be removed in 2021.1 release.
* @brief Gets shape propagation implementation for the given string-type of CNNLayer
*
* @param impl the vector with implementations which is ordered by priority
@ -147,6 +151,7 @@ public:
/**
* @deprecated Implement ngraph::op::Op::validate_and_infer_types method in a custom ngraph operation
* The method will be removed in 2021.1 release.
* @brief Gets the array with types of layers which are included in the extension
*
* @param types Types array
@ -197,7 +202,7 @@ protected:
};
/**
* @deprecated Use a common Extension class
* @deprecated Use a common Extension class. The interface will be removed in 2021.1 release.
* @brief This class is a C++ helper to work with objects created using extensions.
*/
class INFERENCE_ENGINE_DEPRECATED("Use a common Extension interface") ShapeInferExtension :
@ -223,6 +228,7 @@ public:
/**
* @brief IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations
* The method will be removed in 2021.1 release.
* @brief Sets a log callback that is used to track what is going on inside
*
* @param listener Logging listener

4
inference-engine/include/ie_icnn_net_reader.h
View File

@ -22,13 +22,13 @@
namespace InferenceEngine {
/**
* @deprecated Use InferenceEngine::Core::ReadNetwork methods. This API will be removed in 2020.3
* @deprecated Use InferenceEngine::Core::ReadNetwork methods. This API will be removed in 2021.1
* @brief This class is the main interface to build and parse a network from a given IR
*
* All methods here do not throw exceptions and return a StatusCode and ResponseDesc object.
* Alternatively, to use methods that throw exceptions, refer to the CNNNetReader wrapper class.
*/
class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core::ReadNetwork methods. This API will be removed in 2020.3")
class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core::ReadNetwork methods. This API will be removed in 2021.1")
ICNNNetReader : public details::IRelease {
public:
/**

20
inference-engine/include/ie_icnn_network.hpp
View File

@ -60,14 +60,14 @@ public:
virtual std::shared_ptr<const ngraph::Function> getFunction() const noexcept = 0;
/**
* @deprecated Network precision does not make sence, use precision on egdes. The method will be removed in 2020.3
* @deprecated Network precision does not make sence, use precision on egdes. The method will be removed in 2021.1
* @brief Returns the main network operating precision.
*
* This may be MIXED if not homogeneous.
*
* @return A precision type
*/
INFERENCE_ENGINE_DEPRECATED("Network precision does not make sence, use precision on egdes. The method will be removed in 2020.3")
INFERENCE_ENGINE_DEPRECATED("Network precision does not make sence, use precision on egdes. The method will be removed in 2021.1")
virtual Precision getPrecision() const noexcept = 0;
/**
@ -104,14 +104,14 @@ public:
virtual InputInfo::Ptr getInput(const std::string& inputName) const noexcept = 0;
/**
* @deprecated Use ICNNNetwork::getName() instead. The method will be removed in 2020.3
* @deprecated Use ICNNNetwork::getName() instead. The method will be removed in 2021.1
* @brief Gets the network name. The name is stored in the given pName string.
*
* @param pName - will receive actual network name, specified in IR file,
* pName should point to valid memory address before invoking this function
* @param len - size in bytes of pName buffer, actual name is trimmed by this size
*/
INFERENCE_ENGINE_DEPRECATED("Use ICNNNetwork::getName() instead. The method will be removed in 2020.3")
INFERENCE_ENGINE_DEPRECATED("Use ICNNNetwork::getName() instead. The method will be removed in 2021.1")
virtual void getName(char* pName, size_t len) const noexcept = 0;
/**
@ -129,7 +129,7 @@ public:
virtual size_t layerCount() const noexcept = 0;
/**
* @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 a smart pointer reference to a Data node given its name.
*
* If the Data node is missing, returns reference to a default initialized new empty data pointer with given name.
@ -137,16 +137,16 @@ public:
* @param dname Name of the Data node
* @return Data node smart pointer
*/
INFERENCE_ENGINE_DEPRECATED("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3")
INFERENCE_ENGINE_DEPRECATED("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1")
virtual DataPtr& getData(const char* dname) noexcept = 0;
/**
* @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 Insert a layer into the network. A user is responsible to connect it to other data elements.
*
* @param layer Const reference to a layer smart pointer
*/
INFERENCE_ENGINE_DEPRECATED("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3")
INFERENCE_ENGINE_DEPRECATED("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1")
virtual void addLayer(const CNNLayerPtr& layer) noexcept = 0;
/**
@ -161,7 +161,7 @@ public:
ResponseDesc* resp = nullptr) noexcept = 0;
/**
* @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 Gets network layer with the given name
*
* @param layerName Given name of the layer
@ -169,7 +169,7 @@ public:
* @param resp Pointer to the response message that holds a description of an error if any occurred
* @return Status code of the operation. InferenceEngine::OK if succeeded
*/
INFERENCE_ENGINE_DEPRECATED("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2020.3")
INFERENCE_ENGINE_DEPRECATED("Migrate to IR v10 and work with ngraph::Function directly. The method will be removed in 2021.1")
virtual StatusCode getLayerByName(const char* layerName, CNNLayerPtr& out, ResponseDesc* resp) const noexcept = 0;
/**

3
inference-engine/include/ie_iexecutable_network.hpp
View File

@ -100,7 +100,8 @@ public:
virtual StatusCode Export(std::ostream& networkModel, ResponseDesc* resp) noexcept = 0;
/**
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph.
* The method will be removed in 2021.1 release.
* @brief Get the mapping of IR layer names to implemented kernels
*
* @param deployedTopology Map of PrimitiveInfo objects that represent the deployed topology

10
inference-engine/include/ie_iextension.h
View File

@ -147,6 +147,7 @@ public:
/**
* @deprecated Implement IExtension::getImplTypes and IExtension::getImplementation
* The interface will be removed in 2021.1 release.
* @interface ILayerImplFactory
* @brief This class provides interface for extension factories
*/
@ -178,6 +179,7 @@ public:
/**
* @deprecated Implement ngraph::op::Op::validate_and_infer_types method in a custom ngraph operation.
* The interface will be removed in 2021.1 release.
* @class IShapeInferImpl
* @brief This class provides interface for the implementation with the custom execution code
*/
@ -212,6 +214,7 @@ class IShapeInferExtension : public InferenceEngine::details::IRelease {
public:
/**
* @deprecated IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations
* The method will be removed in 2021.1 release.
* @brief Sets logging callback.
*
* Logging is used to track what is going on inside.
@ -225,7 +228,6 @@ public:
/**
* @brief Gets extension version information and stores in versionInfo
*
* @param versionInfo Pointer to version info, will be set by plugin
*/
virtual void GetVersion(const InferenceEngine::Version*& versionInfo) const noexcept = 0;
@ -237,6 +239,7 @@ public:
/**
* @deprecated Implement ngraph::op::Op::validate_and_infer_types method in a custom ngraph operation.
* The method will be removed in 2021.1 release.
* @brief Fills passed array with types of layers which shape infer implementations are included in the extension
*
* @param types Array to store the layer types
@ -249,6 +252,7 @@ public:
/**
* @deprecated Implement ngraph::op::Op::validate_and_infer_types method in a custom ngraph operation.
* The method will be removed in 2021.1 release.
* @brief Gets shape propagation implementation for the given string-type of CNNLayer
*
* @param impl the vector with implementations which is ordered by priority
@ -271,6 +275,7 @@ class INFERENCE_ENGINE_API_CLASS(IExtension) : public IShapeInferExtension {
public:
/**
* @deprecated Use IExtension::getImplementation to get a concrete implementation
* The method will be removed in 2021.1 release.
* @brief Provides a factory for a specified CNNLayer
* @param factory A factory returned from an extension plugin
* @param cnnLayer A CNNLayer object to provide factory for
@ -290,6 +295,7 @@ public:
/**
* @deprecated Use IExtension::getImplTypes to get implementation types for a particular node
* The method will be removed in 2021.1 release.
* @brief Fills passed array with types of layers which kernel implementations are included in the extension
*
* @param types Array to store the layer types
@ -354,6 +360,7 @@ using IExtensionPtr = std::shared_ptr<IExtension>;
/**
* @deprecated Migrate to IR v10 and implement shape inference in the ngraph::op::Op::validate_and_infer_types method
* This API will be removed in 2021.1 release.
* @brief A shared pointer to a IShapeInferExtension interface
*/
using IShapeInferExtensionPtr = std::shared_ptr<IShapeInferExtension>;
@ -369,6 +376,7 @@ INFERENCE_EXTENSION_API(StatusCode) CreateExtension(IExtension*& ext, ResponseDe
/**
* @deprecated Migrate to IR v10 and implement shape inference in the ngraph::op::Op::validate_and_infer_types method
* This API will be removed in 2021.1 release.
* @brief Creates the default instance of the shape infer extension
*
* @param ext Shape Infer Extension interface

118
inference-engine/include/ie_layers.h
View File

@ -32,7 +32,7 @@ class Node;
namespace InferenceEngine {
/**
* @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 is an internal common Layer parameter parsing arguments
*/
struct INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(LayerParams) {
@ -47,10 +47,8 @@ struct INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(LayerParams) {
std::string type;
/**
* deprecated Use precision of CNNLayer::outData and CNNLayer::insData
* @brief Layer precision
*/
INFERENCE_ENGINE_DEPRECATED("Use precision of CNNLayer::outData and CNNLayer::insData")
Precision precision;
/**
@ -85,7 +83,7 @@ struct INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(LayerParams) {
};
/**
* @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 is a base abstraction Layer - all DNN Layers inherit from this class
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(CNNLayer) {
@ -384,7 +382,7 @@ IE_SUPPRESS_DEPRECATED_END
IE_SUPPRESS_DEPRECATED_START_WIN
/**
* @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 layer with Weights and/or Biases (e.g. Convolution/Fully Connected, etc.)
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(WeightableLayer): public CNNLayer {
@ -427,7 +425,7 @@ public:
unsigned int& prop_name##_y = prop_name.at(Y_AXIS)
/**
* @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 3D Convolution Layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(ConvolutionLayer): public WeightableLayer {
@ -507,7 +505,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 deconvolution layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(DeconvolutionLayer): public ConvolutionLayer {
@ -519,7 +517,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 deformable convolution layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(DeformableConvolutionLayer): public ConvolutionLayer {
@ -536,7 +534,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 pooling layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(PoolingLayer): public CNNLayer {
@ -618,7 +616,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 binary convolution layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(BinaryConvolutionLayer): public WeightableLayer {
@ -723,7 +721,7 @@ public:
#undef DEFINE_PROP
/**
* @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 fully connected layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(FullyConnectedLayer): public WeightableLayer {
@ -742,7 +740,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 concatenation layer
*
* Takes as input several data elements and merges them to one using the supplied axis
@ -766,7 +764,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 layer that evenly splits the input into the supplied outputs
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(SplitLayer): public CNNLayer {
@ -785,7 +783,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 Linear Response Normalization (LRN) Layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(NormLayer): public CNNLayer {
@ -820,7 +818,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 standard softmax Layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(SoftMaxLayer): public CNNLayer {
@ -838,7 +836,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 standard GRN Layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(GRNLayer): public CNNLayer {
@ -858,7 +856,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 standard MVN Layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(MVNLayer): public CNNLayer {
@ -883,7 +881,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 Rectified Linear activation layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(ReLULayer): public CNNLayer {
@ -902,7 +900,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 Clamp activation layer
*
* Clamps all tensor elements into the range [min_value, max_value]
@ -927,7 +925,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 ReLU6 activation layer
*
* Clamps all tensor elements into the range [0, 6.0]
@ -948,7 +946,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 element wise operation layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(EltwiseLayer): public CNNLayer {
@ -999,7 +997,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 crop layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(CropLayer): public CNNLayer {
@ -1026,7 +1024,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 reshape layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(ReshapeLayer): public CNNLayer {
@ -1053,7 +1051,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 Tile Layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(TileLayer): public CNNLayer {
@ -1076,7 +1074,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 Layer which performs Scale and Shift
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(ScaleShiftLayer): public WeightableLayer {
@ -1096,7 +1094,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 TensorIterator layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(TensorIterator): public CNNLayer {
@ -1134,7 +1132,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 Base class for recurrent cell layers
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(RNNCellBase): public WeightableLayer {
@ -1193,7 +1191,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 LSTM Cell layer
*
* G - number of gates (=4)
@ -1239,7 +1237,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 GRU Cell layer
*
* G - number of gates (=3)
@ -1281,7 +1279,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 RNN Cell layer
*
* G - number of gates (=1)
@ -1318,7 +1316,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 Sequence of recurrent cells
*
* N - batch size
@ -1374,7 +1372,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 Layer which performs Scale and Shift
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(PReLULayer): public WeightableLayer {
@ -1397,7 +1395,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 Power Layer
*
* Formula is: output = (offset + scale * input) ^ power
@ -1426,7 +1424,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 Batch Normalization Layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(BatchNormalizationLayer): public WeightableLayer {
@ -1445,7 +1443,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 general matrix multiplication operation layer
*
* Formula is: dst := alpha*src1*src2 + beta*src3
@ -1477,7 +1475,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 Pad layer
*
* Adds paddings to input tensor
@ -1515,7 +1513,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 Gather layer
*
* Gather slices from Dictionary according to Indexes
@ -1535,7 +1533,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 Strided Slice layer
*
* Strided Slice picks from input tensor according parameters
@ -1576,7 +1574,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 Shuffle Channels layer
* Shuffle Channels picks from input tensor according parameters
*/
@ -1601,7 +1599,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 Depth To Space layer
* Depth To Space picks from input tensor according parameters
*/
@ -1621,7 +1619,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 Space To Depth layer
* Space To Depth picks from input tensor according parameters
*/
@ -1641,7 +1639,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 Space To Batch layer
*
* Space To Batch picks from input tensor according parameters
@ -1671,7 +1669,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 Batch To Space layer
*
* Batch To Space picks from input tensor according parameters
@ -1704,7 +1702,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 SparseFillEmptyRows layer
*
* SparseFillEmptyRows fills empty rows in a sparse tensor
@ -1720,7 +1718,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 SparseSegmentMean(SqrtN, Sum) layers
* SparseSegmentMean(SqrtN, Sum) layer reduces data along sparse segments of a tensor.
*/
@ -1735,7 +1733,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 ExperimentalSparseWeightedReduce layer
* ExperimentalSparseWeightedReduce layer reduces data along sparse segments of a tensor.
*/
@ -1750,7 +1748,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 SparseToDense layer
* SparseToDense layer converts a sparse tensor to a dense tensor.
*/
@ -1765,7 +1763,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 Bucketize layer
* Bucketize layer bucketizes the input based on the boundaries.
*/
@ -1785,7 +1783,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 Reverse Sequence layer
*
* Reverse Sequence modifies input tensor according parameters
@ -1811,7 +1809,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 OneHot layer
* Converts input into OneHot representation.
*/
@ -1846,7 +1844,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 RangeLayer layer
*
* RangeLayer modifies input tensor dimensions according parameters
@ -1862,7 +1860,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 Fill layer
*
* RFill modifies input tensor according parameters
@ -1878,7 +1876,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 SelectLayer layer
*
* SelectLayer layer takes elements from the second (“then”) or the third (“else”) input based on condition mask
@ -1896,7 +1894,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 Broadcast layer
*
* Broadcast modifies input tensor dimensions according parameters
@ -1912,7 +1910,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 quantization operation layer
*
* Element-wise linear quantization of floating point input values into a descrete set of floating point values
@ -1933,7 +1931,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 Math layers
*
* Math modifies input tensor dimensions according parameters
@ -1949,7 +1947,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 Reduce layers
*
* Reduce modifies input tensor according parameters
@ -1970,7 +1968,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 TopK layer
*
* TopK picks top K values from input tensor according parameters
@ -1999,7 +1997,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 Unique layer.
*
* The Unique operation searches for unique elements in 1-D input
@ -2028,7 +2026,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 NonMaxSuppression layer
*/
class INFERENCE_ENGINE_INTERNAL_CNNLAYER_CLASS(NonMaxSuppressionLayer): public CNNLayer {

5
inference-engine/include/ie_plugin.hpp
View File

@ -28,10 +28,10 @@
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 main plugin interface
*/
class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core instead. Will be removed in 2020.3")
class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core instead. Will be removed in 2021.1")
INFERENCE_ENGINE_API_CLASS(IInferencePlugin)
: public details::IRelease {
public:
@ -44,6 +44,7 @@ public:
/**
* @deprecated IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations
* This API will be removed in 2021.1 release.
* @brief Sets logging callback
*
* Logging is used to track what is going on inside

4
inference-engine/include/ie_plugin_dispatcher.hpp
View File

@ -18,11 +18,11 @@
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 is a class to load a suitable plugin
*/
class INFERENCE_ENGINE_DEPRECATED("Use InferenceEngine::Core instead which dispatches plugin automatically."
"Will be removed in 2020.3") INFERENCE_ENGINE_API_CLASS(PluginDispatcher) {
"Will be removed in 2021.1") INFERENCE_ENGINE_API_CLASS(PluginDispatcher) {
public:
/**
* @brief A constructor

2
inference-engine/include/ie_plugin_ptr.hpp
View File

@ -21,7 +21,7 @@ namespace details {
IE_SUPPRESS_DEPRECATED_START
/**
* @deprecated Use InferenceEngine::Core instead.
* @deprecated Use InferenceEngine::Core instead. This API will be removed in 2021.1 release.
* @brief This class defines the name of the fabric for creating an IInferencePlugin object in DLL
*/
template <>

1
inference-engine/include/ie_primitive_info.hpp
View File

@ -21,6 +21,7 @@ namespace InferenceEngine {
/**
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph.
* This structure will be removed in 2021.1 release.
* @brief Structure with information about Primitive
*/
struct INFERENCE_ENGINE_DEPRECATED("Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph") PrimitiveInfo {

1
inference-engine/include/ie_tensor_info.hpp
View File

@ -20,6 +20,7 @@ namespace InferenceEngine {
/**
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph.
* This API will be removed in 2021.1 release.
* @struct TensorInfo
* @brief This structure describes tensor information
*/