From 4f62eeb4be0c93bedfa435a5b207aab66c0dc9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Wed, 23 Nov 2022 00:02:46 +0100 Subject: [PATCH] Docker: Upgrade HIP tests to Ubuntu 22.04 --- tools/docker/Dockerfile.build_hip_rocm_Mi100 | 2 +- tools/docker/Dockerfile.build_hip_rocm_Mi50 | 2 +- tools/docker/Dockerfile.test_hip_cuda_A100 | 2 +- tools/docker/Dockerfile.test_hip_cuda_P100 | 2 +- tools/docker/Dockerfile.test_hip_cuda_V100 | 2 +- tools/docker/Dockerfile.test_hip_rocm_Mi100 | 2 +- tools/docker/Dockerfile.test_hip_rocm_Mi50 | 2 +- tools/docker/generate_dockerfiles.py | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/docker/Dockerfile.build_hip_rocm_Mi100 b/tools/docker/Dockerfile.build_hip_rocm_Mi100 index e6d5325c2f..891a72f4b9 100644 --- a/tools/docker/Dockerfile.build_hip_rocm_Mi100 +++ b/tools/docker/Dockerfile.build_hip_rocm_Mi100 @@ -3,7 +3,7 @@ # Usage: docker build -f ./Dockerfile.build_hip_rocm_Mi100 ../../ # -FROM rocm/dev-ubuntu-20.04:4.5.2-complete +FROM rocm/dev-ubuntu-22.04:5.3.2-complete # Install some Ubuntu packages. RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ diff --git a/tools/docker/Dockerfile.build_hip_rocm_Mi50 b/tools/docker/Dockerfile.build_hip_rocm_Mi50 index f519e92648..6224e91c3f 100644 --- a/tools/docker/Dockerfile.build_hip_rocm_Mi50 +++ b/tools/docker/Dockerfile.build_hip_rocm_Mi50 @@ -3,7 +3,7 @@ # Usage: docker build -f ./Dockerfile.build_hip_rocm_Mi50 ../../ # -FROM rocm/dev-ubuntu-20.04:4.5.2-complete +FROM rocm/dev-ubuntu-22.04:5.3.2-complete # Install some Ubuntu packages. RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ diff --git a/tools/docker/Dockerfile.test_hip_cuda_A100 b/tools/docker/Dockerfile.test_hip_cuda_A100 index e04397173f..a65f5e8d36 100644 --- a/tools/docker/Dockerfile.test_hip_cuda_A100 +++ b/tools/docker/Dockerfile.test_hip_cuda_A100 @@ -3,7 +3,7 @@ # Usage: docker build -f ./Dockerfile.test_hip_cuda_A100 ../../ # -FROM nvidia/cuda:11.3.1-devel-ubuntu20.04 +FROM nvidia/cuda:11.8.0-devel-ubuntu22.04 # Setup CUDA environment. ENV CUDA_PATH /usr/local/cuda diff --git a/tools/docker/Dockerfile.test_hip_cuda_P100 b/tools/docker/Dockerfile.test_hip_cuda_P100 index efe4c40bbf..2f7ec46c79 100644 --- a/tools/docker/Dockerfile.test_hip_cuda_P100 +++ b/tools/docker/Dockerfile.test_hip_cuda_P100 @@ -3,7 +3,7 @@ # Usage: docker build -f ./Dockerfile.test_hip_cuda_P100 ../../ # -FROM nvidia/cuda:11.3.1-devel-ubuntu20.04 +FROM nvidia/cuda:11.8.0-devel-ubuntu22.04 # Setup CUDA environment. ENV CUDA_PATH /usr/local/cuda diff --git a/tools/docker/Dockerfile.test_hip_cuda_V100 b/tools/docker/Dockerfile.test_hip_cuda_V100 index f37143e05b..5e167dee7a 100644 --- a/tools/docker/Dockerfile.test_hip_cuda_V100 +++ b/tools/docker/Dockerfile.test_hip_cuda_V100 @@ -3,7 +3,7 @@ # Usage: docker build -f ./Dockerfile.test_hip_cuda_V100 ../../ # -FROM nvidia/cuda:11.3.1-devel-ubuntu20.04 +FROM nvidia/cuda:11.8.0-devel-ubuntu22.04 # Setup CUDA environment. ENV CUDA_PATH /usr/local/cuda diff --git a/tools/docker/Dockerfile.test_hip_rocm_Mi100 b/tools/docker/Dockerfile.test_hip_rocm_Mi100 index 4f4bbf4578..cfb38b64ff 100644 --- a/tools/docker/Dockerfile.test_hip_rocm_Mi100 +++ b/tools/docker/Dockerfile.test_hip_rocm_Mi100 @@ -3,7 +3,7 @@ # Usage: docker build -f ./Dockerfile.test_hip_rocm_Mi100 ../../ # -FROM rocm/dev-ubuntu-20.04:4.5.2-complete +FROM rocm/dev-ubuntu-22.04:5.3.2-complete # Install some Ubuntu packages. RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ diff --git a/tools/docker/Dockerfile.test_hip_rocm_Mi50 b/tools/docker/Dockerfile.test_hip_rocm_Mi50 index 7ea6e447a2..4b00c5b4a0 100644 --- a/tools/docker/Dockerfile.test_hip_rocm_Mi50 +++ b/tools/docker/Dockerfile.test_hip_rocm_Mi50 @@ -3,7 +3,7 @@ # Usage: docker build -f ./Dockerfile.test_hip_rocm_Mi50 ../../ # -FROM rocm/dev-ubuntu-20.04:4.5.2-complete +FROM rocm/dev-ubuntu-22.04:5.3.2-complete # Install some Ubuntu packages. RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index 27e3557b30..efc2b28ba6 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -559,7 +559,7 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ # ====================================================================================== def toolchain_hip_cuda(gpu_ver: str) -> str: return rf""" -FROM nvidia/cuda:11.3.1-devel-ubuntu20.04 +FROM nvidia/cuda:11.8.0-devel-ubuntu22.04 # Setup CUDA environment. ENV CUDA_PATH /usr/local/cuda @@ -662,7 +662,7 @@ RUN hipconfig # ====================================================================================== def toolchain_hip_rocm(gpu_ver: str) -> str: return rf""" -FROM rocm/dev-ubuntu-20.04:4.5.2-complete +FROM rocm/dev-ubuntu-22.04:5.3.2-complete # Install some Ubuntu packages. RUN apt-get update -qq && apt-get install -qq --no-install-recommends \