Removed obsolete ie_profiling.hpp (openvinotoolkit#4043)

egorshul · Feb 1, 2021 · 86a7717 · 86a7717
1 parent 0dc9b19
commit 86a7717
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 257 deletions.
diff --git a/docs/template_plugin/src/template_async_infer_request.cpp b/docs/template_plugin/src/template_async_infer_request.cpp
@@ -25,16 +25,19 @@ TemplateAsyncInferRequest::TemplateAsyncInferRequest(
     if (remoteDevice) {
         _pipeline = {
             {cpuTaskExecutor, [this] {
-                IE_PROFILING_AUTO_SCOPE(PreprocessingAndStartPipeline)
+                OV_ITT_SCOPED_TASK(itt::domains::TemplatePlugin,
+                                   "TemplateAsyncInferRequest::PreprocessingAndStartPipeline");
                 _inferRequest->inferPreprocess();
                 _inferRequest->startPipeline();
             }},
             {_waitExecutor, [this] {
-                IE_PROFILING_AUTO_SCOPE(WaitPipeline)
+                OV_ITT_SCOPED_TASK(itt::domains::TemplatePlugin,
+                                   "TemplateAsyncInferRequest::WaitPipeline");
                 _inferRequest->waitPipeline();
             }},
             {cpuTaskExecutor, [this] {
-                IE_PROFILING_AUTO_SCOPE(Postprocessing)
+                OV_ITT_SCOPED_TASK(itt::domains::TemplatePlugin,
+                                   "TemplateAsyncInferRequest::Postprocessing");
                 _inferRequest->inferPostprocess();
             }}
         };

diff --git a/docs/template_plugin/src/template_executable_network.cpp b/docs/template_plugin/src/template_executable_network.cpp
@@ -10,6 +10,7 @@
 #include "template/template_config.hpp"
 #include "template_plugin.hpp"
 #include "template_executable_network.hpp"
+#include "template_itt.hpp"
 
 using namespace TemplatePlugin;
 
@@ -61,7 +62,7 @@ TemplatePlugin::ExecutableNetwork::ExecutableNetwork(std::istream &       model,
         model.read(dataBlob->buffer(), dataSize);
     }
 
-    // TODO: implement Import / Export of configuration options
+    // TODO: implement Import / Export of configuration options and merge with `cfg`
     // TODO: implement Import / Export of network precisions, layouts, preprocessing info
 
     auto cnnnetwork = _plugin->GetCore()->ReadNetwork(xmlString, std::move(dataBlob));
@@ -188,6 +189,8 @@ InferenceEngine::Parameter TemplatePlugin::ExecutableNetwork::GetMetric(const st
 
 // ! [executable_network:export_impl]
 void TemplatePlugin::ExecutableNetwork::ExportImpl(std::ostream& modelStream) {
+    OV_ITT_SCOPED_TASK(itt::domains::TemplatePlugin, "ExecutableNetwork::ExportImpl");
+
     // Note: custom ngraph extensions are not supported
     std::map<std::string, ngraph::OpSet> custom_opsets;
     std::stringstream xmlFile, binFile;

diff --git a/docs/template_plugin/src/template_plugin.cpp b/docs/template_plugin/src/template_plugin.cpp
@@ -16,6 +16,7 @@
 #include <transformations/rt_info/fused_names_attribute.hpp>
 
 #include "template/template_config.hpp"
+#include "template_itt.hpp"
 #include "template_plugin.hpp"
 #include "template_executable_network.hpp"
 #include "template_infer_request.hpp"
@@ -74,6 +75,8 @@ std::shared_ptr<ngraph::Function> TransformNetwork(const std::shared_ptr<const n
 // ! [plugin:load_exe_network_impl]
 InferenceEngine::ExecutableNetworkInternal::Ptr Plugin::LoadExeNetworkImpl(const InferenceEngine::CNNNetwork & network,
                                                                            const ConfigMap &config) {
+    OV_ITT_SCOPED_TASK(itt::domains::TemplatePlugin, "Plugin::LoadExeNetworkImpl");
+
     auto cfg = Configuration{ config, _cfg };
     InferenceEngine::InputsDataMap networkInputs = network.getInputsInfo();
     InferenceEngine::OutputsDataMap networkOutputs = network.getOutputsInfo();
@@ -113,22 +116,20 @@ InferenceEngine::ExecutableNetworkInternal::Ptr Plugin::LoadExeNetworkImpl(const
 
 // ! [plugin:import_network_impl]
 InferenceEngine::ExecutableNetwork Plugin::ImportNetworkImpl(std::istream& model, const std::map<std::string, std::string>& config) {
-    // TODO: Import network from stream is not mandatory functionality;
-    // Can just throw an exception and remove the code below
-    Configuration exportedCfg;
-
-    // some code below which reads exportedCfg from `model` stream
-    // ..
+    OV_ITT_SCOPED_TASK(itt::domains::TemplatePlugin, "Plugin::ImportNetworkImpl");
 
-    auto cfg = Configuration(config, exportedCfg);
-    auto exec_network_impl = std::make_shared<ExecutableNetwork>(model, cfg, std::static_pointer_cast<Plugin>(shared_from_this()));
+    Configuration cfg(config);
+    auto exec_network_impl = std::make_shared<ExecutableNetwork>(model, cfg,
+        std::static_pointer_cast<Plugin>(shared_from_this()));
 
     return make_executable_network(exec_network_impl);
 }
 // ! [plugin:import_network_impl]
 
 // ! [plugin:query_network]
 InferenceEngine::QueryNetworkResult Plugin::QueryNetwork(const InferenceEngine::CNNNetwork &network, const ConfigMap& config) const {
+    OV_ITT_SCOPED_TASK(itt::domains::TemplatePlugin, "Plugin::QueryNetwork");
+
     InferenceEngine::QueryNetworkResult res;
     Configuration cfg{config, _cfg, false};
 

diff --git a/inference-engine/src/plugin_api/cpp_interfaces/base/ie_infer_async_request_base.hpp b/inference-engine/src/plugin_api/cpp_interfaces/base/ie_infer_async_request_base.hpp
@@ -13,7 +13,6 @@
 #include <cpp_interfaces/base/ie_variable_state_base.hpp>
 #include "ie_iinfer_request.hpp"
 #include "ie_preprocess.hpp"
-#include "ie_profiling.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/src/plugin_api/ie_profiling.hpp b/inference-engine/src/plugin_api/ie_profiling.hpp
diff --git a/inference-engine/src/preprocessing/ie_preprocess_data.hpp b/inference-engine/src/preprocessing/ie_preprocess_data.hpp
@@ -9,7 +9,6 @@
 #include <memory>
 
 #include <ie_blob.h>
-#include <ie_profiling.hpp>
 #include <file_utils.h>
 #include <ie_preprocess.hpp>
 

diff --git a/inference-engine/src/preprocessing/ie_preprocess_gapi.hpp b/inference-engine/src/preprocessing/ie_preprocess_gapi.hpp
@@ -13,7 +13,6 @@
 #include <opencv2/gapi/gcompiled.hpp>
 #include <opencv2/gapi/gcomputation.hpp>
 #include <opencv2/gapi/util/optional.hpp>
-#include "ie_profiling.hpp"
 #include <openvino/itt.hpp>
 
 // FIXME: Move this definition back to ie_preprocess_data,