[IE][VPU]: Delete old configuration API

openvinotoolkit · Jun 16, 2021 · cbdab95 · cbdab95
1 parent 5095fbf
commit cbdab95
Show file tree

Hide file tree

Showing 56 changed files with 238 additions and 605 deletions.
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration.hpp b/inference-engine/src/vpu/common/include/vpu/configuration.hpp
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration/plugin_configuration.hpp b/inference-engine/src/vpu/common/include/vpu/configuration/plugin_configuration.hpp
@@ -9,7 +9,6 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <memory>
-#include <vpu/parsed_config.hpp>
 
 #include "ie_parameter.hpp"
 
@@ -78,9 +77,7 @@ class ConfigurationEntry {
 
 }  // namespace details
 
-// TODO: remove virtual inheritance once all options are migrated
-// it's needed to pass updated compilation config to graph transformer
-class PluginConfiguration : public virtual ParsedConfig {
+class PluginConfiguration {
 public:
     PluginConfiguration();
 

diff --git a/inference-engine/src/vpu/common/include/vpu/parsed_config.hpp b/inference-engine/src/vpu/common/include/vpu/parsed_config.hpp
diff --git a/inference-engine/src/vpu/common/include/vpu/parsed_config_base.hpp b/inference-engine/src/vpu/common/include/vpu/parsed_config_base.hpp
diff --git a/inference-engine/src/vpu/common/src/configuration/options/custom_layers.cpp b/inference-engine/src/vpu/common/src/configuration/options/custom_layers.cpp
@@ -5,6 +5,7 @@
 #include "vpu/configuration/options/custom_layers.hpp"
 #include "vpu/utils/containers.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/vpu_config.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/device_connect_timeout.cpp b/inference-engine/src/vpu/common/src/configuration/options/device_connect_timeout.cpp
@@ -6,6 +6,7 @@
 #include "vpu/configuration/options/device_connect_timeout.hpp"
 #include "vpu/configuration/parse_numeric.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/utils/error.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/device_id.cpp b/inference-engine/src/vpu/common/src/configuration/options/device_id.cpp
@@ -5,6 +5,7 @@
 #include "vpu/configuration/options/device_id.hpp"
 #include "vpu/utils/containers.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "ie_plugin_config.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/dump_all_passes.cpp b/inference-engine/src/vpu/common/src/configuration/options/dump_all_passes.cpp
@@ -7,6 +7,7 @@
 #include "vpu/configuration/parse_numeric.hpp"
 #include "vpu/configuration/switch_converters.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/private_plugin_config.hpp"
 
 #include <unordered_map>
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/enable_force_reset.cpp b/inference-engine/src/vpu/common/src/configuration/options/enable_force_reset.cpp
@@ -6,6 +6,7 @@
 #include "vpu/configuration/options/enable_force_reset.hpp"
 #include "vpu/configuration/switch_converters.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/myriad_config.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/enable_receiving_tensor_time.cpp b/inference-engine/src/vpu/common/src/configuration/options/enable_receiving_tensor_time.cpp
@@ -6,6 +6,7 @@
 #include "vpu/configuration/options/enable_receiving_tensor_time.hpp"
 #include "vpu/configuration/switch_converters.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/vpu_config.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/exclusive_async_requests.cpp b/inference-engine/src/vpu/common/src/configuration/options/exclusive_async_requests.cpp
@@ -6,6 +6,7 @@
 #include "vpu/configuration/options/exclusive_async_requests.hpp"
 #include "vpu/configuration/switch_converters.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "ie_plugin_config.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/hw_acceleration.cpp b/inference-engine/src/vpu/common/src/configuration/options/hw_acceleration.cpp
@@ -6,6 +6,7 @@
 #include "vpu/configuration/options/hw_acceleration.hpp"
 #include "vpu/configuration/switch_converters.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/vpu_config.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/hw_black_list.cpp b/inference-engine/src/vpu/common/src/configuration/options/hw_black_list.cpp
@@ -2,9 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include "vpu/private_plugin_config.hpp"
 #include "vpu/configuration/options/hw_black_list.hpp"
 #include "vpu/utils/containers.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/utils/error.hpp"
 
 #include <vpu/utils/string.hpp>
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/memory_type.cpp b/inference-engine/src/vpu/common/src/configuration/options/memory_type.cpp
@@ -8,6 +8,7 @@
 #include "vpu/configuration/plugin_configuration.hpp"
 
 #include <vpu/myriad_config.hpp>
+#include <vpu/myriad_plugin_config.hpp>
 
 #include <unordered_map>
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/none_layers.cpp b/inference-engine/src/vpu/common/src/configuration/options/none_layers.cpp
@@ -2,9 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include "vpu/private_plugin_config.hpp"
 #include "vpu/configuration/options/none_layers.hpp"
 #include "vpu/utils/containers.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/utils/error.hpp"
 
 #include <vpu/utils/string.hpp>
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/number_of_cmx_slices.cpp b/inference-engine/src/vpu/common/src/configuration/options/number_of_cmx_slices.cpp
@@ -8,6 +8,7 @@
 #include "vpu/configuration/options/number_of_shaves.hpp"
 #include "vpu/configuration/parse_numeric.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/utils/error.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/number_of_shaves.cpp b/inference-engine/src/vpu/common/src/configuration/options/number_of_shaves.cpp
@@ -8,6 +8,7 @@
 #include "vpu/configuration/options/number_of_cmx_slices.hpp"
 #include "vpu/configuration/parse_numeric.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/utils/error.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/perf_count.cpp b/inference-engine/src/vpu/common/src/configuration/options/perf_count.cpp
@@ -6,6 +6,7 @@
 #include "vpu/configuration/options/perf_count.hpp"
 #include "vpu/configuration/switch_converters.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "ie_plugin_config.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/platform.cpp b/inference-engine/src/vpu/common/src/configuration/options/platform.cpp
@@ -7,6 +7,7 @@
 #include "vpu/configuration/plugin_configuration.hpp"
 
 #include <vpu/myriad_config.hpp>
+#include <vpu/myriad_plugin_config.hpp>
 
 #include <unordered_map>
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/power_config.cpp b/inference-engine/src/vpu/common/src/configuration/options/power_config.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include "vpu/private_plugin_config.hpp"
 #include "vpu/configuration/options/power_config.hpp"
 #include "vpu/utils/power_config.hpp"
 #include "vpu/utils/containers.hpp"

diff --git a/inference-engine/src/vpu/common/src/configuration/options/protocol.cpp b/inference-engine/src/vpu/common/src/configuration/options/protocol.cpp
@@ -7,6 +7,7 @@
 #include "vpu/configuration/plugin_configuration.hpp"
 
 #include <vpu/myriad_config.hpp>
+#include <vpu/vpu_plugin_config.hpp>
 
 #include <unordered_map>
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/tensor_strides.cpp b/inference-engine/src/vpu/common/src/configuration/options/tensor_strides.cpp
@@ -22,7 +22,7 @@ void TensorStridesOption::validate(const std::string& value) {
     const auto inputs = InferenceEngine::details::split(configStrides, "],");
 
     for (const auto& input : inputs) {
-        const auto pair = ie::details::split(input, "[");
+        const auto pair = InferenceEngine::details::split(input, "[");
         VPU_THROW_UNSUPPORTED_OPTION_UNLESS(pair.size() == 2,
             R"(unexpected {} option value "{}", value {} does not match the pattern: tensor_name[strides])",
             key(), value, input);
@@ -64,12 +64,12 @@ TensorStridesOption::value_type TensorStridesOption::parse(const std::string& va
     for (const auto& input : inputs) {
         std::vector<int> strides;
 
-        const auto pair = ie::details::split(input, "[");
+        const auto pair = InferenceEngine::details::split(input, "[");
         VPU_THROW_UNSUPPORTED_OPTION_UNLESS(pair.size() == 2,
             R"(unexpected {} option value "{}", value {} does not match the pattern: tensor_name[strides])",
             key(), value, input);
 
-        const auto strideValues = ie::details::split(pair.at(1), ",");
+        const auto strideValues = InferenceEngine::details::split(pair.at(1), ",");
 
         for (const auto& stride : strideValues) {
             strides.insert(strides.begin(), std::stoi(stride));

diff --git a/inference-engine/src/vpu/common/src/configuration/options/throughput_streams.cpp b/inference-engine/src/vpu/common/src/configuration/options/throughput_streams.cpp
@@ -6,6 +6,8 @@
 #include "vpu/configuration/options/throughput_streams.hpp"
 #include "vpu/configuration/parse_numeric.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/utils/error.hpp"
+#include <vpu/myriad_config.hpp>
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/tiling_cmx_limit_kb.cpp b/inference-engine/src/vpu/common/src/configuration/options/tiling_cmx_limit_kb.cpp
@@ -7,6 +7,7 @@
 #include "vpu/configuration/options/tiling_cmx_limit_kb.hpp"
 #include "vpu/configuration/parse_numeric.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/utils/error.hpp"
 
 namespace vpu {
 

diff --git a/inference-engine/src/vpu/common/src/configuration/options/watchdog_interval.cpp b/inference-engine/src/vpu/common/src/configuration/options/watchdog_interval.cpp
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+#include "vpu/private_plugin_config.hpp"
 #include "vpu/utils/containers.hpp"
 #include "vpu/configuration/options/watchdog_interval.hpp"
 #include "vpu/configuration/parse_numeric.hpp"
 #include "vpu/configuration/plugin_configuration.hpp"
+#include "vpu/utils/error.hpp"
 
 #include <unordered_map>