From e8eebf4cccc6e8a7f2165535413fcc45d6fbf1be Mon Sep 17 00:00:00 2001 From: Ilya Naumov Date: Fri, 14 May 2021 16:05:38 +0300 Subject: [PATCH] Align pip requirements of benchmark tool, cross check tool, IE Python API (#5199) * align pypi deps of benchmark, cross check tool, python API * move cython from python API requirements to requirements-dev * change requirements to >= for most packages * update requirements * set pinned numpy major version in wheel requirements * set more strict pip requirements-dev in wheel * change scikit-image version to 0.17 --- .../ie_bridges/python/requirements.txt | 3 +- .../python/src/requirements-dev.txt | 1 + .../wheel/meta/openvino-dev.requirements.txt | 48 +++++++++---------- .../wheel/meta/openvino.requirements.txt | 2 +- .../tools/benchmark_tool/requirements.txt | 8 ++-- .../tools/cross_check_tool/requirements.txt | 4 +- tools/benchmark/requirements.txt | 8 ++-- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/inference-engine/ie_bridges/python/requirements.txt b/inference-engine/ie_bridges/python/requirements.txt index 2789db52718..a8631bee246 100644 --- a/inference-engine/ie_bridges/python/requirements.txt +++ b/inference-engine/ie_bridges/python/requirements.txt @@ -1,2 +1 @@ -numpy>=1.16.3 -cython>=0.29.17 +numpy~=1.19.5 \ No newline at end of file diff --git a/inference-engine/ie_bridges/python/src/requirements-dev.txt b/inference-engine/ie_bridges/python/src/requirements-dev.txt index 00c455c2c62..8096521bccd 100644 --- a/inference-engine/ie_bridges/python/src/requirements-dev.txt +++ b/inference-engine/ie_bridges/python/src/requirements-dev.txt @@ -2,3 +2,4 @@ opencv-python>=3.4.4.19 pytest==4.0.1 attrs==19.1.0 pytest-html==1.19.0 +cython>=0.29.22 \ No newline at end of file diff --git a/inference-engine/ie_bridges/python/wheel/meta/openvino-dev.requirements.txt b/inference-engine/ie_bridges/python/wheel/meta/openvino-dev.requirements.txt index bc34674c2bd..bcbf66e1375 100644 --- a/inference-engine/ie_bridges/python/wheel/meta/openvino-dev.requirements.txt +++ b/inference-engine/ie_bridges/python/wheel/meta/openvino-dev.requirements.txt @@ -1,28 +1,28 @@ -defusedxml>=0.5.0 -scipy==1.5.4 -jstyleson==0.0.2 -numpy~=1.18.5 -addict==2.2.1 +defusedxml>=0.7.1 +scipy~=1.5.4 +jstyleson~=0.0.2 +numpy~=1.19.5 +addict>=2.4.0 pandas~=1.1.5 -hyperopt==0.1.2 -networkx==2.2 -tqdm==4.31.1 -texttable==1.6.3 -py-cpuinfo!=5.0,!=6.0 +hyperopt~=0.1.2 +networkx~=2.5 +tqdm>=4.54.1 +texttable~=1.6.3 +py-cpuinfo>=7.0.0 PyYAML>=5.4.1 -pillow>=8.1.0 -scikit-image>=0.17 -scikit-learn>=0.23 +pillow>=8.1.2 +scikit-image~=0.17.2 +scikit-learn>=0.24.1 yamlloader>=0.5 -shapely>=1.7 -nibabel>=3.1 -pydicom>=2.0 -sentencepiece>=0.1.91 -tokenizers>=0.8 -editdistance>=0.5 -parasail>=1.2 -fast-ctc-decode>=0.2 -rawpy>=0.15 +shapely>=1.7.1 +nibabel>=3.2.1 +pydicom>=2.1.2 +sentencepiece>=0.1.95 +tokenizers>=0.10.1 +editdistance>=0.5.3 +parasail>=1.2.4 +fast-ctc-decode>=0.2.5 +rawpy>=0.16.0 nltk>=3.5 -opencv-python>=4.4 -progress==1.5 +opencv-python==4.5.* +progress>=1.5 diff --git a/inference-engine/ie_bridges/python/wheel/meta/openvino.requirements.txt b/inference-engine/ie_bridges/python/wheel/meta/openvino.requirements.txt index bd5ec2b7680..a8631bee246 100644 --- a/inference-engine/ie_bridges/python/wheel/meta/openvino.requirements.txt +++ b/inference-engine/ie_bridges/python/wheel/meta/openvino.requirements.txt @@ -1 +1 @@ -numpy>=1.16.3 \ No newline at end of file +numpy~=1.19.5 \ No newline at end of file diff --git a/inference-engine/tools/benchmark_tool/requirements.txt b/inference-engine/tools/benchmark_tool/requirements.txt index 7042cb2a066..cec7a6be627 100644 --- a/inference-engine/tools/benchmark_tool/requirements.txt +++ b/inference-engine/tools/benchmark_tool/requirements.txt @@ -1,4 +1,4 @@ -py-cpuinfo -numpy -progress -opencv-python \ No newline at end of file +py-cpuinfo>=7.0.0 +numpy~=1.19.5 +progress>=1.5 +opencv-python==4.5.* \ No newline at end of file diff --git a/inference-engine/tools/cross_check_tool/requirements.txt b/inference-engine/tools/cross_check_tool/requirements.txt index fc4586c8b30..cc5fcac23d3 100644 --- a/inference-engine/tools/cross_check_tool/requirements.txt +++ b/inference-engine/tools/cross_check_tool/requirements.txt @@ -1,2 +1,2 @@ -numpy -opencv-python \ No newline at end of file +numpy~=1.19.5 +opencv-python==4.5.* \ No newline at end of file diff --git a/tools/benchmark/requirements.txt b/tools/benchmark/requirements.txt index 7042cb2a066..cec7a6be627 100644 --- a/tools/benchmark/requirements.txt +++ b/tools/benchmark/requirements.txt @@ -1,4 +1,4 @@ -py-cpuinfo -numpy -progress -opencv-python \ No newline at end of file +py-cpuinfo>=7.0.0 +numpy~=1.19.5 +progress>=1.5 +opencv-python==4.5.* \ No newline at end of file