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

Update modules version checker in MO to support ~= (#5342)

Browse Source 
* Add check for ~= sign for modules versions check

* Add unit test

* Update check for environment markers

* Update check for ~= sign

* Update unit tests

Co-authored-by: achetver <anton.chetverikov@.intel.com>
This commit is contained in:
Anton Chetverikov 2021-04-28 11:23:08 +03:00 committed by GitHub
parent a541f0929a
commit 8395ce1b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
model-optimizer/mo/utils/versions_checker.py
View File

@ -61,7 +61,7 @@ def parse_and_filter_versions_list(required_fw_versions, version_list, env_setup
# check environment marker
if len(splited_requirement) > 1:
env_req = splited_requirement[1]
splited_env_req = re.split(r"==|>=|<=|>|<", env_req)
splited_env_req = re.split(r"==|>=|<=|>|<|~=", env_req)
splited_env_req = [l.strip(',') for l in splited_env_req]
env_marker = splited_env_req[0].strip(' ')
if env_marker == 'python_version' and env_marker in env_setup:
@ -69,7 +69,7 @@ def parse_and_filter_versions_list(required_fw_versions, version_list, env_setup
env_req_version_list = []
splited_required_versions = re.split(r",", env_req)
for i, l in enumerate(splited_required_versions):
for comparison in ['==', '>=', '<=', '<', '>']:
for comparison in ['==', '>=', '<=', '<', '>', '~=']:
if comparison in l:
required_version = splited_env_req[i + 1].strip(' ').replace('"', '')
env_req_version_list.append((env_marker, comparison, required_version))
@ -88,7 +88,7 @@ def parse_and_filter_versions_list(required_fw_versions, version_list, env_setup
# parse a requirement for a dependency
requirement = splited_requirement[0]
splited_versions_by_conditions = re.split(r"==|>=|<=|>|<", requirement)
splited_versions_by_conditions = re.split(r"==|>=|<=|>|<|~=", requirement)
splited_versions_by_conditions = [l.strip(',') for l in splited_versions_by_conditions]
if len(splited_versions_by_conditions) == 0:
@ -98,7 +98,7 @@ def parse_and_filter_versions_list(required_fw_versions, version_list, env_setup
else:
splited_required_versions= re.split(r",", requirement)
for i, l in enumerate(splited_required_versions):
for comparison in ['==', '>=', '<=', '<', '>']:
for comparison in ['==', '>=', '<=', '<', '>', '~=']:
if comparison in l:
version_list.append((splited_versions_by_conditions[0], comparison, splited_versions_by_conditions[i + 1]))
break
@ -158,6 +158,15 @@ def version_check(name, installed_v, required_v, sign, not_satisfied_v):
satisfied = installed_v < req_ver
elif sign == '==':
satisfied = installed_v == req_ver
elif sign == '~=':
req_ver_list = req_ver.vstring.split('.')
if 'post' in req_ver_list[-1]:
assert len(req_ver_list) >= 3, 'Error during {} module version checking: {} {} {}, please check ' \
'required version of this module in requirements_*.txt file!'\
.format(name, installed_v, sign, required_v)
req_ver_list.pop(-1)
idx = len(req_ver_list) - 1
satisfied = installed_v >= req_ver and (installed_v.split('.')[:idx] == req_ver_list[:idx])
else:
log.error("Error during version comparison")
else:

74
model-optimizer/unit_tests/mo/utils/versions_checker_test.py
View File

@ -13,12 +13,19 @@ class TestingVersionsChecker(unittest.TestCase):
def test_get_module_version_list_from_file(self, mock_open):
mock_open.return_value.__enter__ = mock_open
mock_open.return_value.__iter__ = mock.Mock(
return_value=iter(['mxnet>=1.0.0,<=1.3.1', 'networkx>=1.11', 'numpy==1.12.0', 'defusedxml<=0.5.0']))
ref_list =[('mxnet', '>=', '1.0.0'), ('mxnet', '<=', '1.3.1'),
('networkx', '>=', '1.11'),
('numpy', '==', '1.12.0'), ('defusedxml', '<=', '0.5.0')]
return_value=iter(['mxnet>=1.0.0,<=1.3.1',
'networkx>=1.11',
'numpy==1.12.0',
'defusedxml<=0.5.0',
'networkx~=1.11']))
ref_list = [('mxnet', '>=', '1.0.0'),
('mxnet', '<=', '1.3.1'),
('networkx', '>=', '1.11'),
('numpy', '==', '1.12.0'),
('defusedxml', '<=', '0.5.0'),
('networkx', '~=', '1.11')]
version_list = get_module_version_list_from_file('mock_file', {})
self.assertEqual(len(version_list), 5)
self.assertEqual(len(version_list), 6)
for i, version_dict in enumerate(version_list):
self.assertTupleEqual(ref_list[i], version_dict)
@ -29,13 +36,15 @@ class TestingVersionsChecker(unittest.TestCase):
return_value=iter(['tensorflow>=1.15.2,<2.0; python_version < "3.8"',
'tensorflow>=2.0; python_version >= "3.8"',
'numpy==1.12.0',
'defusedxml<=0.5.0']))
ref_list =[('tensorflow', '>=', '1.15.2'),
('tensorflow', '<', '2.0'),
('numpy', '==', '1.12.0'),
('defusedxml', '<=', '0.5.0')]
'defusedxml<=0.5.0',
'networkx~=1.11']))
ref_list = [('tensorflow', '>=', '1.15.2'),
('tensorflow', '<', '2.0'),
('numpy', '==', '1.12.0'),
('defusedxml', '<=', '0.5.0'),
('networkx', '~=', '1.11')]
version_list = get_module_version_list_from_file('mock_file', {'python_version': '3.7.0'})
self.assertEqual(len(version_list), 4)
self.assertEqual(len(version_list), 5)
for i, version_dict in enumerate(version_list):
self.assertTupleEqual(ref_list[i], version_dict)
@ -46,12 +55,14 @@ class TestingVersionsChecker(unittest.TestCase):
return_value=iter(['tensorflow>=1.15.2,<2.0; python_version < "3.8"',
'tensorflow>=2.0; python_version >= "3.8"',
'numpy==1.12.0',
'defusedxml<=0.5.0']))
ref_list =[('tensorflow', '>=', '2.0'),
('numpy', '==', '1.12.0'),
('defusedxml', '<=', '0.5.0')]
'defusedxml<=0.5.0',
'networkx~=1.11']))
ref_list = [('tensorflow', '>=', '2.0'),
('numpy', '==', '1.12.0'),
('defusedxml', '<=', '0.5.0'),
('networkx', '~=', '1.11')]
version_list = get_module_version_list_from_file('mock_file', {'python_version': '3.8.1'})
self.assertEqual(len(version_list), 3)
self.assertEqual(len(version_list), 4)
for i, version_dict in enumerate(version_list):
self.assertTupleEqual(ref_list[i], version_dict)
@ -110,9 +121,11 @@ class TestingVersionsChecker(unittest.TestCase):
('module_2', '>=', '1.12.0', '1.12.0'),
('module_3', '>=', '1.12.0', '1.12.1'),
('module_4', '>=', '1.12.0', '1.20.0'),
('module_5', '>=', '1.12.0.post2', '1.12.0.post1'),
]
ref_list = [('module_1', 'installed: 1.09.2', 'required: >= 1.12.0')
ref_list = [('module_1', 'installed: 1.09.2', 'required: >= 1.12.0'),
('module_5', 'installed: 1.12.0.post1', 'required: >= 1.12.0.post2')
]
not_satisfied_versions = []
@ -126,6 +139,7 @@ class TestingVersionsChecker(unittest.TestCase):
('module_2', '<', '1.11', '1.10.1'),
('module_3', '<', '1.11', '1.11'),
('module_4', '<', '1.11', '1.20'),
('module_5', '<', '1.11', '1.10.post2'),
]
ref_list = [('module_3', 'installed: 1.11', 'required: < 1.11'),
@ -154,3 +168,29 @@ class TestingVersionsChecker(unittest.TestCase):
for name, key, required_version, installed_version in modules_versions_list:
version_check(name, installed_version, required_version, key, not_satisfied_versions)
self.assertEqual(not_satisfied_versions, ref_list)
def test_version_check_compatible(self):
modules_versions_list = [('module_1', '~=', '1.2.3', '1.2.3'),
('module_2', '~=', '1.2.3', '1.2.3b4'),
('module_3', '~=', '1.2.3', '1.2.4'),
('module_4', '~=', '1.2.3', '1.3.0'),
('module_5', '~=', '1.2.3', '1.2.2'),
('module_6', '~=', '1.2.3', '2.2.2'),
('module_7', '~=', '1.2.post2', '1.3'),
('module_8', '~=', '1.2.post2', '1.2'),
('module_9', '~=', '1.2.post2', '1.2.post1'),
('module_9', '~=', '1.2.post2', '1.2.post4')
]
ref_list = [('module_4', 'installed: 1.3.0', 'required: ~= 1.2.3'),
('module_5', 'installed: 1.2.2', 'required: ~= 1.2.3'),
('module_6', 'installed: 2.2.2', 'required: ~= 1.2.3'),
('module_8', 'installed: 1.2', 'required: ~= 1.2.post2'),
('module_9', 'installed: 1.2.post1', 'required: ~= 1.2.post2')
]
not_satisfied_versions = []
for name, key, required_version, installed_version in modules_versions_list:
version_check(name, installed_version, required_version, key, not_satisfied_versions)
self.assertEqual(not_satisfied_versions, ref_list)