diff --git a/Makefile b/Makefile index 088233e79a1..4d9b8419a37 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ install-pre-commit: # ONNX backend install-onnx-test: pip install -U pip - pip install -e .[onnx] + pip install -e . pip install "git+https://github.com/openvinotoolkit/open_model_zoo.git@37f60eb#egg=omz-tools&subdirectory=tools/model_tools" pip install "git+https://github.com/openvinotoolkit/open_model_zoo.git@37f60eb#egg=accuracy_checker&subdirectory=tools/accuracy_checker" pip install -r tests/onnx/requirements.txt @@ -59,10 +59,10 @@ test-examples-onnx: # OpenVino backend install-openvino-test: pip install -U pip - pip install -e .[openvino] + pip install -e . pip install "git+https://github.com/openvinotoolkit/open_model_zoo.git@37f60eb#egg=omz-tools&subdirectory=tools/model_tools" pip install "git+https://github.com/openvinotoolkit/open_model_zoo.git@37f60eb#egg=accuracy_checker&subdirectory=tools/accuracy_checker" - pip install tensorflow==2.12.0 + pip install tensorflow==2.12.0 # Install tensorflow before to avoid conflict on install for typing-extensions pip install -r tests/openvino/requirements.txt pip install -r tests/cross_fw/install/requirements.txt pip install -r tests/cross_fw/examples/requirements.txt @@ -90,7 +90,7 @@ test-examples-openvino: # TensorFlow backend install-tensorflow-test: pip install -U pip - pip install -e .[tf] + pip install -e . pip install "git+https://github.com/openvinotoolkit/open_model_zoo.git@37f60eb#egg=omz-tools&subdirectory=tools/model_tools" pip install "git+https://github.com/openvinotoolkit/open_model_zoo.git@37f60eb#egg=accuracy_checker&subdirectory=tools/accuracy_checker" pip install -r tests/tensorflow/requirements.txt @@ -121,13 +121,12 @@ test-examples-tensorflow: # PyTorch backend install-torch-test: pip install -U pip - pip install -e .[torch] + pip install -e . pip install "git+https://github.com/openvinotoolkit/open_model_zoo.git@37f60eb#egg=omz-tools&subdirectory=tools/model_tools" pip install "git+https://github.com/openvinotoolkit/open_model_zoo.git@37f60eb#egg=accuracy_checker&subdirectory=tools/accuracy_checker" pip install -r tests/torch/requirements.txt pip install -r tests/cross_fw/install/requirements.txt pip install -r tests/cross_fw/examples/requirements.txt - pip install -r examples/torch/requirements.txt install-torch-dev: install-torch-test install-pre-commit pip install -r examples/post_training_quantization/torch/mobilenet_v2/requirements.txt diff --git a/constraints.txt b/constraints.txt new file mode 100644 index 00000000000..f50316e9812 --- /dev/null +++ b/constraints.txt @@ -0,0 +1,22 @@ +# Openvino +openvino==2024.1.0 +openvino-dev==2024.1.0 + +# Pytorch +torch==2.2.1 +torchvision==0.17.1 + +# ONNX +onnx==1.16.0 +onnxruntime==1.17.1 + +# TensorFlow +tensorflow==2.12.1 + +# Tests and examples +pytest==8.0.2 +pytest-cov==4.1.0 +pytest-mock==3.12.0 +pytest-dependency==0.6.0 +pytest-ordering==0.6 +pytest-xdist==3.5.0 diff --git a/examples/tensorflow/requirements.txt b/examples/tensorflow/requirements.txt index 75cb4b8de74..48ec31000d4 100644 --- a/examples/tensorflow/requirements.txt +++ b/examples/tensorflow/requirements.txt @@ -1,5 +1,7 @@ +-c ../../constraints.txt addict absl-py==1.0.0 +tensorflow tensorflow_datasets==4.2.0 tensorflow_hub tensorflow_addons~=0.20.0 diff --git a/examples/torch/requirements.txt b/examples/torch/requirements.txt index 06c7b3d3ea2..56592d0403f 100644 --- a/examples/torch/requirements.txt +++ b/examples/torch/requirements.txt @@ -1,10 +1,10 @@ +-c ../../constraints.txt +torch +torchvision addict>=2.4.0 pillow>=8.0.1 tensorboard>=2.1 matplotlib>=3.3.3 defusedxml>=0.7.0rc1 -tabulate~=0.9.0 opencv-python>=4.4.0.46 -torch==2.2.1 -torchvision==0.17.1 efficientnet_pytorch==0.7.1 diff --git a/tests/common/requirements.txt b/tests/common/requirements.txt index 58380296b1a..996ccdfee6e 100644 --- a/tests/common/requirements.txt +++ b/tests/common/requirements.txt @@ -1,3 +1,4 @@ -pytest==8.0.2 +-c ../../constraints.txt +pytest pytest-cov -pytest-mock>=3.3.1 +pytest-mock diff --git a/tests/cross_fw/examples/requirements.txt b/tests/cross_fw/examples/requirements.txt index c674604060a..e3c764052fb 100644 --- a/tests/cross_fw/examples/requirements.txt +++ b/tests/cross_fw/examples/requirements.txt @@ -1,2 +1,3 @@ -pytest==8.0.2 +-c ../../../constraints.txt +pytest pytest-cov diff --git a/tests/cross_fw/install/requirements.txt b/tests/cross_fw/install/requirements.txt index 926477a7039..c4ef46f8167 100644 --- a/tests/cross_fw/install/requirements.txt +++ b/tests/cross_fw/install/requirements.txt @@ -1,3 +1,4 @@ -pytest==8.0.2 +-c ../../../constraints.txt +pytest pytest-cov virtualenv diff --git a/tests/cross_fw/sdl/fuzz/requirements.txt b/tests/cross_fw/sdl/fuzz/requirements.txt index 4955015d8de..5eb2d1572c7 100644 --- a/tests/cross_fw/sdl/fuzz/requirements.txt +++ b/tests/cross_fw/sdl/fuzz/requirements.txt @@ -1,2 +1,6 @@ +-c ../../../../constraints.txt atheris -torchvision==0.17.1 +pytest +torch +torchvision +openvino diff --git a/tests/onnx/benchmarking/requirements.txt b/tests/onnx/benchmarking/requirements.txt index 31103fb8dc2..3448f6db959 100644 --- a/tests/onnx/benchmarking/requirements.txt +++ b/tests/onnx/benchmarking/requirements.txt @@ -1,2 +1,3 @@ +-c ../../../constraints.txt pycocotools -openvino-dev==2024.1 +openvino-dev diff --git a/tests/onnx/requirements.txt b/tests/onnx/requirements.txt index 4da4657f2a5..dd0748f4a6a 100644 --- a/tests/onnx/requirements.txt +++ b/tests/onnx/requirements.txt @@ -1,10 +1,14 @@ -pytest-mock>=3.3.1 +-c ../../constraints.txt +onnx +onnxruntime +openvino-dev pytest-cov -pytest-dependency>=0.5.1 -pytest-ordering>=0.6 -torch==2.2.1 -torchvision==0.17.1 +pytest-dependency +pytest-mock +pytest-ordering +torch +torchvision + +fastdownload==0.0.7 +scikit-learn==1.2.2 yattag>=1.14.0 -openvino-dev==2024.1 -fastdownload -scikit-learn diff --git a/tests/openvino/requirements.txt b/tests/openvino/requirements.txt index d3bb9d4c031..8d0cd450598 100644 --- a/tests/openvino/requirements.txt +++ b/tests/openvino/requirements.txt @@ -1,8 +1,11 @@ -pytest==8.0.2 -pytest-xdist==3.5.0 -virtualenv +-c ../../constraints.txt +fastdownload==0.0.7 +onnx +openvino-dev +pytest pytest-cov -pytest-mock>=3.3.1 -openvino-dev[onnx,pytorch,tensorflow2]==2024.1 -torch==2.2.1 -fastdownload +pytest-mock +pytest-xdist +torch +torchvision +virtualenv diff --git a/tests/post_training/requirements.txt b/tests/post_training/requirements.txt index a0241bb3f09..c5060f8b683 100644 --- a/tests/post_training/requirements.txt +++ b/tests/post_training/requirements.txt @@ -1,21 +1,19 @@ ---extra-index-url https://download.pytorch.org/whl/cpu -torch==2.2.1 ---extra-index-url https://download.pytorch.org/whl/cpu -torchvision==0.17.1 -transformers==4.38.2 -onnx==1.16.0 -onnxruntime==1.17.1 -pytest==8.0.2 -pytest-cov -openvino-dev==2024.1 -optimum[onnxruntime,openvino]==1.17.1 -optimum-intel==1.15.2 -whowhatbench @ git+https://github.com/andreyanufr/who_what_benchmark@456d3584ce628f6c8605f37cd9a3ab2db1ebf933 -soundfile==0.12.1 +-c ../../constraints.txt +torch +torchvision +onnx +onnxruntime +openvino-dev +pytest + librosa==0.10.0 memory-profiler==0.61.0 -pandas==2.0.3 +optimum-intel==1.15.2 +optimum==1.17.1 +scikit-learn==1.2.2 +soundfile==0.12.1 tensorboard==2.13.0 tensorflow-io==0.32.0 timm==0.9.2 -scikit-learn==1.2.2 +transformers==4.38.2 +whowhatbench @ git+https://github.com/andreyanufr/who_what_benchmark@456d3584ce628f6c8605f37cd9a3ab2db1ebf933 diff --git a/tests/torch/models_hub_test/requirements.txt b/tests/torch/models_hub_test/requirements.txt index 4f1c41ddac4..8755b2a9655 100644 --- a/tests/torch/models_hub_test/requirements.txt +++ b/tests/torch/models_hub_test/requirements.txt @@ -1,11 +1,12 @@ +-c ../../constraints.txt --extra-index-url https://download.pytorch.org/whl/cpu -torch==2.2.1 +torch --extra-index-url https://download.pytorch.org/whl/cpu -torchvision==0.17.1 -transformers==4.38.2 -pytest==8.0.2 -timm==0.9.2 -scikit-learn==1.2.2 +torchvision +pytest av==11.0.0 -sentencepiece==0.1.99 protobuf==3.20.3 +scikit-learn==1.2.2 +sentencepiece==0.1.99 +timm==0.9.2 +transformers==4.38.2 diff --git a/tests/torch/requirements.txt b/tests/torch/requirements.txt index 3503a7289b8..4985c8b9d66 100644 --- a/tests/torch/requirements.txt +++ b/tests/torch/requirements.txt @@ -1,19 +1,21 @@ -yattag>=1.14.0 -prettytable>=2.0.0 -onnx==1.16.0 -onnxruntime==1.17.1 -pytest-mock>=3.3.1 +-c ../../constraints.txt +-r ../../examples/torch/requirements.txt +onnx +onnxruntime +pytest pytest-cov -pytest-dependency>=0.5.1 +pytest-dependency +pytest-mock +pytest-xdist +torch virtualenv # Required for search_building_blocks tests -transformers[torch]~=4.38.2 accelerate==0.28.0 +transformers==4.38.2 # Required for movement_sparsity tests -datasets~=2.14.0 +datasets==2.14.7 evaluate==0.3.0 +openvino-dev timm==0.9.2 -openvino-dev==2024.1 -pytest-xdist==3.5.0