Removed suppression macro usage (#1108)

diff --git a/inference-engine/include/details/ie_irelease.hpp b/inference-engine/include/details/ie_irelease.hpp
index ac4e8d0..2bcdb02 100644 (file)
--- a/inference-engine/include/details/ie_irelease.hpp
+++ b/inference-engine/include/details/ie_irelease.hpp
@@ -34,20 +34,14 @@ protected:
     ~IRelease() override = default;
 };
 
-IE_SUPPRESS_DEPRECATED_START
-
 template <class T>
 inline std::shared_ptr<T> shared_from_irelease(T* ptr) {
-    IE_SUPPRESS_DEPRECATED_START
     std::shared_ptr<T> pointer(ptr, [](IRelease* p) {
         if (p)
             p->Release();
     });
-    IE_SUPPRESS_DEPRECATED_END
     return pointer;
 }
 
-IE_SUPPRESS_DEPRECATED_END
-
 }  // namespace details
 }  // namespace InferenceEngine

diff --git a/inference-engine/include/details/ie_so_pointer.hpp b/inference-engine/include/details/ie_so_pointer.hpp
index 4854aa0..983ca97 100644 (file)
--- a/inference-engine/include/details/ie_so_pointer.hpp
+++ b/inference-engine/include/details/ie_so_pointer.hpp
@@ -32,8 +32,6 @@ private:
     std::shared_ptr<Loader> _so_loader;
 
 public:
-    IE_SUPPRESS_DEPRECATED_START
-
     /**
      * @brief The main constructor
      * @param loader Library to load from
@@ -51,7 +49,6 @@ public:
      */
     template <class T>
     T* instantiateSymbol(const std::string& name) const {
-        IE_SUPPRESS_DEPRECATED_START
         T* instance = nullptr;
         ResponseDesc desc;
         StatusCode sts = bind_function<StatusCode(T*&, ResponseDesc*)>(name)(instance, &desc);
@@ -59,7 +56,6 @@ public:
             THROW_IE_EXCEPTION << desc.msg;
         }
         return instance;
-        IE_SUPPRESS_DEPRECATED_END
     }
 
 private:
@@ -73,8 +69,6 @@ private:
         std::function<T> ptr(reinterpret_cast<T*>(_so_loader->get_symbol(functionName.c_str())));
         return ptr;
     }
-
-    IE_SUPPRESS_DEPRECATED_END
 };
 
 /**
@@ -91,7 +85,6 @@ class SOCreatorTrait {};
  */
 template <class T, class Loader = SharedObjectLoader>
 class SOPointer {
-    IE_SUPPRESS_DEPRECATED_START
     template <class U, class W>
     friend class SOPointer;
 
@@ -206,7 +199,6 @@ protected:
      * @brief Gets a smart pointer to the custom object
      */
     std::shared_ptr<T> _pointedObj;
-    IE_SUPPRESS_DEPRECATED_END
 };
 
 }  // namespace details

diff --git a/inference-engine/src/cldnn_engine/cldnn_engine.cpp b/inference-engine/src/cldnn_engine/cldnn_engine.cpp
index cc941b1..c5d69ac 100644 (file)
--- a/inference-engine/src/cldnn_engine/cldnn_engine.cpp
+++ b/inference-engine/src/cldnn_engine/cldnn_engine.cpp
@@ -408,8 +408,6 @@ Parameter clDNNEngine::GetMetric(const std::string& name, const std::map<std::st
 
 };  // namespace CLDNNPlugin
 
-IE_SUPPRESS_DEPRECATED_START
-
 INFERENCE_PLUGIN_API(StatusCode) CreatePluginEngine(IInferencePlugin*& plugin, ResponseDesc* resp) noexcept {
     try {
         plugin = make_ie_compatible_plugin(

diff --git a/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp b/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp
index 9e5d4d5..60c5afd 100644 (file)
--- a/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp
+++ b/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp
@@ -10,8 +10,6 @@ using namespace InferenceEngine;
 using namespace std;
 using namespace GNAPluginNS;
 
-IE_SUPPRESS_DEPRECATED_START
-
 static const Version gnaPluginDescription = {
         {2, 1},
         CI_BUILD_NUMBER

diff --git a/inference-engine/src/hetero_plugin/hetero_plugin.cpp b/inference-engine/src/hetero_plugin/hetero_plugin.cpp
index c7b4a9a..43e6112 100644 (file)
--- a/inference-engine/src/hetero_plugin/hetero_plugin.cpp
+++ b/inference-engine/src/hetero_plugin/hetero_plugin.cpp
@@ -274,8 +274,6 @@ Parameter Engine::GetConfig(const std::string& name, const std::map<std::string,
     }
 }
 
-IE_SUPPRESS_DEPRECATED_START
-
 INFERENCE_PLUGIN_API(InferenceEngine::StatusCode) CreatePluginEngine(
         InferenceEngine::IInferencePlugin *&plugin,
         InferenceEngine::ResponseDesc *resp) noexcept {

diff --git a/inference-engine/src/inference_engine/ie_core.cpp b/inference-engine/src/inference_engine/ie_core.cpp
index 7ee3a96..4b41aa1 100644 (file)
--- a/inference-engine/src/inference_engine/ie_core.cpp
+++ b/inference-engine/src/inference_engine/ie_core.cpp
@@ -32,8 +32,6 @@ using namespace InferenceEngine::PluginConfigParams;
 
 namespace InferenceEngine {
 
-IE_SUPPRESS_DEPRECATED_START
-
 namespace {
 
 std::once_flag flag;
@@ -126,8 +124,6 @@ Parameter copyParameterValue(const Parameter & value) {
 
 }  // namespace
 
-IE_SUPPRESS_DEPRECATED_END
-
 DeviceIDParser::DeviceIDParser(const std::string& deviceNameWithID) {
     deviceName = deviceNameWithID;
 
@@ -189,9 +185,7 @@ class Core::Impl : public ICore {
     // Fields are ordered by deletion order
     ITaskExecutor::Ptr _taskExecutor = nullptr;
 
-    IE_SUPPRESS_DEPRECATED_START
     mutable std::map<std::string, InferencePlugin> plugins;
-    IE_SUPPRESS_DEPRECATED_END
 
     struct PluginDescriptor {
         FileUtils::FilePath libraryLocation;
@@ -301,13 +295,9 @@ public:
                                   const std::map<std::string, std::string>& config) override {
         IE_PROFILING_AUTO_SCOPE(Core::LoadNetwork)
         auto parsed = parseDeviceNameIntoConfig(deviceName, config);
-        IE_SUPPRESS_DEPRECATED_START
         return GetCPPPluginByName(parsed._deviceName).LoadNetwork(network, parsed._config);
-        IE_SUPPRESS_DEPRECATED_END
     }
 
-    IE_SUPPRESS_DEPRECATED_START
-
     ExecutableNetwork ImportNetwork(std::istream& networkModel, const std::string& deviceName,
                                     const std::map<std::string, std::string>& config) override {
         auto parsed = parseDeviceNameIntoConfig(deviceName, config);
@@ -336,9 +326,7 @@ public:
                                     const std::map<std::string, std::string>& config) const override {
         QueryNetworkResult res;
         auto parsed = parseDeviceNameIntoConfig(deviceName, config);
-        IE_SUPPRESS_DEPRECATED_START
         GetCPPPluginByName(parsed._deviceName).QueryNetwork(network, parsed._config, res);
-        IE_SUPPRESS_DEPRECATED_END
         return res;
     }
 
@@ -362,10 +350,8 @@ public:
         }
 
         auto parsed = parseDeviceNameIntoConfig(deviceName);
-        IE_SUPPRESS_DEPRECATED_START
         InferencePlugin cppPlugin = GetCPPPluginByName(parsed._deviceName);
         auto pluginAPIInterface = getInferencePluginAPIInterface(cppPlugin);
-        IE_SUPPRESS_DEPRECATED_END
 
         if (pluginAPIInterface == nullptr) {
             THROW_IE_EXCEPTION << parsed._deviceName << " does not implement the GetMetric method";
@@ -386,8 +372,6 @@ public:
     InferencePlugin GetCPPPluginByName(const std::string& deviceName) const {
         std::lock_guard<std::mutex> lock(pluginsMutex);
 
-        IE_SUPPRESS_DEPRECATED_START
-
         auto it = pluginRegistry.find(deviceName);
         if (it == pluginRegistry.end()) {
             THROW_IE_EXCEPTION << "Device with \"" << deviceName << "\" name is not registered in the InferenceEngine";
@@ -438,13 +422,9 @@ public:
             }
         }
 
-        IE_SUPPRESS_DEPRECATED_END
-
         return plugins[deviceName];
     }
 
-    IE_SUPPRESS_DEPRECATED_END
-
     /**
      * @brief Unload plugin for specified device, but plugin meta-data is still in plugin registry
      * @param deviceName A name of device
@@ -529,9 +509,7 @@ public:
         // set config for already created plugins
         for (auto& plugin : plugins) {
             if (deviceName.empty() || deviceName == plugin.first) {
-                IE_SUPPRESS_DEPRECATED_START
                 plugin.second.SetConfig(config);
-                IE_SUPPRESS_DEPRECATED_END
             }
         }
     }
@@ -552,11 +530,9 @@ public:
 
         // add extensions for already created plugins
         for (auto& plugin : plugins) {
-            IE_SUPPRESS_DEPRECATED_START
             try {
                 plugin.second.AddExtension(extension);
             } catch (...) {}
-            IE_SUPPRESS_DEPRECATED_END
         }
         extensions.emplace_back(extension);
     }
@@ -618,10 +594,8 @@ std::map<std::string, Version> Core::GetVersions(const std::string& deviceName)
         DeviceIDParser parser(deviceName_);
         std::string deviceNameLocal = parser.getDeviceName();
 
-        IE_SUPPRESS_DEPRECATED_START
         InferenceEngine::InferencePlugin cppPlugin = _impl->GetCPPPluginByName(deviceNameLocal);
         const Version * version = cppPlugin.GetVersion();
-        IE_SUPPRESS_DEPRECATED_END
         versions[deviceNameLocal] = *version;
     }
 
@@ -658,7 +632,6 @@ ExecutableNetwork Core::LoadNetwork(const CNNNetwork& network, RemoteContext::Pt
     DeviceIDParser device(deviceName_);
     std::string deviceName = device.getDeviceName();
 
-    IE_SUPPRESS_DEPRECATED_START
     auto cppPlugin = _impl->GetCPPPluginByName(deviceName);
     auto pluginAPIInterface = getInferencePluginAPIInterface(cppPlugin);
 
@@ -667,7 +640,6 @@ ExecutableNetwork Core::LoadNetwork(const CNNNetwork& network, RemoteContext::Pt
     }
 
     return pluginAPIInterface->LoadNetwork(network, config_, context);
-    IE_SUPPRESS_DEPRECATED_END
 }
 
 RemoteContext::Ptr Core::CreateContext(const std::string& deviceName_, const ParamMap& params) {
@@ -681,7 +653,6 @@ RemoteContext::Ptr Core::CreateContext(const std::string& deviceName_, const Par
     DeviceIDParser device(deviceName_);
     std::string deviceName = device.getDeviceName();
 
-    IE_SUPPRESS_DEPRECATED_START
     auto cppPlugin = _impl->GetCPPPluginByName(deviceName);
     auto pluginAPIInterface = getInferencePluginAPIInterface(cppPlugin);
 
@@ -690,7 +661,6 @@ RemoteContext::Ptr Core::CreateContext(const std::string& deviceName_, const Par
     }
 
     return pluginAPIInterface->CreateContext(params);
-    IE_SUPPRESS_DEPRECATED_END
 }
 
 RemoteContext::Ptr Core::GetDefaultContext(const std::string& deviceName_) {
@@ -704,7 +674,6 @@ RemoteContext::Ptr Core::GetDefaultContext(const std::string& deviceName_) {
     DeviceIDParser device(deviceName_);
     std::string deviceName = device.getDeviceName();
 
-    IE_SUPPRESS_DEPRECATED_START
     auto cppPlugin = _impl->GetCPPPluginByName(deviceName);
     auto pluginAPIInterface = getInferencePluginAPIInterface(cppPlugin);
 
@@ -713,7 +682,6 @@ RemoteContext::Ptr Core::GetDefaultContext(const std::string& deviceName_) {
     }
 
     return pluginAPIInterface->GetDefaultContext();
-    IE_SUPPRESS_DEPRECATED_END
 }
 
 void Core::AddExtension(IExtensionPtr extension, const std::string& deviceName_) {
@@ -739,10 +707,7 @@ ExecutableNetwork Core::ImportNetwork(const std::string& modelFileName, const st
     }
 
     auto parsed = parseDeviceNameIntoConfig(deviceName, config);
-
-    IE_SUPPRESS_DEPRECATED_START
     return _impl->GetCPPPluginByName(parsed._deviceName).ImportNetwork(modelFileName, parsed._config);
-    IE_SUPPRESS_DEPRECATED_END
 }
 
 ExecutableNetwork Core::ImportNetwork(std::istream& networkModel, const std::string& deviceName,
@@ -765,14 +730,12 @@ ExecutableNetwork Core::ImportNetwork(std::istream& networkModel,
 
     auto parsed = parseDeviceNameIntoConfig(deviceName, config);
 
-    IE_SUPPRESS_DEPRECATED_START
     auto cppPlugin = _impl->GetCPPPluginByName(deviceName);
     auto pluginAPIInterface = getInferencePluginAPIInterface(cppPlugin);
 
     if (pluginAPIInterface == nullptr) {
         THROW_IE_EXCEPTION << deviceName << " does not implement the ImportNetwork method";
     }
-    IE_SUPPRESS_DEPRECATED_END
     return pluginAPIInterface->ImportNetwork(networkModel, context, parsed._config);
 }
 
@@ -825,10 +788,8 @@ Parameter Core::GetConfig(const std::string& deviceName, const std::string& name
     }
 
     auto parsed = parseDeviceNameIntoConfig(deviceName);
-    IE_SUPPRESS_DEPRECATED_START
     auto cppPlugin = _impl->GetCPPPluginByName(parsed._deviceName);
     auto pluginAPIInterface = getInferencePluginAPIInterface(cppPlugin);
-    IE_SUPPRESS_DEPRECATED_END
 
     if (pluginAPIInterface == nullptr) {
         THROW_IE_EXCEPTION << parsed._deviceName << " does not implement the GetConfig method";
@@ -852,7 +813,6 @@ std::vector<std::string> Core::GetAvailableDevices() const {
     for (auto&& deviceName : _impl->GetListOfDevicesInRegistry()) {
         std::vector<std::string> devicesIDs;
 
-        IE_SUPPRESS_DEPRECATED_START
         try {
             Parameter p = GetMetric(deviceName, propertyName);
             devicesIDs = p.as<std::vector<std::string>>();
@@ -865,7 +825,6 @@ std::vector<std::string> Core::GetAvailableDevices() const {
             THROW_IE_EXCEPTION << "Unknown exception is thrown while trying to create the " << deviceName
                                << " device and call GetMetric";
         }
-        IE_SUPPRESS_DEPRECATED_END
 
         if (devicesIDs.size() > 1) {
             for (auto&& deviceID : devicesIDs) {