From e2f9bba964c25bb5d180efc56fdbbaa1c9c43b77 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 13 Jul 2023 18:13:55 +0200 Subject: [PATCH] Update OpenVINO requirement to `openvino>=2023.0` (#3722) Co-authored-by: Glenn Jocher --- requirements.txt | 2 +- setup.py | 2 +- ultralytics/nn/autobackend.py | 4 ++-- ultralytics/yolo/engine/exporter.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index be1fce9..fd1956e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ seaborn>=0.11.0 # tensorflow>=2.4.1 # TF exports (-cpu, -aarch64, -macos) # tflite-support # tensorflowjs>=3.9.0 # TF.js export -# openvino-dev>=2022.3 # OpenVINO export +# openvino-dev>=2023.0 # OpenVINO export # Extras -------------------------------------- psutil # system utilization diff --git a/setup.py b/setup.py index 76f6b7d..83bddf6 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( 'mkdocs-redirects', # for 301 redirects 'mkdocs-ultralytics-plugin>=0.0.21', # for meta descriptions and images, dates and authors ], - 'export': ['coremltools>=6.0', 'openvino-dev>=2022.3', 'tensorflowjs'], # automatically installs tensorflow + 'export': ['coremltools>=6.0', 'openvino-dev>=2023.0', 'tensorflowjs'], # automatically installs tensorflow }, classifiers=[ 'Development Status :: 4 - Beta', diff --git a/ultralytics/nn/autobackend.py b/ultralytics/nn/autobackend.py index 7e713dd..04e8dca 100644 --- a/ultralytics/nn/autobackend.py +++ b/ultralytics/nn/autobackend.py @@ -135,7 +135,7 @@ class AutoBackend(nn.Module): metadata = session.get_modelmeta().custom_metadata_map # metadata elif xml: # OpenVINO LOGGER.info(f'Loading {w} for OpenVINO inference...') - check_requirements('openvino') # requires openvino-dev: https://pypi.org/project/openvino-dev/ + check_requirements('openvino>=2023.0') # requires openvino-dev: https://pypi.org/project/openvino-dev/ from openvino.runtime import Core, Layout, get_batch # noqa core = Core() w = Path(w) @@ -339,7 +339,7 @@ class AutoBackend(nn.Module): y = self.session.run(self.output_names, {self.session.get_inputs()[0].name: im}) elif self.xml: # OpenVINO im = im.cpu().numpy() # FP32 - y = list(self.ov_compiled_model([im]).values()) + y = list(self.ov_compiled_model(im).values()) elif self.engine: # TensorRT if self.dynamic and im.shape != self.bindings['images'].shape: i = self.model.get_binding_index('images') diff --git a/ultralytics/yolo/engine/exporter.py b/ultralytics/yolo/engine/exporter.py index 6d70a2c..61a108e 100644 --- a/ultralytics/yolo/engine/exporter.py +++ b/ultralytics/yolo/engine/exporter.py @@ -357,7 +357,7 @@ class Exporter: @try_export def export_openvino(self, prefix=colorstr('OpenVINO:')): """YOLOv8 OpenVINO export.""" - check_requirements('openvino-dev>=2022.3') # requires openvino-dev: https://pypi.org/project/openvino-dev/ + check_requirements('openvino-dev>=2023.0') # requires openvino-dev: https://pypi.org/project/openvino-dev/ import openvino.runtime as ov # noqa from openvino.tools import mo # noqa