Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IE][VPU]: Completion of Configuration options refactoring in VPU plugins #6176

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
513a3cc
[IE][VPU]: Refactors PROTOCOL configuration option
ZlobinGM Mar 10, 2021
999b822
[IE][VPU]: Refactors POWER_CONFIG configuration option
ZlobinGM Mar 17, 2021
607526c
[IE][VPU]: Refactors HW_OPTIMIZATION configuration option
ZlobinGM Mar 24, 2021
10bc60d
[IE][VPU]: Refactors HW_EXTRA_SPLIT configuration option
ZlobinGM Mar 24, 2021
5c84825
[IE][VPU]: Refactors HW_BLACK_LIST configuration option
ZlobinGM Mar 29, 2021
bc777e0
[IE][VPU]: Refactors TILING_CMX_LIMIT_KB configuration option
ZlobinGM Mar 30, 2021
723e78c
[IE][VPU]: Refactors WATCHDOG_INTERVAL configuration option
ZlobinGM Mar 31, 2021
ff36321
[IE][VPU]: Refactors PRINT_RECEIVE_TENSOR_TIME configuration option
ZlobinGM Mar 31, 2021
464a84e
[IE][VPU]: Refactors PERF_REPORT_MODE configuration option
ZlobinGM Apr 3, 2021
ebd4804
[IE][VPU]: Refactors PERF_COUNT configuration option
ZlobinGM Apr 3, 2021
145db57
[IE][VPU]: Refactors PACK_DATA_IN_CMX configuration option
ZlobinGM Apr 3, 2021
4b88a6a
[IE][VPU]: Refactors NUMBER_OF_SHAVES configuration option
ZlobinGM Apr 3, 2021
b249f9f
[IE][VPU]: Refactors NUM_EXECUTORS configuration option
ZlobinGM Apr 3, 2021
19f82ff
[IE][VPU]: Refactors NUM_CMX_SLICES configuration option
ZlobinGM Apr 3, 2021
2ae1a50
[IE][VPU]: Refactors HW_POOL_CONV_MERGE configuration option
ZlobinGM Apr 3, 2021
9436283
[IE][VPU]: Refactors TENSOR_STRIDES configuration option
ZlobinGM Apr 5, 2021
9427087
[IE][VPU]: Refactors INJECT_SW_OPS configuration option
ZlobinGM Apr 5, 2021
626adc8
[IE][VPU]: Refactors IGNORE_UNKNOWN_LAYERS configuration option
ZlobinGM Apr 5, 2021
3473068
[IE][VPU]: Remove HW_WHITE_LIST configuration option
ZlobinGM Apr 5, 2021
5e465c0
[IE][VPU]: Refactors HW_DILATION configuration option
ZlobinGM Apr 5, 2021
2ff9f1d
[IE][VPU]: Refactors FORCE_PURE_TENSOR_ITERATOR configuration option
ZlobinGM Apr 5, 2021
3e5e107
[IE][VPU]: Remove FORCE_DEPRECATED_CNN_CONVERSION configuration option
ZlobinGM Apr 5, 2021
8ec1d63
[IE][VPU]: Refactors EXCLUSIVE_ASYNC_REQUESTS configuration option
ZlobinGM Apr 5, 2021
2a87974
[IE][VPU]: Refactors ENABLE_WEIGHTS_ANALYSIS configuration option
ZlobinGM Apr 5, 2021
3b3eb30
[IE][VPU]: Refactors ENABLE_TENSOR_ITERATOR_UNROLLING configuration o…
ZlobinGM Apr 5, 2021
dabeb26
[IE][VPU]: Refactors ENABLE_REPL_WITH_SCRELU configuration option
ZlobinGM Apr 6, 2021
4a5af6b
[IE][VPU]: Remove ENABLE_REPLACE_WITH_REDUCE_MEAN configuration option
ZlobinGM Apr 6, 2021
005eb75
[IE][VPU]: Refactors ENABLE_PERMUTE_MERGING configuration option
ZlobinGM Apr 6, 2021
626085f
[IE][VPU]: Refactors ENABLE_MEMORY_TYPES_ANNOTATION configuration opt…
ZlobinGM Apr 6, 2021
8c24d7e
[IE][VPU]: Refactors DUMP_INTERNAL_GRAPH_FILE_NAME configuration options
ZlobinGM Apr 6, 2021
73335b7
[IE][VPU]: Refactors DUMP_ALL_PASSES_DIRECTORY configuration options
ZlobinGM Apr 6, 2021
a7be6ab
[IE][VPU]: Refactors DUMP_ALL_PASSES configuration options
ZlobinGM Apr 7, 2021
e97d596
[IE][VPU]: Refactors DISABLE_REORDER configuration option
ZlobinGM Apr 7, 2021
6826485
[IE][VPU]: Refactors DISABLE_CONVERT_STAGES configuration option
ZlobinGM Apr 7, 2021
d077281
[IE][VPU]: Refactors DEVICE_ID configuration option
ZlobinGM Apr 7, 2021
9228085
[IE][VPU]: Refactors DEVICE_CONNECT_TIMEOUT configuration option
ZlobinGM Apr 7, 2021
f7f15bc
[IE][VPU]: Refactors DETECT_NETWORK_BATCH configuration option
ZlobinGM Apr 7, 2021
74baf1f
[IE][VPU]: Refactors CUSTOM_LAYERS configuration option
ZlobinGM Apr 7, 2021
6522d38
[IE][VPU]: Refactors MEMORY_TYPE configuration option
ZlobinGM Apr 7, 2021
736e0e9
[IE][VPU]: Refactors FORCE_RESET configuration option
ZlobinGM Apr 7, 2021
f0ffab4
[IE][VPU]: Refactors PLATFORM configuration options
ZlobinGM Apr 9, 2021
ed3ae74
[IE][VPU]: Remove PLUGIN_LOG_FILE_PATH configuration options
ZlobinGM Apr 9, 2021
6b087a1
[IE][VPU]: Remove COMPILER_LOG_FILE_PATH configuration options
ZlobinGM Apr 9, 2021
600954b
[IE][VPU]: Refactors CHECK_PREPROCESSING_INSIDE_MODEL configuration o…
ZlobinGM Apr 13, 2021
c364dc0
[IE][VPU]: Refactors ENABLE_EARLY_ELTWISE_RELU_FUSION configuration o…
ZlobinGM Apr 20, 2021
76b5170
[IE][VPU]: Refactors ENABLE_CUSTOM_RESHAPE_PARAM configuration option
ZlobinGM Apr 20, 2021
1749340
[IE][VPU]: Refactors NONE_LAYERS configuration option
ZlobinGM Apr 20, 2021
bb347b9
[IE][VPU]: Remove INPUT_SCALE and INPUT_BIAS configuration option
ZlobinGM Apr 20, 2021
01712f3
[IE][VPU]: Refactors ENABLE_ASYNC_DMA configuration options
ZlobinGM May 26, 2021
9e6594a
[IE][VPU]: Delete old configuration API
ZlobinGM May 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions inference-engine/include/vpu/myriad_config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion inference-engine/src/vpu/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
99 changes: 0 additions & 99 deletions inference-engine/src/vpu/common/include/vpu/configuration.hpp

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Loading