Merge branch 'ultralytics:master' into master

.github/workflows/ci-testing.yml

@@ -158,7 +158,7 @@ jobs:
  if: always() # This ensures the job runs even if previous jobs fail
  steps:
  - name: Check for failure and notify
- if: (needs.Benchmarks.result == 'failure' || needs.Tests.result == 'failure') && github.repository == 'ultralytics/yolov5' && (github.event_name == 'schedule' || github.event_name == 'push')
+ if: (needs.Benchmarks.result == 'failure' || needs.Tests.result == 'failure' || needs.Benchmarks.result == 'cancelled' || needs.Tests.result == 'cancelled') && github.repository == 'ultralytics/yolov5' && (github.event_name == 'schedule' || github.event_name == 'push')
  uses: slackapi/[email protected]
  with:
  payload: |

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
  - id: detect-private-key
 
  - repo: https://github.com/asottile/pyupgrade
- rev: v3.3.2
+ rev: v3.4.0
  hooks:
  - id: pyupgrade
  name: Upgrade code

README.md

@@ -77,7 +77,7 @@ To request an Enterprise License please complete the form at [Ultralytics Licens
  <a href="https://github.com/ultralytics" style="text-decoration:none;">
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-github.png" width="2%" alt="" /></a>
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="2%" alt="" />
- <a href="https://www.linkedin.com/company/ultralytics" style="text-decoration:none;">
+ <a href="https://www.linkedin.com/company/ultralytics/" style="text-decoration:none;">
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-linkedin.png" width="2%" alt="" /></a>
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="2%" alt="" />
  <a href="https://twitter.com/ultralytics" style="text-decoration:none;">
@@ -522,7 +522,7 @@ For YOLOv5 bug reports and feature requests please visit [GitHub Issues](https:/
  <a href="https://github.com/ultralytics" style="text-decoration:none;">
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-github.png" width="3%" alt="" /></a>
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="3%" alt="" />
- <a href="https://www.linkedin.com/company/ultralytics" style="text-decoration:none;">
+ <a href="https://www.linkedin.com/company/ultralytics/" style="text-decoration:none;">
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-linkedin.png" width="3%" alt="" /></a>
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="3%" alt="" />
  <a href="https://twitter.com/ultralytics" style="text-decoration:none;">

README.zh-CN.md

@@ -27,7 +27,7 @@ YOLOv5 🚀 是世界上最受欢迎的视觉 AI，代表<a href="https://ultral
  <a href="https://github.com/ultralytics" style="text-decoration:none;">
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-github.png" width="2%" alt="" /></a>
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="2%" alt="" />
- <a href="https://www.linkedin.com/company/ultralytics" style="text-decoration:none;">
+ <a href="https://www.linkedin.com/company/ultralytics/" style="text-decoration:none;">
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-linkedin.png" width="2%" alt="" /></a>
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="2%" alt="" />
  <a href="https://twitter.com/ultralytics" style="text-decoration:none;">
@@ -468,7 +468,7 @@ YOLOv5 在两种不同的 License 下可用：
  <a href="https://github.com/ultralytics" style="text-decoration:none;">
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-github.png" width="3%" alt="" /></a>
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="3%" alt="" />
- <a href="https://www.linkedin.com/company/ultralytics" style="text-decoration:none;">
+ <a href="https://www.linkedin.com/company/ultralytics/" style="text-decoration:none;">
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-social-linkedin.png" width="3%" alt="" /></a>
  <img src="https://github.com/ultralytics/assets/raw/main/social/logo-transparent.png" width="3%" alt="" />
  <a href="https://twitter.com/ultralytics" style="text-decoration:none;">

benchmarks.py

@@ -76,7 +76,12 @@ def run(
  if f == '-':
  w = weights # PyTorch format
  else:
- w = export.run(weights=weights, imgsz=[imgsz], include=[f], device=device, half=half)[-1] # all others
+ w = export.run(weights=weights,
+ imgsz=[imgsz],
+ include=[f],
+ batch_size=batch_size,
+ device=device,
+ half=half)[-1] # all others
  assert suffix in str(w), 'export failed'
 
  # Validate

export.py

@@ -207,21 +207,18 @@ def export_onnx(model, im, file, opset, dynamic, simplify, prefix=colorstr('ONNX
 @try_export
 def export_openvino(file, metadata, half, prefix=colorstr('OpenVINO:')):
  # YOLOv5 OpenVINO export
- check_requirements('openvino-dev') # requires openvino-dev: https://pypi.org/project/openvino-dev/
- import openvino.inference_engine as ie
+ check_requirements('openvino-dev>=2022.3') # requires openvino-dev: https://pypi.org/project/openvino-dev/
+ import openvino.runtime as ov # noqa
+ from openvino.tools import mo # noqa
 
- LOGGER.info(f'\n{prefix} starting export with openvino {ie.__version__}...')
- f = str(file).replace('.pt', f'_openvino_model{os.sep}')
+ LOGGER.info(f'\n{prefix} starting export with openvino {ov.__version__}...')
+ f = str(file).replace(file.suffix, f'_openvino_model{os.sep}')
+ f_onnx = file.with_suffix('.onnx')
+ f_ov = str(Path(f) / file.with_suffix('.xml').name)
 
- args = [
- 'mo',
- '--input_model',
- str(file.with_suffix('.onnx')),
- '--output_dir',
- f,
- '--data_type',
- ('FP16' if half else 'FP32'),]
- subprocess.run(args, check=True, env=os.environ) # export
+ ov_model = mo.convert_model(f_onnx, model_name=file.stem, framework='onnx', compress_to_fp16=half) # export
+
+ ov.serialize(ov_model, f_ov) # save
  yaml_save(Path(f) / file.with_suffix('.yaml').name, metadata) # add metadata.yaml
  return f, None
 

requirements.txt

@@ -15,7 +15,7 @@ thop>=0.1.1 # FLOPs computation
 torch>=1.7.0 # see https://pytorch.org/get-started/locally (recommended)
 torchvision>=0.8.1
 tqdm>=4.64.0
-ultralytics>=8.0.100
+ultralytics>=8.0.111
 # protobuf<=3.20.1 # https://github.com/ultralytics/yolov5/issues/8012
 
 # Logging ---------------------------------------------------------------------