From 3a202c2775c7befba3fdb0c5fe00004489b8c56d Mon Sep 17 00:00:00 2001 From: Mateusz Tabaka Date: Tue, 24 May 2022 14:07:36 +0200 Subject: [PATCH] Don't install networkx with version 2.8.1 (#11718) With new networkx release (2.8.1) some of MO tests started to fail with following error: ``` def __setstate__(self, state): self._graph = G = state["_graph"] self._adjdict = G._pred if hasattr(G, "pred") else G._adj AttributeError: 'Graph' object has no attribute '_adj' ``` Seems like regression that was introduced in https://github.com/networkx/networkx/commit/f50fc70b8cb6b4f5217a6d5505ba0e2b82b4761b --- tools/mo/requirements.txt | 2 +- tools/mo/requirements_caffe.txt | 2 +- tools/mo/requirements_kaldi.txt | 2 +- tools/mo/requirements_mxnet.txt | 2 +- tools/mo/requirements_onnx.txt | 2 +- tools/mo/requirements_tf.txt | 2 +- tools/mo/requirements_tf2.txt | 2 +- tools/pot/setup.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/mo/requirements.txt b/tools/mo/requirements.txt index 7f5243164f5296..0250fd81fd94a4 100644 --- a/tools/mo/requirements.txt +++ b/tools/mo/requirements.txt @@ -2,7 +2,7 @@ tensorflow>=1.15.5,<2.6 mxnet~=1.2.0; sys_platform == 'win32' mxnet~=1.7.0.post2; sys_platform != 'win32' networkx~=2.5; python_version <= "3.6" -networkx~=2.6; python_version > "3.6" +networkx<2.8.1; 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 77a8eb5bdafe31..e766871be7210a 100644 --- a/tools/mo/requirements_caffe.txt +++ b/tools/mo/requirements_caffe.txt @@ -1,5 +1,5 @@ networkx~=2.5; python_version <= "3.6" -networkx~=2.6; python_version > "3.6" +networkx<2.8.1; 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 8685cccb7109b3..c566483fa3821c 100644 --- a/tools/mo/requirements_kaldi.txt +++ b/tools/mo/requirements_kaldi.txt @@ -1,5 +1,5 @@ networkx~=2.5; python_version <= "3.6" -networkx~=2.6; python_version > "3.6" +networkx<2.8.1; 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 9d3e26088029bb..1adf8c23ae4ba4 100644 --- a/tools/mo/requirements_mxnet.txt +++ b/tools/mo/requirements_mxnet.txt @@ -1,7 +1,7 @@ mxnet~=1.2.0; sys_platform == 'win32' mxnet~=1.7.0.post2; sys_platform != 'win32' networkx~=2.5; python_version <= "3.6" -networkx~=2.6; python_version > "3.6" +networkx<2.8.1; 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 6040f072c06b13..aabad0a4e4f419 100644 --- a/tools/mo/requirements_onnx.txt +++ b/tools/mo/requirements_onnx.txt @@ -1,6 +1,6 @@ onnx>=1.8.1 networkx~=2.5; python_version <= "3.6" -networkx~=2.6; python_version > "3.6" +networkx<2.8.1; 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 86a0c421c4d2bc..70cfe1cb712f17 100644 --- a/tools/mo/requirements_tf.txt +++ b/tools/mo/requirements_tf.txt @@ -1,6 +1,6 @@ tensorflow>=1.15.5,<2.6 networkx~=2.5; python_version <= "3.6" -networkx~=2.6; python_version > "3.6" +networkx<2.8.1; 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 6ba68c986cc546..8a1f2a314c4045 100644 --- a/tools/mo/requirements_tf2.txt +++ b/tools/mo/requirements_tf2.txt @@ -1,7 +1,7 @@ tensorflow~=2.5.0; python_version <= "3.6" tensorflow~=2.5.3; python_version > "3.6" networkx~=2.5; python_version <= "3.6" -networkx~=2.6; python_version > "3.6" +networkx<2.8.1; 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 07d41a9a7b5f7b..f688e235609fa1 100644 --- a/tools/pot/setup.py +++ b/tools/pot/setup.py @@ -70,7 +70,7 @@ def get_version(): "numpy>=1.16.6,<1.20", "addict>=2.4.0", "networkx~=2.5;python_version<='3.6'", - "networkx~=2.6;python_version>'3.6'", + "networkx<2.8.1;python_version>'3.6'", "tqdm>=4.54.1", "texttable~=1.6.3", "pandas~=1.1.5",