[POT] Update for CI (#19067)

* Update references
This commit is contained in:
Nikita Malinin 2023-09-01 18:12:24 +02:00 committed by GitHub
parent 3c7ea04c69
commit a4b0fe51af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 105 additions and 96 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82660b684cf0dd78d681dd4ddee02c9d5bc6b166121996c8780503a024fdda12
size 788943
oid sha256:20d22bfaf27a9d0a8a480078982068e3ce1012dc02e8d8dba7e329383cb0c273
size 779349

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7c56d86c6764306c6ea541a1d9339f49a16a8b20f5ea7c90ca57cf109d64d2b
size 786003
oid sha256:947172ca7efcfd8d8eac6fed4ba6bf8d438c7d76dfb8ef22b08234b8e505c170
size 776432

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e776a3ef963c34047d0bdcaaac8ca2516b5b21fa8f06b44b5548233ee574014d
size 786005
oid sha256:131b4933c84db2cd7c0444f4d7ada870489d06383dd661cfeab39628dad84fc4
size 776418

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a73fba176f4c605739c7a161d0237cd50b50d89faae46a9eed7df4ab3496323
size 903891
oid sha256:b22d46452cc40eee0c2e6d3945a199bf8f416bf93c7586571f91e77825f7bd23
size 903804

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5d702a7601dae6341ca976ad6d58a06f1ad89354da23c4ce134a5bc748c388a
size 950923
oid sha256:b8841c1af45b4e5fa3ad69851e26de64387433fabb64eccec9dae044c35309bc
size 950848

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21e46c5b0954ac8272396d3fe2ede75b0dd06aa313d1f172c6bb0c995b49b56e
size 947335
oid sha256:e16d2af2b3a66d9fd8802a35e02cd820defa6538005ead325543af5601d3f0a3
size 947079

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2cf6f9f84def98dc5c9058b442996f6b53f4169b429ddc42340c70c0ce5ce220
size 1175571
oid sha256:91f17b9909cc8856fba5c8ad744e8a8e859abd6be728feb4ef19204b9cbf29b2
size 1175347

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2039c9a36c8dd3ff508bed04fabfd57583226d57cb366b62e3f5eabd843312e
size 1169967
oid sha256:9cbd3fd5c14c83b6c2ea87c010b61bc0a0bcdc1e6249db28dc0ca17f491e0e82
size 1169727

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c77b876da2ed64f57acb4efd3027be713cecf8445c440b6de17ed01d0f634c27
size 1169961
oid sha256:41da5f7848c964ff10a34c11d6e84b8f0f89ddd0b5d677e5bc345335729d4e15
size 1169723

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b30ee4b7aa426fcac74a62f12376b03c16fc5cd23628d575f8bba21dcc7ba49
size 13562
oid sha256:aed058cbfe7bb9a0ebc4c87d1dcb8d9f3a45395041ffeec0628220654dec828d
size 10598

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c9a0b346acc62542254e95c40c47c6e9d3ac474df19021ef3d31b14ca5e1037
size 169870
oid sha256:de6da90cd8ed0f614afbbc092b722b8a9bfccb63fee6247528699cf12c4db04b
size 169806

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a38025d921aaf09cdc7c614a8dba15cd97e8bf739b2bb4812022352feda76f9a
size 106602
oid sha256:21c3f846298fc1f199273ae1edfaec0a3f397bed45db4f68ab08b1d2f8fb744e
size 105224

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a2449650f0d479bf81a686e7900476a11b83f75b6bc83aa34e93bb2f5d7d6f30
size 30174
oid sha256:72734202d951860985b3005620622a7a2299734b15773be6a22598a35d7c8440
size 21294

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed5e69858fe382e13bd28966a12272930bfc5eeb3ee006d7e2b6ec5dc4dfeb98
size 393907
oid sha256:9b0221586a419c2ac963e75da7b80d2ae167ee244affc3b1c3a07b86385e9bbf
size 393900

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca40322aa371c56d08c6b0ba872b19fddab03d51b4fea0acb802159d239c5be3
size 405856
oid sha256:e3125051c0fb2252d9c0a9e16cd51d89cd3581200c96669319f8bacc75bd9f69
size 405849

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21688b9941ee6249459a2a3ccdade6da7edcf43fda9f2173fa3ba5ba143aee31
size 297605
oid sha256:6bc9d1f4cd87585ea0fc23478648907219e89f2ae89566402f58b77c8f7d0d01
size 297598

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de6622476b93e820a75a650a697666df38649e984593adc87cdb93fd2d2da1ea
size 47050
oid sha256:b07a748a388a3b337b5e963f2a487835618bc74f88bef049dcf350f06037fb4d
size 39004

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:528d1ae7ec173c87eb3021d823dd4ee4fa568511cce0e9f3f8234b38535d3715
size 28912
oid sha256:9de6590517c1f86526b8b2e099771105354752ba1f165f6d0e09d3fb91edab95
size 25158

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e83bbaf63a503cc6b7f5a53def2929386ff8004e271933551822ecf8049eabac
size 26637
oid sha256:ea1f77f38be5b928e4e4212e56a0d34542bfef57d2f20d1f16be95d94ffab113
size 20758

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de7dc61a5a81f0b8d0f5afc272adc62157cc4b0b885506c8d176e1c4905b18f5
size 10558
oid sha256:ff7fbb83a809eedfbb94924d858b4bd06b3864afa2762dcde329c28f6737b9ad
size 7708

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45303a7659cdfd9f434c317e23792b5456dd2c4b1186b5fb207e9b4056dfd64f
size 10558
oid sha256:a6f7706e0d4728b124959e312ff10d1b1cbc4253fbc94df6129cf64eed63bdcb
size 7708

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e890cf9d1b85b6f10796ddd74ebdc6d5e3f0eeaf9d9fde62e7bf202df2d1885a
size 127315

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c20a1ec0c1046013c163a6ab782e27938a0ad7d65eaf09e1ff8ecc991fe57e9
size 52734

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c423d68b3fe0d72724006f5cc79e03530ed2fd256a180fcdddf78d3c38bacce
size 52734

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e8a3afc39f6f4f320a8576831c578568f0d4e80433ff5258cc7eb5e8c9272fd
size 60160

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06ff1b320bcb7b6292d4495575f1e04855004039f88c9d8b3516ee54841b92d1
size 12964
oid sha256:bc7dc0275cd92f89bebca5b8c9e1fd8ec0b1187492a3eeeb55cfa49d87d364af
size 12918

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86ada5487c9229a64cd0bb79e8f54e7a2cfa0b137dff502bd23e53d98d3189a6
oid sha256:724bea11f66583be78bc35edb6072bb33e67788ed3c0fbbb73f0c2c3cfb8a0af
size 500

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e71435df3cd6e30a4ff094bebd58f2e4b7c1faf3bfee41da9371736bf712947f
size 8145
oid sha256:760ef4bd2d3e3de87eb04dc5f353497582efd3516f919333184a279ae9591b0c
size 6407

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bba222756772c6eb83a0430ebbe48997b8d195b71f4710283ed505bd2c644b25
size 9243
oid sha256:7bf68b506e227baeeac417d5dfe74c07ffcd90ab448dcb0b8b1767ac902d8439
size 6407

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c074b1140e9052718b081811a97ccaf19a08baba6ea9b008c8cffd78d8946c9
size 18910
oid sha256:24ad2a7f5a3a20567e57e249d497857e1edf4e4865ae506ce4ea3b5baad33f15
size 18194

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91c4e38b0eda34254a6ffbf9540780cd3efb072a3c66475db2b4369aef465e6d
size 55994
oid sha256:d0397c04f092cf4e13ad93a516791eec97272333151da393f272d1633bf99deb
size 55265

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d056fc4483382eb69e5cc341f4d0c8970ef8d96d539489c45fffc8c2f637e8c2
size 281
oid sha256:c3a86b46e6c7af67593edf9a501d5a68b1a2d30cf0cce57f0dcf70146bd5455a
size 1832

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fcb6deca50062ec7da77ed2634ed93a8e8e2ca55e92e8774dfd3e9dd732c17f2
size 3429542
oid sha256:a71475cc9e0a63797373a91af7dead6f9ce7c559f3093a440a27ee058b208985
size 3527398

View File

@ -1,18 +1,19 @@
# Copyright (C) 2020-2022 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
from addict import Dict
import pytest
from addict import Dict
from tests.utils.check_graph import check_model
from tests.utils.path import HARDWARE_CONFIG_PATH
import openvino.tools.pot.graph.node_utils as nu
from openvino.tools.pot.graph import load_model
from openvino.tools.pot.configs.hardware_config import HardwareConfig
from openvino.tools.pot.graph import load_model
from openvino.tools.pot.graph.model_utils import (get_node_by_name,
get_nodes_by_type)
from openvino.tools.pot.graph.node_utils import (get_first_convolutions,
get_node_inputs)
from openvino.tools.pot.graph.transformer import GraphTransformer
from openvino.tools.pot.graph.model_utils import get_nodes_by_type, get_node_by_name
from openvino.tools.pot.graph.node_utils import get_node_inputs, get_first_convolutions
from tests.utils.path import HARDWARE_CONFIG_PATH
from tests.utils.check_graph import check_model
CPU_CONFIG_PATH = HARDWARE_CONFIG_PATH / 'cpu.json'
GNA_CONFIG_PATH = HARDWARE_CONFIG_PATH / 'gna.json'
@ -24,7 +25,8 @@ TEST_MODELS = [
('densenet121_example', 'pytorch', 'ANY'),
('multiple_out_ports_net', 'tf', 'ANY'),
('gru_example', 'pytorch', 'GNA'),
('lstm_example', 'pytorch', 'GNA'),
# Skipped due to OpenVINO bug - #118730
# ('lstm_example', 'pytorch', 'GNA'),
#('multiple_outputs_net_example', 'tf', 'GNA'),
('resnet_example', 'pytorch', 'CPU_SPR'),
('tensor_iterator_example', 'tf', 'ANY'),
@ -258,19 +260,20 @@ def test_multibranch_propagation_without_fq_moving(tmp_path, models, model_name,
MODELS_WITH_LSTM = [
('lstm_example', 'pytorch', {
'ReadValue_2474':
['Assign_2475'],
'ReadValue_2430':
['Assign_2431'],
'ReadValue_2440':
['Assign_2441'],
'ReadValue_2464':
['Assign_2465']
'ReadValue_1549':
['Assign_1550'],
'ReadValue_1556':
['Assign_1557'],
'ReadValue_1577':
['Assign_1578'],
'ReadValue_1584':
['Assign_1585']
})
]
def test_lstm_ends(tmp_path, models):
pytest.skip('Skipped due to OpenVINO bug - #118730')
model_name, model_framework, lstm_ends_ref = MODELS_WITH_LSTM[0]
model = models.get(model_name, model_framework, tmp_path)
model = load_model(model.model_params)

View File

@ -1,33 +1,32 @@
# Copyright (C) 2020-2022 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
import json
import os
import sys
from collections import OrderedDict
from copy import deepcopy
from pathlib import Path
from collections import OrderedDict
import json
import pytest
from addict import Dict
import cv2 as cv
import numpy as np
import pytest
from addict import Dict
from tools.evaluate import evaluate
from openvino.tools.pot.app.run import optimize
from openvino.tools.pot.graph import save_model, load_model
from tools.evaluate import evaluate
from openvino.tools.pot.graph import load_model, save_model
from .utils.check_graph import check_model
from .utils.config import get_engine_config, merge_configs, \
get_dataset_info, PATHS2DATASETS_CONFIG, make_algo_config
from .utils.config import (PATHS2DATASETS_CONFIG, get_dataset_info,
get_engine_config, make_algo_config, merge_configs)
TEST_MODELS = [
('mobilenet-v2-pytorch', 'pytorch', 'DefaultQuantization', 'performance', 300, {'accuracy@top1': 0.732,
'accuracy@top5': 0.907},
('mobilenet-v2-pytorch', 'pytorch', 'DefaultQuantization', 'performance', 300, {'accuracy@top1': 0.728,
'accuracy@top5': 0.915},
{}, 'CPU'),
('mobilenet-v2-pytorch', 'pytorch', 'DefaultQuantization', 'mixed', 300, {'accuracy@top1': 0.737,
('mobilenet-v2-pytorch', 'pytorch', 'DefaultQuantization', 'mixed', 300, {'accuracy@top1': 0.729,
'accuracy@top5': 0.91},
{}, 'CPU'),
@ -53,7 +52,7 @@ TEST_MODELS = [
('mtcnn', 'caffe', 'DefaultQuantization', 'performance', 1, {'recall': 0.76, 'map': 0.6618}, {}, 'CPU'),
('mtcnn', 'caffe', 'DefaultQuantization', 'performance', 2, {'recall': 0.76, 'map': 0.51},
('mtcnn', 'caffe', 'DefaultQuantization', 'performance', 2, {'recall': 0.72, 'map': 0.48},
{'use_fast_bias': False}, 'CPU'),
('octave-resnet-26-0.25', 'mxnet', 'DefaultQuantization', 'performance', 300,
{'accuracy@top1': 0.766, 'accuracy@top5': 0.927}, {'use_fast_bias': False}, 'CPU'),
@ -137,7 +136,8 @@ def test_sample_compression(_sample_params, tmp_path, models):
pot_dir = Path(__file__).parent.parent
sys.path.append(str(pot_dir / 'sample'))
# pylint: disable=C0415
from openvino.tools.pot.api.samples.classification.classification_sample import optimize_model
from openvino.tools.pot.api.samples.classification.classification_sample import \
optimize_model
model = models.get(model_name, model_framework, tmp_path, custom_mo_config=custom_mo_config)
data_source, annotations = get_dataset_info('imagenet_1001_classes')

View File

@ -52,7 +52,7 @@ def convert_custom_command_line(config):
executable = MO_PATH.joinpath('mo.py').as_posix()
cli_args = ' --model_name ' + config.name
cli_args += ' --output_dir ' + config.model_params.output_dir
cli_args += ' --data_type ' + config.precision
cli_args += ' --compress_to_fp16=' + "False" if config.precision == "FP32" else "True"
cli_args += ' '.join([' --' + key for key, value in config.mo_args.items() if value == 'True'])
cli_args += ' '.join(
[' --' + key + '=' + value.replace(' ', '') for key, value in config.mo_args.items() if value != 'True'])