From 2aa768d58bed1127f4887f1a56eefe3655f831d4 Mon Sep 17 00:00:00 2001 From: Denis Orlov Date: Tue, 13 Feb 2024 07:18:25 +0000 Subject: [PATCH] Remove mentioning GNA in constants and messages (#22797) --- docs/snippets/ov_caching.cpp | 8 ++++---- .../classification_sample_async.py | 2 +- .../benchmark_tool/openvino/tools/benchmark/parameters.py | 2 +- .../openvino/tools/benchmark/utils/constants.py | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/snippets/ov_caching.cpp b/docs/snippets/ov_caching.cpp index 1e104c25b28..cefb3da55c7 100644 --- a/docs/snippets/ov_caching.cpp +++ b/docs/snippets/ov_caching.cpp @@ -2,7 +2,7 @@ void part0() { std::string modelPath = "/tmp/myModel.xml"; - std::string device = "GNA"; + std::string device = "GPU"; ov::AnyMap config; //! [ov:caching:part0] ov::Core core; // Step 1: create ov::Core object @@ -19,7 +19,7 @@ auto compiled = core.compile_model(model, device, config); // Step 5: LoadNetwo void part1() { std::string modelPath = "/tmp/myModel.xml"; - std::string device = "GNA"; + std::string device = "GPU"; ov::AnyMap config; //! [ov:caching:part1] ov::Core core; // Step 1: create ov::Core object @@ -32,7 +32,7 @@ auto compiled = core.compile_model(modelPath, device, config); // Step 2: Compi void part2() { std::string modelPath = "/tmp/myModel.xml"; - std::string device = "GNA"; + std::string device = "GPU"; ov::AnyMap config; //! [ov:caching:part2] ov::Core core; // Step 1: create ov::Core object @@ -45,7 +45,7 @@ auto compiled = core.compile_model(modelPath, device, config); // Step 2: Compi } void part3() { - std::string deviceName = "GNA"; + std::string deviceName = "GPU"; ov::AnyMap config; ov::Core core; //! [ov:caching:part3] diff --git a/samples/python/classification_sample_async/classification_sample_async.py b/samples/python/classification_sample_async/classification_sample_async.py index 92180f0534e..00aed776f23 100755 --- a/samples/python/classification_sample_async/classification_sample_async.py +++ b/samples/python/classification_sample_async/classification_sample_async.py @@ -24,7 +24,7 @@ def parse_args() -> argparse.Namespace: args.add_argument('-i', '--input', type=str, required=True, nargs='+', help='Required. Path to an image file(s).') args.add_argument('-d', '--device', type=str, default='CPU', - help='Optional. Specify the target device to infer on; CPU, GPU, GNA or HETERO: ' + help='Optional. Specify the target device to infer on; CPU, GPU or HETERO: ' 'is acceptable. The sample will look for a suitable plugin for device specified. ' 'Default value is CPU.') # fmt: on diff --git a/tools/benchmark_tool/openvino/tools/benchmark/parameters.py b/tools/benchmark_tool/openvino/tools/benchmark/parameters.py index 1e9d0f84eb6..f9702b2369a 100644 --- a/tools/benchmark_tool/openvino/tools/benchmark/parameters.py +++ b/tools/benchmark_tool/openvino/tools/benchmark/parameters.py @@ -143,7 +143,7 @@ def parse_args(): devp = parser.add_argument_group('Device-specific performance options') devp.add_argument('-nthreads', '--number_threads', type=int, required=False, default=None, - help='Number of threads to use for inference on the CPU, GNA ' + help='Number of threads to use for inference on the CPU ' '(including HETERO and MULTI cases).') devp.add_argument('-pin', '--infer_threads_pinning', type=str, required=False, choices=['YES', 'NO', 'NUMA', 'HYBRID_AWARE'], help='Optional. Enable threads->cores (\'YES\' which is OpenVINO runtime\'s default for conventional CPUs), ' diff --git a/tools/benchmark_tool/openvino/tools/benchmark/utils/constants.py b/tools/benchmark_tool/openvino/tools/benchmark/utils/constants.py index 1fb45e1f4a2..34d4be1b53e 100644 --- a/tools/benchmark_tool/openvino/tools/benchmark/utils/constants.py +++ b/tools/benchmark_tool/openvino/tools/benchmark/utils/constants.py @@ -7,7 +7,6 @@ GPU_DEVICE_NAME = 'GPU' HETERO_DEVICE_NAME = 'HETERO' MULTI_DEVICE_NAME = 'MULTI' AUTO_DEVICE_NAME = 'AUTO' -GNA_DEVICE_NAME = 'GNA' UNKNOWN_DEVICE_TYPE = 'UNKNOWN' XML_EXTENSION = '.xml' @@ -23,6 +22,5 @@ DEVICE_DURATION_IN_SECS = { CPU_DEVICE_NAME: 60, GPU_DEVICE_NAME: 60, NPU_DEVICE_NAME: 60, - GNA_DEVICE_NAME: 60, UNKNOWN_DEVICE_TYPE: 120 }