From d9b07759fc9b56e966c7bce02952181a23b480ea Mon Sep 17 00:00:00 2001 From: Mohit Prajapati Date: Tue, 11 Jul 2023 05:27:34 +0530 Subject: [PATCH] Upgraded ONNX version to 1.11.0 (#2315) * upgrade onnx version to 1.11.0 * tf-cpu version is upgraded to 2.10.1 for tf-torch-cpu variant * downgrade protobuf for tf-torch-cpu variant. Signed-off-by: Mohit Prajapati --- Jenkins/Dockerfile.tf-torch-cpu | 16 ++++++++-------- Jenkins/Dockerfile.torch-cpu | 4 ++-- Jenkins/Dockerfile.torch-cpu-pt113 | 4 ++-- Jenkins/Dockerfile.torch-gpu | 4 ++-- Jenkins/Dockerfile.torch-gpu-pt113 | 4 ++-- packaging/dependencies/reqs_pip_tf_common.txt | 2 +- packaging/dependencies/reqs_pip_torch_common.txt | 4 ++-- .../tf-torch-cpu/reqs_pip_tf_common.txt | 2 +- .../tf-torch-cpu/reqs_pip_tf_cpu.txt | 2 +- .../tf-torch-cpu/reqs_pip_torch_common.txt | 12 +++++++++++- .../torch-cpu-pt113/reqs_pip_torch_common.txt | 4 ++-- .../torch-gpu-pt113/reqs_pip_torch_common.txt | 4 ++-- 12 files changed, 36 insertions(+), 26 deletions(-) mode change 120000 => 100644 packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt diff --git a/Jenkins/Dockerfile.tf-torch-cpu b/Jenkins/Dockerfile.tf-torch-cpu index 852ade80d2..9d354e61db 100644 --- a/Jenkins/Dockerfile.tf-torch-cpu +++ b/Jenkins/Dockerfile.tf-torch-cpu @@ -140,21 +140,21 @@ RUN python3 -m pip --no-cache-dir install \ ipython \ Jinja2==3.0.3 \ jupyter \ - keras==2.2.4 \ + keras==2.10.0 \ lmdb==1.2.1 \ matplotlib>=3 \ mock \ nbsphinx==0.8.12 \ - numpy==1.19.5 \ - onnx==1.10.0 \ + numpy==1.21.0 \ + onnx==1.11.0 \ onnxsim \ - onnxruntime==1.10.0 \ + onnxruntime==1.11.0 \ onnxruntime-extensions \ opencv-python \ Pillow==9.3.0 \ pluggy==0.12.0 \ progressbar2 \ - protobuf==3.20.1 \ + protobuf==3.19.2 \ psutil \ ptflops \ pybind11 \ @@ -172,9 +172,9 @@ RUN python3 -m pip --no-cache-dir install \ sphinx-jinja==1.1.1 \ sphinx-autodoc-typehints==1.6.0 \ sphinx-rtd-theme \ - tensorboard==2.4.0 \ - tensorboardX==2.4 \ - tensorflow-cpu==2.4.3 \ + tensorboard==2.10.1 \ + tensorboardX==2.6 \ + tensorflow-cpu==2.10.1 \ tensorflow-hub \ tensorflow-model-optimization \ tensorlayer==2.2.1 \ diff --git a/Jenkins/Dockerfile.torch-cpu b/Jenkins/Dockerfile.torch-cpu index fd74351ea9..00960e0d4b 100644 --- a/Jenkins/Dockerfile.torch-cpu +++ b/Jenkins/Dockerfile.torch-cpu @@ -146,9 +146,9 @@ RUN python3 -m pip --no-cache-dir install \ mock \ nbsphinx==0.8.12 \ 'numpy<1.24,>=1.16.6' \ - onnx==1.10.0 \ + onnx==1.11.0 \ onnxsim \ - onnxruntime==1.10.0 \ + onnxruntime==1.11.0 \ onnxruntime-extensions \ opencv-python \ Pillow==9.3.0 \ diff --git a/Jenkins/Dockerfile.torch-cpu-pt113 b/Jenkins/Dockerfile.torch-cpu-pt113 index 482582357e..e3fb1a7294 100644 --- a/Jenkins/Dockerfile.torch-cpu-pt113 +++ b/Jenkins/Dockerfile.torch-cpu-pt113 @@ -143,9 +143,9 @@ RUN python3 -m pip --no-cache-dir install \ mock \ nbsphinx==0.8.12 \ 'numpy<1.24,>=1.20.5' \ - onnx==1.10.0 \ + onnx==1.11.0 \ onnxsim \ - onnxruntime==1.10.0 \ + onnxruntime==1.11.0 \ onnxruntime-extensions \ opencv-python \ Pillow==9.3.0 \ diff --git a/Jenkins/Dockerfile.torch-gpu b/Jenkins/Dockerfile.torch-gpu index 6732cee531..41d3b1a8da 100644 --- a/Jenkins/Dockerfile.torch-gpu +++ b/Jenkins/Dockerfile.torch-gpu @@ -161,9 +161,9 @@ RUN python3 -m pip --no-cache-dir install \ mock \ nbsphinx==0.8.12 \ 'numpy<1.24,>=1.16.6' \ - onnx==1.10.0 \ + onnx==1.11.0 \ onnxsim \ - onnxruntime==1.10.0 \ + onnxruntime==1.11.0 \ onnxruntime-extensions \ opencv-python \ Pillow==9.3.0 \ diff --git a/Jenkins/Dockerfile.torch-gpu-pt113 b/Jenkins/Dockerfile.torch-gpu-pt113 index 1194fdcc05..2941e71740 100644 --- a/Jenkins/Dockerfile.torch-gpu-pt113 +++ b/Jenkins/Dockerfile.torch-gpu-pt113 @@ -157,9 +157,9 @@ RUN python3 -m pip --no-cache-dir install \ mock \ nbsphinx==0.8.12 \ 'numpy<1.24,>=1.20.5' \ - onnx==1.10.0 \ + onnx==1.11.0 \ onnxsim \ - onnxruntime==1.10.0 \ + onnxruntime==1.11.0 \ onnxruntime-extensions \ opencv-python \ Pillow==9.3.0 \ diff --git a/packaging/dependencies/reqs_pip_tf_common.txt b/packaging/dependencies/reqs_pip_tf_common.txt index e37e4a3f2e..87922664d5 100644 --- a/packaging/dependencies/reqs_pip_tf_common.txt +++ b/packaging/dependencies/reqs_pip_tf_common.txt @@ -1,6 +1,6 @@ bert-tensorflow holoviews==1.12.7 -numpy==1.20.0 +numpy==1.21.0 protobuf==3.19.2 scikit-learn==1.1.3 tensorflow-hub diff --git a/packaging/dependencies/reqs_pip_torch_common.txt b/packaging/dependencies/reqs_pip_torch_common.txt index 8abb788c60..bc12289c60 100644 --- a/packaging/dependencies/reqs_pip_torch_common.txt +++ b/packaging/dependencies/reqs_pip_torch_common.txt @@ -1,8 +1,8 @@ holoviews==1.12.7 matplotlib>=3 numpy<1.24,>=1.16.6 -onnx==1.10.0 -onnxruntime==1.10.0 +onnx==1.11.0 +onnxruntime==1.11.0 onnxruntime-extensions onnxsim protobuf==3.20.1 diff --git a/packaging/dependencies/tf-torch-cpu/reqs_pip_tf_common.txt b/packaging/dependencies/tf-torch-cpu/reqs_pip_tf_common.txt index 6a258f5fe7..6d1b1bcbfd 120000 --- a/packaging/dependencies/tf-torch-cpu/reqs_pip_tf_common.txt +++ b/packaging/dependencies/tf-torch-cpu/reqs_pip_tf_common.txt @@ -1 +1 @@ -../reqs_pip_tf_common_legacy.txt \ No newline at end of file +../reqs_pip_tf_common.txt \ No newline at end of file diff --git a/packaging/dependencies/tf-torch-cpu/reqs_pip_tf_cpu.txt b/packaging/dependencies/tf-torch-cpu/reqs_pip_tf_cpu.txt index 3fc11c8aac..f0d43c857f 100644 --- a/packaging/dependencies/tf-torch-cpu/reqs_pip_tf_cpu.txt +++ b/packaging/dependencies/tf-torch-cpu/reqs_pip_tf_cpu.txt @@ -1 +1 @@ -tensorflow-cpu==2.4.3 \ No newline at end of file +tensorflow-cpu==2.10.1 \ No newline at end of file diff --git a/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt b/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt deleted file mode 120000 index ce384075e7..0000000000 --- a/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt +++ /dev/null @@ -1 +0,0 @@ -../reqs_pip_torch_common.txt \ No newline at end of file diff --git a/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt b/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt new file mode 100644 index 0000000000..08eaa9e74d --- /dev/null +++ b/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt @@ -0,0 +1,11 @@ +holoviews==1.12.7 +matplotlib>=3 +numpy<1.24,>=1.16.6 +onnx==1.11.0 +onnxruntime==1.11.0 +onnxruntime-extensions +onnxsim +protobuf==3.19.2 +psutil +scikit-learn==1.1.3 +tensorboardX==2.4 \ No newline at end of file diff --git a/packaging/dependencies/torch-cpu-pt113/reqs_pip_torch_common.txt b/packaging/dependencies/torch-cpu-pt113/reqs_pip_torch_common.txt index 19d3509700..802bd2cc1a 100644 --- a/packaging/dependencies/torch-cpu-pt113/reqs_pip_torch_common.txt +++ b/packaging/dependencies/torch-cpu-pt113/reqs_pip_torch_common.txt @@ -1,8 +1,8 @@ holoviews==1.12.7 matplotlib>=3 numpy<1.24,>=1.16.6 -onnx==1.10.0 -onnxruntime==1.10.0 +onnx==1.11.0 +onnxruntime==1.11.0 onnxruntime-extensions onnxsim scikit-learn==1.1.3 diff --git a/packaging/dependencies/torch-gpu-pt113/reqs_pip_torch_common.txt b/packaging/dependencies/torch-gpu-pt113/reqs_pip_torch_common.txt index 19d3509700..802bd2cc1a 100644 --- a/packaging/dependencies/torch-gpu-pt113/reqs_pip_torch_common.txt +++ b/packaging/dependencies/torch-gpu-pt113/reqs_pip_torch_common.txt @@ -1,8 +1,8 @@ holoviews==1.12.7 matplotlib>=3 numpy<1.24,>=1.16.6 -onnx==1.10.0 -onnxruntime==1.10.0 +onnx==1.11.0 +onnxruntime==1.11.0 onnxruntime-extensions onnxsim scikit-learn==1.1.3