Skip to content

Commit ced4b2c

Browse files
committed
Fix onnx models loading
1 parent 5b63bd4 commit ced4b2c

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

tests/cpp/precommit/prepare_data.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,23 @@
55
from urllib.request import urlopen, urlretrieve
66

77

8-
def retrieve_otx_model(data_dir, model_name):
9-
destenation_folder = os.path.join(data_dir, "otx_models")
10-
os.makedirs(destenation_folder, exist_ok=True)
11-
urlretrieve(
12-
f"https://storage.openvinotoolkit.org/repositories/model_api/test/otx_models/{model_name}/openvino.xml",
13-
f"{destenation_folder}/{model_name}.xml",
14-
)
15-
urlretrieve(
16-
f"https://storage.openvinotoolkit.org/repositories/model_api/test/otx_models/{model_name}/openvino.bin",
17-
f"{destenation_folder}/{model_name}.bin",
18-
)
8+
def retrieve_otx_model(data_dir, model_name, format="xml"):
9+
destination_folder = os.path.join(data_dir, "otx_models")
10+
os.makedirs(destination_folder, exist_ok=True)
11+
if format == "onnx":
12+
urlretrieve(
13+
f"https://storage.openvinotoolkit.org/repositories/model_api/test/otx_models/{model_name}/model.onnx",
14+
f"{destination_folder}/{model_name}.onnx",
15+
)
16+
else:
17+
urlretrieve(
18+
f"https://storage.openvinotoolkit.org/repositories/model_api/test/otx_models/{model_name}/openvino.xml",
19+
f"{destination_folder}/{model_name}.xml",
20+
)
21+
urlretrieve(
22+
f"https://storage.openvinotoolkit.org/repositories/model_api/test/otx_models/{model_name}/openvino.bin",
23+
f"{destination_folder}/{model_name}.bin",
24+
)
1925

2026

2127
def prepare_model(
@@ -72,3 +78,4 @@ def prepare_data(data_dir="./data"):
7278
prepare_data(args.data_dir)
7379
retrieve_otx_model(args.data_dir, "mlc_mobilenetv3_large_voc")
7480
retrieve_otx_model(args.data_dir, "tinynet_imagenet")
81+
retrieve_otx_model(args.data_dir, "cls_mobilenetv3_large_cars", "onnx")

tests/cpp/precommit/public_scope.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
"name": "otx_models/mlc_mobilenetv3_large_voc.xml",
1616
"type": "ClassificationModel"
1717
},
18-
{
19-
"name": "otx_models/cls_mobilenetv3_large_cars.onnx",
20-
"type": "ClassificationModel"
21-
},
2218
{
2319
"name": "hrnet-v2-c1-segmentation",
2420
"type": "SegmentationModel"

0 commit comments

Comments
 (0)