Skip to content

Commit

Permalink
Align MO pip requirements (openvinotoolkit#5171)
Browse files Browse the repository at this point in the history
* Align MO pip requirements

* fix missing mxnet on platforms other than Windows or Linux

* remove spaces near environment markers
  • Loading branch information
ilya-naumov authored and yekruglov committed Jun 7, 2021
1 parent bc8f78f commit f85ac13
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 42 deletions.
4 changes: 3 additions & 1 deletion docs/MO_DG/prepare_model/Config_Model_Optimizer.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,12 @@ virtualenv -p /usr/bin/python3.6 .env3 --system-site-packages
virtualenv -p /usr/bin/python3.6 .env3/bin/activate
```
3. Install all dependencies or only the dependencies for a specific framework:
* To install dependencies for all frameworks except TensorFlow* 2.x:
* To install dependencies for all frameworks except TensorFlow* 1.x:
```shell
pip3 install -r requirements.txt
```
> **NOTE**: TensorFlow 1.x and 2.x are incompatible. Use separate virtual environments if you want to install multiple TensorFlow versions.
* To install dependencies only for Caffe:
```shell
pip3 install -r requirements_caffe.txt
Expand Down
20 changes: 10 additions & 10 deletions model-optimizer/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
tensorflow>=1.15.2,<2.0; python_version < "3.8"
tensorflow>=2.2; python_version >= "3.8"
mxnet>=1.0.0,<=1.7.0
networkx>=1.11
numpy>=1.14.0,<1.19.0
protobuf>=3.6.1
onnx>=1.1.2
defusedxml>=0.5.0
urllib3>=1.25.9
requests>=2.20.0
tensorflow~=2.4.1
mxnet~=1.2.0; sys_platform == 'win32'
mxnet~=1.7.0.post2; sys_platform != 'win32'
networkx~=2.5
numpy~=1.19.5
protobuf>=3.15.6
onnx>=1.8.1
defusedxml>=0.7.1
urllib3>=1.26.4
requests>=2.25.1
10 changes: 5 additions & 5 deletions model-optimizer/requirements_caffe.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
networkx>=1.11
numpy>=1.14.0
protobuf>=3.6.1
defusedxml>=0.5.0
requests>=2.20.0
networkx~=2.5
numpy~=1.19.5
protobuf>=3.15.6
defusedxml>=0.7.1
requests>=2.25.1
8 changes: 4 additions & 4 deletions model-optimizer/requirements_kaldi.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
networkx>=1.11
numpy>=1.14.0
defusedxml>=0.5.0
requests>=2.20.0
networkx~=2.5
numpy~=1.19.5
defusedxml>=0.7.1
requests>=2.25.1
13 changes: 7 additions & 6 deletions model-optimizer/requirements_mxnet.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
mxnet>=1.0.0,<=1.7.0
networkx>=1.11
numpy>=1.14.0
defusedxml>=0.5.0
urllib3>=1.25.9
requests>=2.20.0
mxnet~=1.2.0; sys_platform == 'win32'
mxnet~=1.7.0.post2; sys_platform != 'win32'
networkx~=2.5
numpy~=1.19.5
defusedxml>=0.7.1
urllib3>=1.26.4
requests>=2.25.1
10 changes: 5 additions & 5 deletions model-optimizer/requirements_onnx.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
onnx>=1.1.2
networkx>=1.11
numpy>=1.14.0
defusedxml>=0.5.0
requests>=2.20.0
onnx>=1.8.1
networkx~=2.5
numpy~=1.19.5
defusedxml>=0.7.1
requests>=2.25.1
12 changes: 6 additions & 6 deletions model-optimizer/requirements_tf.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
tensorflow>=1.15.2,<2.0; python_version < "3.8"
tensorflow>=2.2; python_version >= "3.8"
networkx>=1.11
numpy>=1.14.0,<1.19.0
defusedxml>=0.5.0
requests>=2.20.0
# TensorFlow 1.x and 2.x are incompatible, use separate virtual environments for each version
tensorflow~=1.15.5
networkx~=2.5
numpy~=1.18.5
defusedxml>=0.7.1
requests>=2.25.1
10 changes: 5 additions & 5 deletions model-optimizer/requirements_tf2.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tensorflow>=2.2
networkx>=1.11
numpy>=1.14.0
defusedxml>=0.5.0
requests>=2.20.0
tensorflow~=2.4.1
networkx~=2.5
numpy~=1.19.5
defusedxml>=0.7.1
requests>=2.25.1

0 comments on commit f85ac13

Please sign in to comment.