zjc
/
yolov5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OpenVINO metadata fix2 (#7954) 

* Bug Fixed: OpenVINO metadata

* Bug Fixed: OpenVINO metadata

* Update export.py

* Update export.py

Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
This commit is contained in:
xylieong 2022-05-24 19:19:25 +08:00 committed by GitHub
parent 0dd66e2dc7
commit 27911dc824
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
export.py
View File

@ -180,7 +180,7 @@ def export_openvino(model, file, half, prefix=colorstr('OpenVINO:')):
cmd = f"mo --input_model {file.with_suffix('.onnx')} --output_dir {f} --data_type {'FP16' if half else 'FP32'}" cmd = f"mo --input_model {file.with_suffix('.onnx')} --output_dir {f} --data_type {'FP16' if half else 'FP32'}"
subprocess.check_output(cmd.split()) # export subprocess.check_output(cmd.split()) # export
with open(Path(f) / file.with_suffix('.yaml'), 'w') as g: with open(Path(f) / file.with_suffix('.yaml').name, 'w') as g:
yaml.dump({'stride': int(max(model.stride)), 'names': model.names}, g) # add metadata.yaml yaml.dump({'stride': int(max(model.stride)), 'names': model.names}, g) # add metadata.yaml
LOGGER.info(f'{prefix} export success, saved as {f} ({file_size(f):.1f} MB)') LOGGER.info(f'{prefix} export success, saved as {f} ({file_size(f):.1f} MB)')

2
models/common.py
View File

@ -368,7 +368,7 @@ class DetectMultiBackend(nn.Module):
network = ie.read_model(model=w, weights=Path(w).with_suffix('.bin')) network = ie.read_model(model=w, weights=Path(w).with_suffix('.bin'))
executable_network = ie.compile_model(model=network, device_name="CPU") executable_network = ie.compile_model(model=network, device_name="CPU")
output_layer = next(iter(executable_network.outputs)) output_layer = next(iter(executable_network.outputs))
meta = w.with_suffix('.yaml') meta = Path(w).with_suffix('.yaml')
if meta.exists(): if meta.exists():
stride, names = self._load_metadata(meta) # load metadata stride, names = self._load_metadata(meta) # load metadata
elif engine: # TensorRT elif engine: # TensorRT