From adce58d126adb59e1d3ccea6217a80cbd90e5d57 Mon Sep 17 00:00:00 2001 From: Anton Chetverikov Date: Wed, 29 Dec 2021 16:26:40 +0300 Subject: [PATCH] [MO] Add check for Python version to NetworkX dependency (#9226) * Add check for python version to networkx dependency * Update condition, task CVS-72806 * Update check to not break old Python versions support * Update POT NetworkX dependency * Allign requirements list format with setuptools documentation --- tools/mo/requirements.txt | 3 ++- tools/mo/requirements_caffe.txt | 3 ++- tools/mo/requirements_kaldi.txt | 3 ++- tools/mo/requirements_mxnet.txt | 3 ++- tools/mo/requirements_onnx.txt | 3 ++- tools/mo/requirements_tf.txt | 3 ++- tools/mo/requirements_tf2.txt | 3 ++- tools/pot/setup.py | 17 +++++++++-------- 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/tools/mo/requirements.txt b/tools/mo/requirements.txt index 5386262aded..fef835edef2 100644 --- a/tools/mo/requirements.txt +++ b/tools/mo/requirements.txt @@ -1,7 +1,8 @@ tensorflow~=2.5.0 mxnet~=1.2.0; sys_platform == 'win32' mxnet~=1.7.0.post2; sys_platform != 'win32' -networkx~=2.5 +networkx~=2.5; python_version <= "3.6" +networkx~=2.6; python_version > "3.6" numpy>=1.16.6,<1.20 protobuf>=3.15.6 onnx>=1.8.1 diff --git a/tools/mo/requirements_caffe.txt b/tools/mo/requirements_caffe.txt index d1eef645f44..77a8eb5bdaf 100644 --- a/tools/mo/requirements_caffe.txt +++ b/tools/mo/requirements_caffe.txt @@ -1,4 +1,5 @@ -networkx~=2.5 +networkx~=2.5; python_version <= "3.6" +networkx~=2.6; python_version > "3.6" numpy>=1.16.6,<1.20 protobuf>=3.15.6 defusedxml>=0.7.1 diff --git a/tools/mo/requirements_kaldi.txt b/tools/mo/requirements_kaldi.txt index 1068d95240c..8685cccb710 100644 --- a/tools/mo/requirements_kaldi.txt +++ b/tools/mo/requirements_kaldi.txt @@ -1,4 +1,5 @@ -networkx~=2.5 +networkx~=2.5; python_version <= "3.6" +networkx~=2.6; python_version > "3.6" numpy>=1.16.6,<1.20 defusedxml>=0.7.1 requests>=2.25.1 diff --git a/tools/mo/requirements_mxnet.txt b/tools/mo/requirements_mxnet.txt index 61897faa500..9d3e2608802 100644 --- a/tools/mo/requirements_mxnet.txt +++ b/tools/mo/requirements_mxnet.txt @@ -1,6 +1,7 @@ mxnet~=1.2.0; sys_platform == 'win32' mxnet~=1.7.0.post2; sys_platform != 'win32' -networkx~=2.5 +networkx~=2.5; python_version <= "3.6" +networkx~=2.6; python_version > "3.6" numpy>=1.16.6,<1.20 defusedxml>=0.7.1 urllib3>=1.26.4 diff --git a/tools/mo/requirements_onnx.txt b/tools/mo/requirements_onnx.txt index a6415939ccd..6040f072c06 100644 --- a/tools/mo/requirements_onnx.txt +++ b/tools/mo/requirements_onnx.txt @@ -1,5 +1,6 @@ onnx>=1.8.1 -networkx~=2.5 +networkx~=2.5; python_version <= "3.6" +networkx~=2.6; python_version > "3.6" numpy>=1.16.6,<1.20 defusedxml>=0.7.1 requests>=2.25.1 diff --git a/tools/mo/requirements_tf.txt b/tools/mo/requirements_tf.txt index d7514869e39..890d6f48e71 100644 --- a/tools/mo/requirements_tf.txt +++ b/tools/mo/requirements_tf.txt @@ -1,5 +1,6 @@ tensorflow~=2.5.0 -networkx~=2.5 +networkx~=2.5; python_version <= "3.6" +networkx~=2.6; python_version > "3.6" numpy>=1.16.6,<1.20 defusedxml>=0.7.1 requests>=2.25.1 diff --git a/tools/mo/requirements_tf2.txt b/tools/mo/requirements_tf2.txt index d7514869e39..890d6f48e71 100644 --- a/tools/mo/requirements_tf2.txt +++ b/tools/mo/requirements_tf2.txt @@ -1,5 +1,6 @@ tensorflow~=2.5.0 -networkx~=2.5 +networkx~=2.5; python_version <= "3.6" +networkx~=2.6; python_version > "3.6" numpy>=1.16.6,<1.20 defusedxml>=0.7.1 requests>=2.25.1 diff --git a/tools/pot/setup.py b/tools/pot/setup.py index b993033d8c3..290ec4e8d59 100644 --- a/tools/pot/setup.py +++ b/tools/pot/setup.py @@ -45,14 +45,15 @@ if '--install-dev-extras' in sys.argv: sys.argv.remove('--install-dev-extras') INSTALL_REQUIRES = [ - 'scipy~=1.5.4', - 'jstyleson~=0.0.2', - 'numpy>=1.16.6,<1.20', - 'addict>=2.4.0', - 'networkx~=2.5', - 'tqdm>=4.54.1', - 'texttable~=1.6.3', - 'pandas~=1.1.5', + "scipy~=1.5.4", + "jstyleson~=0.0.2", + "numpy>=1.16.6,<1.20", + "addict>=2.4.0", + "networkx~=2.5;python_version<='3.6'", + "networkx~=2.6;python_version>'3.6'", + "tqdm>=4.54.1", + "texttable~=1.6.3", + "pandas~=1.1.5", ] ALGO_EXTRAS = [