From c3afcb607eef8a0028dc6b3d64738c5fc7d076fe Mon Sep 17 00:00:00 2001 From: Ella Charlaix Date: Fri, 22 Nov 2024 14:56:50 +0100 Subject: [PATCH 1/5] update dockerfiles --- .../onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 | 2 +- examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 | 2 +- tests/exporters/Dockerfile_exporters_gpu | 2 +- tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu | 2 +- tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 b/examples/onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 index 3e6841453b..3de49ca14e 100644 --- a/examples/onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 +++ b/examples/onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 @@ -15,7 +15,7 @@ # limitations under the License. # Use nvidia/cuda image -FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 +FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 CMD nvidia-smi # Ignore interactive questions during `docker build` diff --git a/examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 b/examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 index ee58b71114..9a91bea833 100644 --- a/examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 +++ b/examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 @@ -15,7 +15,7 @@ # limitations under the License. # Use nvidia/cuda image -FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 +FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 CMD nvidia-smi # Ignore interactive questions during `docker build` diff --git a/tests/exporters/Dockerfile_exporters_gpu b/tests/exporters/Dockerfile_exporters_gpu index 1f2bd35066..05da541ca7 100644 --- a/tests/exporters/Dockerfile_exporters_gpu +++ b/tests/exporters/Dockerfile_exporters_gpu @@ -1,6 +1,6 @@ # use version with cudnn 8.5 to match torch==1.13.1 that uses 8.5.0.96 # has Python 3.8.10 -FROM nvcr.io/nvidia/tensorrt:22.08-py3 +FROM nvcr.io/nvidia/tensorrt:23.05-py3 CMD nvidia-smi # Ignore interactive questions during `docker build` diff --git a/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu b/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu index 9013697e04..a175737ce7 100644 --- a/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu +++ b/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu @@ -1,5 +1,5 @@ # use version with CUDA 11.8 and TensorRT 8.5.1.7 to match ORT 1.14 requirements -FROM nvcr.io/nvidia/tensorrt:22.12-py3 +FROM nvcr.io/nvidia/tensorrt:23.05-py3 CMD nvidia-smi # Ignore interactive questions during `docker build` diff --git a/tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer b/tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer index 74add3f07e..b1ffa4045e 100644 --- a/tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer +++ b/tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer @@ -15,7 +15,7 @@ # limitations under the License. # Use nvidia/cuda image -FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 +FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 CMD nvidia-smi # Ignore interactive questions during `docker build` From 96987bfe1252cc52e132486a0a5f87fc4484b69e Mon Sep 17 00:00:00 2001 From: Ella Charlaix Date: Fri, 22 Nov 2024 15:24:01 +0100 Subject: [PATCH 2/5] upgrade docker base image with cuDNN 9 --- tests/exporters/Dockerfile_exporters_gpu | 2 +- tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/exporters/Dockerfile_exporters_gpu b/tests/exporters/Dockerfile_exporters_gpu index 05da541ca7..6b403797fd 100644 --- a/tests/exporters/Dockerfile_exporters_gpu +++ b/tests/exporters/Dockerfile_exporters_gpu @@ -1,6 +1,6 @@ # use version with cudnn 8.5 to match torch==1.13.1 that uses 8.5.0.96 # has Python 3.8.10 -FROM nvcr.io/nvidia/tensorrt:23.05-py3 +FROM nvcr.io/nvidia/tensorrt:24.01-py3 CMD nvidia-smi # Ignore interactive questions during `docker build` diff --git a/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu b/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu index a175737ce7..df33a3b4e6 100644 --- a/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu +++ b/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu @@ -1,5 +1,5 @@ # use version with CUDA 11.8 and TensorRT 8.5.1.7 to match ORT 1.14 requirements -FROM nvcr.io/nvidia/tensorrt:23.05-py3 +FROM nvcr.io/nvidia/tensorrt:24.01-py3 CMD nvidia-smi # Ignore interactive questions during `docker build` From 292a28dbdabc9b223cb6423fbe0efcf232ba8f5b Mon Sep 17 00:00:00 2001 From: Ella Charlaix Date: Mon, 6 Jan 2025 18:41:48 +0100 Subject: [PATCH 3/5] upgrade --- tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu b/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu index df33a3b4e6..696d863f34 100644 --- a/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu +++ b/tests/onnxruntime/docker/Dockerfile_onnxruntime_gpu @@ -1,5 +1,5 @@ # use version with CUDA 11.8 and TensorRT 8.5.1.7 to match ORT 1.14 requirements -FROM nvcr.io/nvidia/tensorrt:24.01-py3 +FROM nvcr.io/nvidia/tensorrt:24.02-py3 CMD nvidia-smi # Ignore interactive questions during `docker build` From 4557e290879f316868158d7544bde81a5cb6c3df Mon Sep 17 00:00:00 2001 From: Ella Charlaix Date: Mon, 6 Jan 2025 19:16:00 +0100 Subject: [PATCH 4/5] update --- tests/exporters/Dockerfile_exporters_gpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/exporters/Dockerfile_exporters_gpu b/tests/exporters/Dockerfile_exporters_gpu index 6b403797fd..9e9bce2a8b 100644 --- a/tests/exporters/Dockerfile_exporters_gpu +++ b/tests/exporters/Dockerfile_exporters_gpu @@ -1,6 +1,6 @@ # use version with cudnn 8.5 to match torch==1.13.1 that uses 8.5.0.96 # has Python 3.8.10 -FROM nvcr.io/nvidia/tensorrt:24.01-py3 +FROM nvcr.io/nvidia/tensorrt:24.02-py3 CMD nvidia-smi # Ignore interactive questions during `docker build` From 67492d9fddf21746ffd3ee535a690371b1b5aeeb Mon Sep 17 00:00:00 2001 From: Ella Charlaix Date: Tue, 7 Jan 2025 15:03:43 +0100 Subject: [PATCH 5/5] revert --- .../onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 | 4 ++-- .../onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 | 4 ++-- tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 b/examples/onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 index 3de49ca14e..386477503c 100644 --- a/examples/onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 +++ b/examples/onnxruntime/training/docker/Dockerfile-ort-nightly-cu118 @@ -15,7 +15,7 @@ # limitations under the License. # Use nvidia/cuda image -FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 +FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 CMD nvidia-smi # Ignore interactive questions during `docker build` @@ -74,4 +74,4 @@ RUN $PYTHON_EXE -m torch_ort.configure WORKDIR . -CMD ["/bin/bash"] \ No newline at end of file +CMD ["/bin/bash"] diff --git a/examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 b/examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 index 9a91bea833..8cb79a73cf 100644 --- a/examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 +++ b/examples/onnxruntime/training/docker/Dockerfile-ort1.17.1-cu118 @@ -15,7 +15,7 @@ # limitations under the License. # Use nvidia/cuda image -FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 +FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 CMD nvidia-smi # Ignore interactive questions during `docker build` @@ -76,4 +76,4 @@ RUN pip uninstall nvidia-nccl-cu12 -y WORKDIR . -CMD ["/bin/bash"] \ No newline at end of file +CMD ["/bin/bash"] diff --git a/tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer b/tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer index b1ffa4045e..82fece1cf5 100644 --- a/tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer +++ b/tests/onnxruntime/docker/Dockerfile_onnxruntime_trainer @@ -15,7 +15,7 @@ # limitations under the License. # Use nvidia/cuda image -FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04 +FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04 CMD nvidia-smi # Ignore interactive questions during `docker build` @@ -80,4 +80,4 @@ RUN pip install /workspace/optimum[tests] ENV TEST_LEVEL=1 CMD RUN_SLOW=1 pytest -v -rs onnxruntime/training/nightly_test_trainer.py --durations=0 -CMD RUN_SLOW=1 pytest -v -rs onnxruntime/training/nightly_test_examples.py --durations=0 \ No newline at end of file +CMD RUN_SLOW=1 pytest -v -rs onnxruntime/training/nightly_test_examples.py --durations=0