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 <quic_mprajapa@quicinc.com>
quic · Jul 10, 2023 · d9b0775 · d9b0775
1 parent 4577215
commit d9b0775
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-../reqs_pip_tf_common_legacy.txt
+../reqs_pip_tf_common.txt
diff --git 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
+tensorflow-cpu==2.10.1
diff --git a/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt b/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt
diff --git a/packaging/dependencies/tf-torch-cpu/reqs_pip_torch_common.txt 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
diff --git 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
@@ -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