[IE][VPU]: Completion of Configuration options refactoring in VPU plu…

…gins (#6176) * [IE][VPU]: Refactors PROTOCOL configuration option * [IE][VPU]: Refactors POWER_CONFIG configuration option * [IE][VPU]: Refactors HW_OPTIMIZATION configuration option * [IE][VPU]: Refactors HW_EXTRA_SPLIT configuration option * [IE][VPU]: Refactors HW_BLACK_LIST configuration option * [IE][VPU]: Refactors TILING_CMX_LIMIT_KB configuration option * [IE][VPU]: Refactors WATCHDOG_INTERVAL configuration option * [IE][VPU]: Refactors PRINT_RECEIVE_TENSOR_TIME configuration option * [IE][VPU]: Refactors PERF_REPORT_MODE configuration option * [IE][VPU]: Refactors PERF_COUNT configuration option * [IE][VPU]: Refactors PACK_DATA_IN_CMX configuration option * [IE][VPU]: Refactors NUMBER_OF_SHAVES configuration option * [IE][VPU]: Refactors NUM_EXECUTORS configuration option * [IE][VPU]: Refactors NUM_CMX_SLICES configuration option * [IE][VPU]: Refactors HW_POOL_CONV_MERGE configuration option * [IE][VPU]: Refactors TENSOR_STRIDES configuration option * [IE][VPU]: Refactors INJECT_SW_OPS configuration option * [IE][VPU]: Refactors IGNORE_UNKNOWN_LAYERS configuration option * [IE][VPU]: Remove HW_WHITE_LIST configuration option * [IE][VPU]: Refactors HW_DILATION configuration option * [IE][VPU]: Refactors FORCE_PURE_TENSOR_ITERATOR configuration option * [IE][VPU]: Remove FORCE_DEPRECATED_CNN_CONVERSION configuration option * [IE][VPU]: Refactors EXCLUSIVE_ASYNC_REQUESTS configuration option * [IE][VPU]: Refactors ENABLE_WEIGHTS_ANALYSIS configuration option * [IE][VPU]: Refactors ENABLE_TENSOR_ITERATOR_UNROLLING configuration option * [IE][VPU]: Refactors ENABLE_REPL_WITH_SCRELU configuration option * [IE][VPU]: Remove ENABLE_REPLACE_WITH_REDUCE_MEAN configuration option * [IE][VPU]: Refactors ENABLE_PERMUTE_MERGING configuration option * [IE][VPU]: Refactors ENABLE_MEMORY_TYPES_ANNOTATION configuration options * [IE][VPU]: Refactors DUMP_INTERNAL_GRAPH_FILE_NAME configuration options * [IE][VPU]: Refactors DUMP_ALL_PASSES_DIRECTORY configuration options * [IE][VPU]: Refactors DUMP_ALL_PASSES configuration options * [IE][VPU]: Refactors DISABLE_REORDER configuration option * [IE][VPU]: Refactors DISABLE_CONVERT_STAGES configuration option * [IE][VPU]: Refactors DEVICE_ID configuration option * [IE][VPU]: Refactors DEVICE_CONNECT_TIMEOUT configuration option * [IE][VPU]: Refactors DETECT_NETWORK_BATCH configuration option * [IE][VPU]: Refactors CUSTOM_LAYERS configuration option * [IE][VPU]: Refactors MEMORY_TYPE configuration option * [IE][VPU]: Refactors FORCE_RESET configuration option * [IE][VPU]: Refactors PLATFORM configuration options * [IE][VPU]: Remove PLUGIN_LOG_FILE_PATH configuration options * [IE][VPU]: Remove COMPILER_LOG_FILE_PATH configuration options * [IE][VPU]: Refactors CHECK_PREPROCESSING_INSIDE_MODEL configuration option * [IE][VPU]: Refactors ENABLE_EARLY_ELTWISE_RELU_FUSION configuration option * [IE][VPU]: Refactors ENABLE_CUSTOM_RESHAPE_PARAM configuration option * [IE][VPU]: Refactors NONE_LAYERS configuration option * [IE][VPU]: Remove INPUT_SCALE and INPUT_BIAS configuration option * [IE][VPU]: Refactors ENABLE_ASYNC_DMA configuration options * [IE][VPU]: Delete old configuration API
openvinotoolkit · Jul 13, 2021 · 3d13424 · 3d13424
1 parent a386869
commit 3d13424
Show file tree

Hide file tree

Showing 160 changed files with 5,305 additions and 1,268 deletions.
diff --git a/inference-engine/include/vpu/myriad_config.hpp b/inference-engine/include/vpu/myriad_config.hpp
@@ -59,4 +59,9 @@ DECLARE_VPU_CONFIG(MYRIAD_USB);
  */
 DECLARE_VPU_CONFIG(MYRIAD_THROUGHPUT_STREAMS);
 
+/**
+ * @brief Default key definition for InferenceEngine::MYRIAD_THROUGHPUT_STREAMS option.
+ */
+DECLARE_VPU_CONFIG(MYRIAD_THROUGHPUT_STREAMS_AUTO);
+
 }  // namespace InferenceEngine
diff --git a/inference-engine/src/vpu/common/CMakeLists.txt b/inference-engine/src/vpu/common/CMakeLists.txt
@@ -53,7 +53,7 @@ function(add_common_target TARGET_NAME STATIC_IE)
     openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
 
     target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations
-                                         PRIVATE openvino::itt)
+                                         PRIVATE mvnc openvino::itt)
 
     if(NOT STATIC_IE)
         target_link_libraries(${TARGET_NAME} PUBLIC inference_engine_legacy)

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/...ine/src/vpu/common/include/vpu/configuration/options/check_preprocessing_inside_model.hpp b/...ine/src/vpu/common/include/vpu/configuration/options/check_preprocessing_inside_model.hpp
@@ -0,0 +1,34 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <string>
+
+#include "vpu/configuration/as_parameter_enabler.hpp"
+
+namespace vpu {
+
+namespace details {
+
+enum class Access;
+enum class Category;
+
+}  // namespace details
+
+class PluginConfiguration;
+
+struct CheckPreprocessingInsideModelOption : public AsParsedParameterEnabler<CheckPreprocessingInsideModelOption> {
+    using value_type = bool;
+
+    static std::string key();
+    static void validate(const std::string&);
+    static void validate(const PluginConfiguration&);
+    static std::string defaultValue();
+    static value_type parse(const std::string&);
+    static details::Access access();
+    static details::Category category();
+};
+
+}  // namespace vpu
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration/options/config_file.hpp b/inference-engine/src/vpu/common/include/vpu/configuration/options/config_file.hpp
@@ -0,0 +1,34 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <string>
+
+#include "vpu/configuration/as_parameter_enabler.hpp"
+
+namespace vpu {
+
+namespace details {
+
+enum class Access;
+enum class Category;
+
+}  // namespace details
+
+class PluginConfiguration;
+
+struct ConfigFileOption : public AsParameterEnabler {
+    using value_type = std::string;
+
+    static std::string key();
+    static void validate(const std::string&);
+    static void validate(const PluginConfiguration&);
+    static std::string defaultValue();
+    static value_type parse(const std::string&);
+    static details::Access access();
+    static details::Category category();
+};
+
+}  // namespace vpu
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration/options/custom_layers.hpp b/inference-engine/src/vpu/common/include/vpu/configuration/options/custom_layers.hpp
@@ -0,0 +1,34 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <string>
+
+#include "vpu/configuration/as_parameter_enabler.hpp"
+
+namespace vpu {
+
+namespace details {
+
+enum class Access;
+enum class Category;
+
+}  // namespace details
+
+class PluginConfiguration;
+
+struct CustomLayersOption : public AsParameterEnabler {
+    using value_type = std::string;
+
+    static std::string key();
+    static void validate(const std::string&);
+    static void validate(const PluginConfiguration&);
+    static std::string defaultValue();
+    static value_type parse(const std::string&);
+    static details::Access access();
+    static details::Category category();
+};
+
+}  // namespace vpu
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration/options/detect_network_batch.hpp b/inference-engine/src/vpu/common/include/vpu/configuration/options/detect_network_batch.hpp
@@ -0,0 +1,34 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <string>
+
+#include "vpu/configuration/as_parameter_enabler.hpp"
+
+namespace vpu {
+
+namespace details {
+
+enum class Access;
+enum class Category;
+
+}  // namespace details
+
+class PluginConfiguration;
+
+struct DetectNetworkBatchOption : public AsParsedParameterEnabler<DetectNetworkBatchOption> {
+    using value_type = bool;
+
+    static std::string key();
+    static void validate(const std::string&);
+    static void validate(const PluginConfiguration&);
+    static std::string defaultValue();
+    static value_type parse(const std::string&);
+    static details::Access access();
+    static details::Category category();
+};
+
+}  // namespace vpu
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration/options/device_connect_timeout.hpp b/inference-engine/src/vpu/common/include/vpu/configuration/options/device_connect_timeout.hpp
@@ -0,0 +1,35 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <string>
+#include <chrono>
+
+#include "vpu/configuration/as_parameter_enabler.hpp"
+
+namespace vpu {
+
+namespace details {
+
+enum class Access;
+enum class Category;
+
+}  // namespace details
+
+class PluginConfiguration;
+
+struct DeviceConnectTimeoutOption : public AsParsedParameterEnabler<DeviceConnectTimeoutOption> {
+    using value_type = std::chrono::seconds;
+
+    static std::string key();
+    static void validate(const std::string&);
+    static void validate(const PluginConfiguration&);
+    static std::string defaultValue();
+    static value_type parse(const std::string&);
+    static details::Access access();
+    static details::Category category();
+};
+
+}  // namespace vpu
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration/options/device_id.hpp b/inference-engine/src/vpu/common/include/vpu/configuration/options/device_id.hpp
@@ -0,0 +1,34 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <string>
+
+#include "vpu/configuration/as_parameter_enabler.hpp"
+
+namespace vpu {
+
+namespace details {
+
+enum class Access;
+enum class Category;
+
+}  // namespace details
+
+class PluginConfiguration;
+
+struct DeviceIDOption : public AsParameterEnabler {
+    using value_type = std::string;
+
+    static std::string key();
+    static void validate(const std::string&);
+    static void validate(const PluginConfiguration&);
+    static std::string defaultValue();
+    static value_type parse(const std::string&);
+    static details::Access access();
+    static details::Category category();
+};
+
+}  // namespace vpu
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration/options/disable_convert_stages.hpp b/inference-engine/src/vpu/common/include/vpu/configuration/options/disable_convert_stages.hpp
@@ -0,0 +1,34 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <string>
+
+#include "vpu/configuration/as_parameter_enabler.hpp"
+
+namespace vpu {
+
+namespace details {
+
+enum class Access;
+enum class Category;
+
+}  // namespace details
+
+class PluginConfiguration;
+
+struct DisableConvertStagesOption : public AsParsedParameterEnabler<DisableConvertStagesOption> {
+    using value_type = bool;
+
+    static std::string key();
+    static void validate(const std::string&);
+    static void validate(const PluginConfiguration&);
+    static std::string defaultValue();
+    static value_type parse(const std::string&);
+    static details::Access access();
+    static details::Category category();
+};
+
+}  // namespace vpu
diff --git a/inference-engine/src/vpu/common/include/vpu/configuration/options/disable_reorder.hpp b/inference-engine/src/vpu/common/include/vpu/configuration/options/disable_reorder.hpp
@@ -0,0 +1,34 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <string>
+
+#include "vpu/configuration/as_parameter_enabler.hpp"
+
+namespace vpu {
+
+namespace details {
+
+enum class Access;
+enum class Category;
+
+}  // namespace details
+
+class PluginConfiguration;
+
+struct DisableReorderOption : public AsParsedParameterEnabler<DisableReorderOption> {
+    using value_type = bool;
+
+    static std::string key();
+    static void validate(const std::string&);
+    static void validate(const PluginConfiguration&);
+    static std::string defaultValue();
+    static value_type parse(const std::string&);
+    static details::Access access();
+    static details::Category category();
+};
+
+}  // namespace vpu