diff --git a/tools/pot/openvino/tools/pot/graph/builder.py b/tools/pot/openvino/tools/pot/graph/builder.py index 944a76b008c..eeea664d80f 100644 --- a/tools/pot/openvino/tools/pot/graph/builder.py +++ b/tools/pot/openvino/tools/pot/graph/builder.py @@ -140,7 +140,6 @@ def build_graph_for_node(model, input_name, input_shape, node, remove_bias=False nodes.append((result_name, 'Result', {})) edges.append((node.name, result_name, {'out': 0, 'in': 0})) graph = build_graph(*make_copy_graph_attrs(model, input_name, input_shape), nodes, edges) - graph.ir_v10 = True # Add the neccessary attribute to the new graph src_node = get_node_by_name(graph, node.name) diff --git a/tools/pot/openvino/tools/pot/graph/graph_utils.py b/tools/pot/openvino/tools/pot/graph/graph_utils.py index 13d747369b8..da0d9c7bc89 100644 --- a/tools/pot/openvino/tools/pot/graph/graph_utils.py +++ b/tools/pot/openvino/tools/pot/graph/graph_utils.py @@ -47,11 +47,17 @@ def load_graph(model_config, target_device='ANY'): raise RuntimeError('Input model bin should link to an existing file. Please, provide a correct path.') graph_from_ir, meta_data = stdout_redirect(restore_graph_from_ir, xml_path, bin_path) + + if graph_from_ir.graph['ir_version'] == 10: + raise AssertionError( + 'POT does not support version 10 of IR.' + 'Please convert the model with the newer version of OpenVINO ' + 'or use the POT from OpenVINO 2021.4.2 to work with version 10 of IR.') + orig_graph_from_ir, meta_data = stdout_redirect(restore_graph_from_ir, model_config.model, model_config.weights) meta_data['quantization_parameters'] = model_config.quantization_info graph_from_ir.meta_data = meta_data - graph_from_ir.ir_v10 = True graph_from_ir.graph['cmd_params'] = orig_graph_from_ir.graph['cmd_params'] remove_converts(graph_from_ir) model_preprocessing(graph_from_ir) diff --git a/tools/pot/openvino/tools/pot/graph/nx_model.py b/tools/pot/openvino/tools/pot/graph/nx_model.py index 95161f5dce4..ab3d9794bd7 100644 --- a/tools/pot/openvino/tools/pot/graph/nx_model.py +++ b/tools/pot/openvino/tools/pot/graph/nx_model.py @@ -67,6 +67,12 @@ class CompressedModel: ge.add_fullname_for_nodes(model['model']) def _from_graph(self, graph): + if graph.graph['ir_version'] == 10: + raise AssertionError( + 'POT does not support version 10 of IR.' + 'Please convert the model with the newer version of OpenVINO ' + 'or use the POT from OpenVINO 2021.4.2 to work with version 10 of IR.') + ge.add_fullname_for_nodes(graph) self._models.append({'model': graph}) self._is_cascade = False diff --git a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.bin b/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.bin deleted file mode 100644 index 360eb76b2ca..00000000000 --- a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e8c8e6ba81cc8fc66217e1408677175b0a094c34c071835c06412495d536256 -size 2130036 diff --git a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.json b/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.json index 999a0a53aad..74af1a70289 100644 --- a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.json +++ b/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ed7eef3415ccb1cd1b8606bdb8348e124979bb78b02e50badda92aa2cd3dc4d -size 222 +oid sha256:aa2be3155a781cdd99871f8c677f429d37df4921385a2bd7568116cec0634291 +size 152 diff --git a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.mapping b/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.mapping deleted file mode 100644 index 38240e04cf6..00000000000 --- a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.mapping +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43d82f63bfea7d3ae9d641169b9693596199d78171e94b918e09497a4f08a012 -size 34 diff --git a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.pb b/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.pb new file mode 100644 index 00000000000..df7fbed7a67 --- /dev/null +++ b/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.pb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70bd9834efa16e7ffa4ab52594b57bb4f813e4cf6b5f01d62117ebe6d8f22711 +size 2131972 diff --git a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.xml b/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.xml deleted file mode 100644 index 2a24563538c..00000000000 --- a/tools/pot/tests/data/models/matmul_divide_const/matmul_divide_const.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d678641136d8356fca47d4db4f39cb98e59426a9e1113754811d9e12e47463a -size 17387 diff --git a/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.bin b/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.bin deleted file mode 100644 index 6610aea14ea..00000000000 --- a/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0af1173b44db9f52b9878032b87679cc16521ec0c21fc413228e0854da4efed0 -size 526864 diff --git a/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.json b/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.json index 4fc2ca9cd5e..3b1789ba12c 100644 --- a/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.json +++ b/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de67711db3e1fb404a8b61be29954ab5b336d76b8cf7d3c5c98f7b9faab7c6e4 -size 283 +oid sha256:ffd87d843342dfcf87dc75ccf0d39acd929906e042a5960e155ff8208a3359c0 +size 224 diff --git a/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.pb b/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.pb new file mode 100644 index 00000000000..43f681e89b5 --- /dev/null +++ b/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.pb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a24413580157bb51a374150ff5597a362663794f394a925d906492a6cc61f4d +size 533495 diff --git a/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.xml b/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.xml deleted file mode 100644 index d7035fe9d87..00000000000 --- a/tools/pot/tests/data/models/multiple_outputs_net_example/multiple_outputs_net_example.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eafca25515ecb19d073a96fbaa234c5c9004bf9646419bb1d3f9c0faa25c19c2 -size 12739 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.bin b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.bin deleted file mode 100644 index cd4985e28de..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97d00430e1ea79257307daf825cfb01a68631a6cd4af2fdb7126ef526d40a660 -size 22360 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.json b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.json index bddbdf328da..3ee39f15ff8 100644 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.json +++ b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54e12e3df889dff95bfbe949a8e98facdfd5464bb746686ecc7b48d0da78e154 -size 202 +oid sha256:91b323d1ac69cbf8ee95f26aea9dcb06e6ea31144d62cdf317f50d8c9242d112 +size 146 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.mapping b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.mapping deleted file mode 100644 index 38240e04cf6..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.mapping +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43d82f63bfea7d3ae9d641169b9693596199d78171e94b918e09497a4f08a012 -size 34 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.onnx b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.onnx new file mode 100644 index 00000000000..666202f820c --- /dev/null +++ b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.onnx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ef0c63af492bd90c0ff94bacf8f3e0098a29fd10ae3692c1624e14d3c2af671 +size 50014 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.xml b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.xml deleted file mode 100644 index 35cd4b2af43..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_fuse.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3dcb45d8f69aa643c3e8038b92fdee885418d17d052470b9ef921039a8c3822 -size 10919 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.bin b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.bin deleted file mode 100644 index cd4985e28de..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97d00430e1ea79257307daf825cfb01a68631a6cd4af2fdb7126ef526d40a660 -size 22360 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.json b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.json index 8b7b2fb169b..4a4d7a8d2f6 100644 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.json +++ b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58d6366c3dbb3c1a0f4f9c5ce8c4569260a0d65e355dc0d16b8aec3432a72d7a -size 217 +oid sha256:8ca2fc29a319b713835d770b26946193070f1ab9184a16c6305a924fd683c3d2 +size 157 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.mapping b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.mapping deleted file mode 100644 index 38240e04cf6..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.mapping +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43d82f63bfea7d3ae9d641169b9693596199d78171e94b918e09497a4f08a012 -size 34 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.onnx b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.onnx new file mode 100644 index 00000000000..e812e9eaf84 --- /dev/null +++ b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.onnx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1baa52871e25d66ef96d7f8c67160d8816e682c36158f6f2215ef1a8b473351 +size 50044 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.xml b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.xml deleted file mode 100644 index f47e6ec7261..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_1.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b816b8316b12511fa5a1b46e637179c86677b9b2b8608b671e6fa7c10c68484e -size 11207 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.bin b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.bin deleted file mode 100644 index cd4985e28de..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97d00430e1ea79257307daf825cfb01a68631a6cd4af2fdb7126ef526d40a660 -size 22360 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.json b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.json index ed99a4b8a65..8be898794bd 100644 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.json +++ b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1e0e6b4866c66ee6040110408d8e717f4b253948a623f45b8c427a175f18e62 -size 217 +oid sha256:766bf125717626f9323d131d2211070af3d7441732a5310e2967423022d6d219 +size 158 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.mapping b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.mapping deleted file mode 100644 index 38240e04cf6..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.mapping +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43d82f63bfea7d3ae9d641169b9693596199d78171e94b918e09497a4f08a012 -size 34 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.onnx b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.onnx new file mode 100644 index 00000000000..c12f1e77b06 --- /dev/null +++ b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.onnx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c42ae51f569a3a8d1c1dce033d28cb67e0b6e8ba9d4f8438a30d84ace8f7c8e +size 50044 diff --git a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.xml b/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.xml deleted file mode 100644 index b2e43efcdab..00000000000 --- a/tools/pot/tests/data/models/scaleshift_fuse/scaleshift_no_fuse_2.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e3c4e8d1a0d0a3569dc97c4f6f4660e46c73dd6cfd528f47a710fbc47937bcb -size 11207 diff --git a/tools/pot/tests/data/reference_models/matmul_divide_const_ig_pt_dldt.xml b/tools/pot/tests/data/reference_models/matmul_divide_const_ig_pt_dldt.xml deleted file mode 100644 index ed1155f559d..00000000000 --- a/tools/pot/tests/data/reference_models/matmul_divide_const_ig_pt_dldt.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ace081823ddd5a2ae4741bda386b0013b0b1efca14e118524fc707f8291fa7ab -size 23883 diff --git a/tools/pot/tests/data/reference_models/matmul_divide_const_ig_pt_tf.xml b/tools/pot/tests/data/reference_models/matmul_divide_const_ig_pt_tf.xml new file mode 100644 index 00000000000..5ce83062249 --- /dev/null +++ b/tools/pot/tests/data/reference_models/matmul_divide_const_ig_pt_tf.xml @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2449650f0d479bf81a686e7900476a11b83f75b6bc83aa34e93bb2f5d7d6f30 +size 30174 diff --git a/tools/pot/tests/data/reference_models/multiple_outputs_net_example_dldt.xml b/tools/pot/tests/data/reference_models/multiple_outputs_net_example_dldt.xml deleted file mode 100644 index caba76d4fa8..00000000000 --- a/tools/pot/tests/data/reference_models/multiple_outputs_net_example_dldt.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ed7c8ba0078d053ca7408709468b5f8450c8c4236938bc4107911f969a6f1ed -size 23441 diff --git a/tools/pot/tests/data/reference_models/multiple_outputs_net_example_tf.xml b/tools/pot/tests/data/reference_models/multiple_outputs_net_example_tf.xml new file mode 100644 index 00000000000..8ca31459e18 --- /dev/null +++ b/tools/pot/tests/data/reference_models/multiple_outputs_net_example_tf.xml @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fb5d18a52e41360f9c08f0f0eb7afa61a430894c155cc5518e237b19ae0354b +size 39507 diff --git a/tools/pot/tests/data/reference_models/scaleshift_fuse_ig_pt_dldt.xml b/tools/pot/tests/data/reference_models/scaleshift_fuse_ig_pt_dldt.xml deleted file mode 100644 index 03bb629437c..00000000000 --- a/tools/pot/tests/data/reference_models/scaleshift_fuse_ig_pt_dldt.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06e73b5dd12cb09cc38d83aa2757c2246a0c3eee7617090fa95279a21f6b8200 -size 17827 diff --git a/tools/pot/tests/data/reference_models/scaleshift_fuse_ig_pt_pytorch.xml b/tools/pot/tests/data/reference_models/scaleshift_fuse_ig_pt_pytorch.xml new file mode 100644 index 00000000000..20bbd50bf37 --- /dev/null +++ b/tools/pot/tests/data/reference_models/scaleshift_fuse_ig_pt_pytorch.xml @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d6250d7a15280ce7d258571df2f1d80735ce9db4e8cfd11f8ba72ba947e73b4 +size 19090 diff --git a/tools/pot/tests/data/reference_models/scaleshift_no_fuse_1_ig_pt_dldt.xml b/tools/pot/tests/data/reference_models/scaleshift_no_fuse_1_ig_pt_dldt.xml deleted file mode 100644 index ee4d8698006..00000000000 --- a/tools/pot/tests/data/reference_models/scaleshift_no_fuse_1_ig_pt_dldt.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1065ced05c475134a24bb26787bdba70e4a2ec832bf9a4d6ac51be8dad90140 -size 19748 diff --git a/tools/pot/tests/data/reference_models/scaleshift_no_fuse_1_ig_pt_pytorch.xml b/tools/pot/tests/data/reference_models/scaleshift_no_fuse_1_ig_pt_pytorch.xml new file mode 100644 index 00000000000..58984956e8d --- /dev/null +++ b/tools/pot/tests/data/reference_models/scaleshift_no_fuse_1_ig_pt_pytorch.xml @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85225fcec14786e0b828ce00700f0a165155d5d9c48fb4dc37741a68f139e60f +size 21062 diff --git a/tools/pot/tests/data/reference_models/scaleshift_no_fuse_2_ig_pt_dldt.xml b/tools/pot/tests/data/reference_models/scaleshift_no_fuse_2_ig_pt_dldt.xml deleted file mode 100644 index cf6c0532864..00000000000 --- a/tools/pot/tests/data/reference_models/scaleshift_no_fuse_2_ig_pt_dldt.xml +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:123c3275fd1509d9382cb98e7e08add8bf2a0c4f240f557a65b261629fcfc7ae -size 19748 diff --git a/tools/pot/tests/data/reference_models/scaleshift_no_fuse_2_ig_pt_pytorch.xml b/tools/pot/tests/data/reference_models/scaleshift_no_fuse_2_ig_pt_pytorch.xml new file mode 100644 index 00000000000..91167529a80 --- /dev/null +++ b/tools/pot/tests/data/reference_models/scaleshift_no_fuse_2_ig_pt_pytorch.xml @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed05b306ac1e47007cedcd670c9882127c70d89e5e18b2689358ceb94b41cfe1 +size 21062 diff --git a/tools/pot/tests/test_graph.py b/tools/pot/tests/test_graph.py index 0c50d8c77ff..2a7eef032e8 100755 --- a/tools/pot/tests/test_graph.py +++ b/tools/pot/tests/test_graph.py @@ -25,7 +25,7 @@ TEST_MODELS = [ ('densenet121_example', 'pytorch', 'ANY'), ('multiple_out_ports_net', 'tf', 'ANY'), # ('lstm_example', 'pytorch', 'GNA'), - ('multiple_outputs_net_example', 'dldt', 'GNA'), + #('multiple_outputs_net_example', 'tf', 'GNA'), ('resnet_example', 'pytorch', 'CPU_SPR'), #('tensor_iterator_example', 'tf', 'ANY'), ] @@ -210,10 +210,10 @@ TEST_MODELS_WITH_PATTERNS = [ ('efficientnet_b0_example', 'pytorch'), ('mobilenet_v3_small_example', 'pytorch'), # ('image-retrieval-0001', 'dldt'), - ('scaleshift_fuse', 'dldt'), - ('scaleshift_no_fuse_1', 'dldt'), - ('scaleshift_no_fuse_2', 'dldt'), - ('matmul_divide_const', 'dldt') + ('scaleshift_fuse', 'pytorch'), + ('scaleshift_no_fuse_1', 'pytorch'), + ('scaleshift_no_fuse_2', 'pytorch'), + ('matmul_divide_const', 'tf') ] diff --git a/tools/pot/tests/utils/open_model_zoo.py b/tools/pot/tests/utils/open_model_zoo.py index 7b6891b5937..f5982e5c4da 100644 --- a/tools/pot/tests/utils/open_model_zoo.py +++ b/tools/pot/tests/utils/open_model_zoo.py @@ -100,7 +100,7 @@ def download_engine_config(model_name): engine_conf_.network_info = model_.network_info for launcher in model_.launchers: - if launcher.framework == 'dlsdk': + if launcher.framework == 'openvino': engine_conf_.launchers = list() engine_launcher = {'framework': launcher.framework} if launcher.adapter: