IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[nG][Python]Make model runner compatibile with python 3.5 (#1578)

Browse Source
This commit is contained in:
Tomasz Socha 2020-08-03 12:56:59 +02:00 committed by GitHub
parent b58d03ae05
commit 91c71b81e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ngraph/python/tests/test_onnx/test_additional_models.py
View File

@ -35,7 +35,7 @@ if len(MODELS_ROOT_DIR) == 0:
zoo_models = []
# rglob doesn't work for symlinks, so models have to be physically somwhere inside "MODELS_ROOT_DIR"
for path in Path(MODELS_ROOT_DIR).rglob("*.onnx"):
mdir, file = os.path.split(path)
mdir, file = os.path.split(str(path))
if not file.startswith("."):
zoo_models.append({"model_name": path, "model_file": file, "dir": str(mdir)})

10
ngraph/python/tests/test_onnx/utils/model_importer.py
View File

@ -39,9 +39,9 @@ class ModelImportRunner(onnx.backend.test.BackendTest):
) -> None:
self.backend = backend
self._parent_module = parent_module
self._include_patterns: Set[Pattern[Text]] = set()
self._exclude_patterns: Set[Pattern[Text]] = set()
self._test_items: Dict[Text, Dict[Text, TestItem]] = defaultdict(dict)
self._include_patterns = set() # type: Set[Pattern[Text]]
self._exclude_patterns = set() # type: Set[Pattern[Text]]
self._test_items = defaultdict(dict) # type: Dict[Text, Dict[Text, TestItem]]
for model in models:
test_name = "test_{}".format(model["model_name"])
@ -71,7 +71,7 @@ class ModelImportRunner(onnx.backend.test.BackendTest):
def _add_model_import_test(self, model_test: OnnxTestCase, kind: Text) -> None:
# model is loaded at runtime, note sometimes it could even
# never loaded if the test skipped
model_marker: List[Optional[Union[ModelProto, NodeProto]]] = [None]
model_marker = [None] # type: List[Optional[Union[ModelProto, NodeProto]]]
def run_import(test_self: Any, device: Text) -> None:
model = ModelImportRunner._load_onnx_model(model_test.model_dir, model_test.model)
@ -118,7 +118,7 @@ class ModelImportRunner(onnx.backend.test.BackendTest):
def _add_model_execution_test(self, model_test: OnnxTestCase, kind: Text) -> None:
# model is loaded at runtime, note sometimes it could even
# never loaded if the test skipped
model_marker: List[Optional[Union[ModelProto, NodeProto]]] = [None]
model_marker = [None] # type: List[Optional[Union[ModelProto, NodeProto]]]
def run_execution(test_self: Any, device: Text) -> None:
model = ModelImportRunner._load_onnx_model(model_test.model_dir, model_test.model)