Remove myriad plugin (#15131)
* Removed Intel MYRIAD plugin * Removed Intel MYIAD from CI files * Removed Intel MYRIAD from cmake folder * Removed MYRIAD, HDDL from samples * Removed MYRIAD, HDDL from scripts folder * Removed MYRIAD from bindings folder (C and Python API) * Removed MYRIAD tests * Removed MYRIAD from tests folder * Removed MYRIAD from tools folder * Removed HDDL (VAD), MYRIAD (NSC2) from documentation * Fixed build for AUTO unit tests * Fixed clang code style * Fixed comments and issues * removed MYRIAD from AUTO tests * Disabled MULTI tests in CI * Update docs/OV_Runtime_UG/auto_device_selection.md Co-authored-by: Yuan Xu <yuan1.xu@intel.com> * Update docs/get_started/get_started_demos.md Co-authored-by: Yuan Xu <yuan1.xu@intel.com> * Update docs/OV_Runtime_UG/deployment/local-distribution.md Co-authored-by: Yuan Xu <yuan1.xu@intel.com> Co-authored-by: Yuan Xu <yuan1.xu@intel.com>
This commit is contained in:
Ilya LavrenovandYuan Xu authored and 
GitHub committed
1 parent
a1203b931a
commit
c4eeecfec5
1167 files changed
+184
-154079
No files matched your search
@@ -53,7 +53,7 @@ For more information on performance hints, see the [High-level Performance Hints
|
||||
|
||||
|
||||
### Device
|
||||
To set which device benchmarking runs on, use the `-d <device>` argument. This will tell benchmark_app to run benchmarking on that specific device. The benchmark app supports "CPU", "GPU", and "MYRIAD" (also known as [VPU](../../docs/OV_Runtime_UG/supported_plugins/VPU.md)) devices. In order to use the GPU or VPU, the system must have the appropriate drivers installed. If no device is specified, benchmark_app will default to using CPU.
|
||||
To set which device benchmarking runs on, use the `-d <device>` argument. This will tell benchmark_app to run benchmarking on that specific device. The benchmark app supports "CPU", "GPU", and GNA devices. In order to use the GPU, the system must have the appropriate drivers installed. If no device is specified, benchmark_app will default to using CPU.
|
||||
|
||||
For example, to run benchmarking on GPU, use:
|
||||
|
||||
@@ -151,7 +151,7 @@ Options:
|
||||
shape for input tensors. For example, "input1[1,3,224,224][1,3,448,448],input2[1,4][1,8]" or "[1,3,224,224][1,3,448,448] in case of one input size.
|
||||
-layout LAYOUT Optional. Prompts how model layouts should be treated by application. For example, "input1[NCHW],input2[NC]" or "[NCHW]" in case of one input size.
|
||||
-nstreams NUMBER_STREAMS, --number_streams NUMBER_STREAMS
|
||||
Optional. Number of streams to use for inference on the CPU/GPU/MYRIAD (for HETERO and MULTI device cases use format <device1>:<nstreams1>,<device2>:<nstreams2> or just
|
||||
Optional. Number of streams to use for inference on the CPU/GPU (for HETERO and MULTI device cases use format <device1>:<nstreams1>,<device2>:<nstreams2> or just
|
||||
<nstreams>). Default value is determined automatically for a device. Please note that although the automatic selection usually provides a reasonable performance, it
|
||||
still may be non - optimal for some cases, especially for very small models. Also, using nstreams>1 is inherently throughput-oriented option, while for the best-latency
|
||||
estimations the number of streams should be set to 1. See samples README for more details.
|
||||
|
||||
@@ -10,7 +10,7 @@ from openvino.runtime import Dimension
|
||||
from openvino.tools.benchmark.benchmark import Benchmark
|
||||
from openvino.tools.benchmark.parameters import parse_args
|
||||
from openvino.tools.benchmark.utils.constants import MULTI_DEVICE_NAME, \
|
||||
CPU_DEVICE_NAME, GPU_DEVICE_NAME, MYRIAD_DEVICE_NAME, \
|
||||
CPU_DEVICE_NAME, GPU_DEVICE_NAME, \
|
||||
BLOB_EXTENSION, AUTO_DEVICE_NAME
|
||||
from openvino.tools.benchmark.utils.inputs_filling import get_input_data
|
||||
from openvino.tools.benchmark.utils.logging import logger
|
||||
@@ -255,23 +255,22 @@ def main():
|
||||
logger.warning(f"-nstreams default value is determined automatically for {device} device. " +
|
||||
"Although the automatic selection usually provides a reasonable performance, "
|
||||
"but it still may be non-optimal for some cases, for more information look at README.")
|
||||
if device != MYRIAD_DEVICE_NAME: ## MYRIAD sets the default number of streams implicitly
|
||||
if key in supported_properties:
|
||||
config[device][key] = get_device_type_from_name(device) + "_THROUGHPUT_AUTO"
|
||||
elif "NUM_STREAMS" in supported_properties:
|
||||
key = "NUM_STREAMS"
|
||||
config[device][key] = "-1" # Set AUTO mode for streams number
|
||||
elif device in [MULTI_DEVICE_NAME, AUTO_DEVICE_NAME]:
|
||||
# Set nstreams to default value auto if no nstreams specified from cmd line.
|
||||
for hw_device in hw_devices_list:
|
||||
hw_supported_properties = benchmark.core.get_property(hw_device, 'SUPPORTED_PROPERTIES')
|
||||
key = get_device_type_from_name(hw_device) + "_THROUGHPUT_STREAMS"
|
||||
value = get_device_type_from_name(hw_device) + "_THROUGHPUT_AUTO"
|
||||
if key not in hw_supported_properties:
|
||||
key = "NUM_STREAMS"
|
||||
value = "AUTO"
|
||||
if key in hw_supported_properties:
|
||||
update_configs(hw_device, key, value)
|
||||
if key in supported_properties:
|
||||
config[device][key] = get_device_type_from_name(device) + "_THROUGHPUT_AUTO"
|
||||
elif "NUM_STREAMS" in supported_properties:
|
||||
key = "NUM_STREAMS"
|
||||
config[device][key] = "-1" # Set AUTO mode for streams number
|
||||
elif device in [MULTI_DEVICE_NAME, AUTO_DEVICE_NAME]:
|
||||
# Set nstreams to default value auto if no nstreams specified from cmd line.
|
||||
for hw_device in hw_devices_list:
|
||||
hw_supported_properties = benchmark.core.get_property(hw_device, 'SUPPORTED_PROPERTIES')
|
||||
key = get_device_type_from_name(hw_device) + "_THROUGHPUT_STREAMS"
|
||||
value = get_device_type_from_name(hw_device) + "_THROUGHPUT_AUTO"
|
||||
if key not in hw_supported_properties:
|
||||
key = "NUM_STREAMS"
|
||||
value = "AUTO"
|
||||
if key in hw_supported_properties:
|
||||
update_configs(hw_device, key, value)
|
||||
if key in config[device].keys():
|
||||
device_number_streams[device] = config[device][key]
|
||||
return
|
||||
@@ -301,9 +300,6 @@ def main():
|
||||
## for GPU execution, more throughput-oriented execution via streams
|
||||
set_throughput_streams()
|
||||
set_infer_precision()
|
||||
elif MYRIAD_DEVICE_NAME in device:
|
||||
set_throughput_streams()
|
||||
config[device]['LOG_LEVEL'] = 'LOG_INFO'
|
||||
elif AUTO_DEVICE_NAME in device:
|
||||
set_throughput_streams()
|
||||
set_infer_precision()
|
||||
|
||||
@@ -90,7 +90,7 @@ def parse_args():
|
||||
'Prompts how model layouts should be treated by application. '
|
||||
'For example, "input1[NCHW],input2[NC]" or "[NCHW]" in case of one input size.')
|
||||
args.add_argument('-nstreams', '--number_streams', type=str, required=False, default=None,
|
||||
help='Optional. Number of streams to use for inference on the CPU/GPU/MYRIAD '
|
||||
help='Optional. Number of streams to use for inference on the CPU/GPU '
|
||||
'(for HETERO and MULTI device cases use format <device1>:<nstreams1>,<device2>:<nstreams2> '
|
||||
'or just <nstreams>). '
|
||||
'Default value is determined automatically for a device. Please note that although the automatic selection '
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
# Copyright (C) 2018-2023 Intel Corporation
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
VPU_DEVICE_NAME = 'VPU'
|
||||
MYRIAD_DEVICE_NAME = 'MYRIAD'
|
||||
HDDL_DEVICE_NAME = 'HDDL'
|
||||
VPUX_DEVICE_NAME = 'VPUX'
|
||||
CPU_DEVICE_NAME = 'CPU'
|
||||
GPU_DEVICE_NAME = 'GPU'
|
||||
HETERO_DEVICE_NAME = 'HETERO'
|
||||
@@ -22,9 +20,7 @@ BINARY_EXTENSIONS = ['.bin']
|
||||
DEVICE_DURATION_IN_SECS = {
|
||||
CPU_DEVICE_NAME: 60,
|
||||
GPU_DEVICE_NAME: 60,
|
||||
VPU_DEVICE_NAME: 60,
|
||||
MYRIAD_DEVICE_NAME: 60,
|
||||
HDDL_DEVICE_NAME: 60,
|
||||
VPUX_DEVICE_NAME: 60,
|
||||
GNA_DEVICE_NAME: 60,
|
||||
UNKNOWN_DEVICE_TYPE: 120
|
||||
}
|
||||
Reference in new issue
Block a user