From 75de5e5646e503f6ba7b98cd995a0de163c39b11 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Thu, 28 Nov 2024 09:27:28 +0100 Subject: [PATCH] Updated everything to CUDA 12.6 and oneAPI 2025.0. --- alma9_cuda_oneapi/Dockerfile | 6 +++--- alma9_rocm_oneapi/Dockerfile | 2 +- ubuntu2204_cuda/Dockerfile | 4 ++-- ubuntu2204_cuda_oneapi/Dockerfile | 8 ++++---- ubuntu2404_cuda_oneapi/Dockerfile | 8 ++++---- ubuntu2404_oneapi/Dockerfile | 6 +++--- ubuntu2404_rocm_oneapi/Dockerfile | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/alma9_cuda_oneapi/Dockerfile b/alma9_cuda_oneapi/Dockerfile index 3629cd4..3c7dbe8 100644 --- a/alma9_cuda_oneapi/Dockerfile +++ b/alma9_cuda_oneapi/Dockerfile @@ -20,7 +20,7 @@ RUN dnf install -y boost boost-devel # Set up the CUDA repository. COPY cuda.repo /etc/yum.repos.d/cuda.repo -ARG CUDA_VERSION=12-5 +ARG CUDA_VERSION=12-6 # Install CUDA RUN dnf install -y cuda-${CUDA_VERSION}.x86_64 @@ -29,11 +29,11 @@ RUN dnf install -y cuda-${CUDA_VERSION}.x86_64 COPY oneapi.repo /etc/yum.repos.d/oneapi.repo # Install oneAPI. -ARG ONEAPI_VERSION=2024.2 +ARG ONEAPI_VERSION=2025.0 RUN dnf install -y intel-oneapi-compiler-dpcpp-cpp-${ONEAPI_VERSION} # Install the CodePlay AMD plugin on top of oneAPI. -ARG CODEPLAY_PLUGIN_VERSION=2024.2 +ARG CODEPLAY_PLUGIN_VERSION=2025.0 RUN curl -SL \ "https://developer.codeplay.com/api/v1/products/download?product=oneapi&variant=nvidia&version=${CODEPLAY_PLUGIN_VERSION}" \ -o plugin.sh && \ diff --git a/alma9_rocm_oneapi/Dockerfile b/alma9_rocm_oneapi/Dockerfile index 4cc370c..52375f8 100644 --- a/alma9_rocm_oneapi/Dockerfile +++ b/alma9_rocm_oneapi/Dockerfile @@ -30,7 +30,7 @@ ENV HIP_PLATFORM=amd COPY oneapi.repo /etc/yum.repos.d/oneapi.repo # Install oneAPI. -ARG ONEAPI_VERSION=2024.2 +ARG ONEAPI_VERSION=2025.0 RUN dnf install -y intel-oneapi-compiler-dpcpp-cpp-${ONEAPI_VERSION} # Install the CodePlay AMD plugin on top of oneAPI. diff --git a/ubuntu2204_cuda/Dockerfile b/ubuntu2204_cuda/Dockerfile index 537a411..9481f15 100644 --- a/ubuntu2204_cuda/Dockerfile +++ b/ubuntu2204_cuda/Dockerfile @@ -5,7 +5,7 @@ # Mozilla Public License Version 2.0 # Start from the (at the time of writing) latest Acts Ubuntu 22.04 image. -FROM ghcr.io/acts-project/ubuntu2204:55 +FROM ghcr.io/acts-project/ubuntu2204:68 # Some description for the image. LABEL description="Ubuntu 22.04 with Acts dependencies and CUDA" @@ -18,7 +18,7 @@ RUN curl -SL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204 rm cuda-keyring.deb # Install CUDA. -ARG CUDA_VERSION=12-4 +ARG CUDA_VERSION=12-6 RUN apt-get update && \ apt-get install -y cuda-compat-${CUDA_VERSION} cuda-cudart-${CUDA_VERSION} \ cuda-libraries-dev-${CUDA_VERSION} \ diff --git a/ubuntu2204_cuda_oneapi/Dockerfile b/ubuntu2204_cuda_oneapi/Dockerfile index 7f285df..b268bba 100644 --- a/ubuntu2204_cuda_oneapi/Dockerfile +++ b/ubuntu2204_cuda_oneapi/Dockerfile @@ -6,7 +6,7 @@ # Start from the (at the time of writing) latest Acts Ubuntu 24.04 image. # @TODO: Change this -FROM ghcr.io/acts-project/ubuntu2204:55 +FROM ghcr.io/acts-project/ubuntu2204:68 # Some description for the image. LABEL description="Ubuntu 22.04 with Acts dependencies and CUDA + oneAPI" @@ -19,7 +19,7 @@ RUN curl -SL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204 rm cuda-keyring.deb # Install CUDA. -ARG CUDA_VERSION=12-4 +ARG CUDA_VERSION=12-6 RUN apt-get update && \ apt-get install -y cuda-compat-${CUDA_VERSION} cuda-cudart-${CUDA_VERSION} \ cuda-libraries-dev-${CUDA_VERSION} \ @@ -44,13 +44,13 @@ RUN mkdir --parents --mode=0755 /etc/apt/keyrings && \ COPY oneapi.list /etc/apt/sources.list.d/ # Install oneAPI. -ARG ONEAPI_VERSION=2024.2 +ARG ONEAPI_VERSION=2025.0 RUN apt-get update && \ apt-get install -y intel-oneapi-compiler-dpcpp-cpp-${ONEAPI_VERSION} && \ apt-get clean -y # Install the CodePlay NVIDIA plugin on top of oneAPI. -ARG CODEPLAY_PLUGIN_VERSION=2024.2 +ARG CODEPLAY_PLUGIN_VERSION=2025.0 RUN curl -SL \ "https://developer.codeplay.com/api/v1/products/download?product=oneapi&variant=nvidia&version=${CODEPLAY_PLUGIN_VERSION}" \ -o plugin.sh && \ diff --git a/ubuntu2404_cuda_oneapi/Dockerfile b/ubuntu2404_cuda_oneapi/Dockerfile index b957f66..b2fa80c 100644 --- a/ubuntu2404_cuda_oneapi/Dockerfile +++ b/ubuntu2404_cuda_oneapi/Dockerfile @@ -6,7 +6,7 @@ # Start from the (at the time of writing) latest Acts Ubuntu 24.04 image. # @TODO: Update this -FROM ghcr.io/acts-project/ubuntu2404:53 +FROM ghcr.io/acts-project/ubuntu2404:68 # Some description for the image. LABEL description="Ubuntu 24.04 with Acts dependencies and CUDA + oneAPI" @@ -19,7 +19,7 @@ RUN curl -SL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404 rm cuda-keyring.deb # Install CUDA. -ARG CUDA_VERSION=12-5 +ARG CUDA_VERSION=12-6 RUN apt-get update && \ apt-get install -y cuda-compat-${CUDA_VERSION} cuda-cudart-${CUDA_VERSION} \ cuda-libraries-dev-${CUDA_VERSION} \ @@ -44,13 +44,13 @@ RUN mkdir --parents --mode=0755 /etc/apt/keyrings && \ COPY oneapi.list /etc/apt/sources.list.d/ # Install oneAPI. -ARG ONEAPI_VERSION=2024.2 +ARG ONEAPI_VERSION=2025.0 RUN apt-get update && \ apt-get install -y intel-oneapi-compiler-dpcpp-cpp-${ONEAPI_VERSION} && \ apt-get clean -y # Install the CodePlay NVIDIA plugin on top of oneAPI. -ARG CODEPLAY_PLUGIN_VERSION=2024.2 +ARG CODEPLAY_PLUGIN_VERSION=2025.0 RUN curl -SL \ "https://developer.codeplay.com/api/v1/products/download?product=oneapi&variant=nvidia&version=${CODEPLAY_PLUGIN_VERSION}" \ -o plugin.sh && \ diff --git a/ubuntu2404_oneapi/Dockerfile b/ubuntu2404_oneapi/Dockerfile index 7d6a6ff..0a46dfe 100644 --- a/ubuntu2404_oneapi/Dockerfile +++ b/ubuntu2404_oneapi/Dockerfile @@ -6,7 +6,7 @@ # Start from the (at the time of writing) latest Acts Ubuntu 24.04 image. # @TODO: Update this -FROM ghcr.io/acts-project/ubuntu2404:53 +FROM ghcr.io/acts-project/ubuntu2404:68 # Some description for the image. LABEL description="Ubuntu 24.04 with Acts dependencies and oneAPI" @@ -21,7 +21,7 @@ RUN mkdir --parents --mode=0755 /etc/apt/keyrings && \ COPY oneapi.list /etc/apt/sources.list.d/ # Install oneAPI. -ARG ONEAPI_VERSION=2024.2 +ARG ONEAPI_VERSION=2025.0 RUN apt-get update && \ apt-get install -y intel-oneapi-compiler-dpcpp-cpp-${ONEAPI_VERSION} && \ apt-get clean -y @@ -32,4 +32,4 @@ RUN apt-get update && \ ENV CC="clang" ENV CXX="clang++" ENV SYCLCXX="clang++" -ENV SYCLFLAGS="-fsycl -fsycl-targets=spir64,spir64_x86_64" +ENV SYCLFLAGS="-fsycl" diff --git a/ubuntu2404_rocm_oneapi/Dockerfile b/ubuntu2404_rocm_oneapi/Dockerfile index 9459f0b..bdc7c89 100644 --- a/ubuntu2404_rocm_oneapi/Dockerfile +++ b/ubuntu2404_rocm_oneapi/Dockerfile @@ -6,7 +6,7 @@ # Start from the (at the time of writing) latest Acts Ubuntu 24.04 image. # @TODO: Update this -FROM ghcr.io/acts-project/ubuntu2404:53 +FROM ghcr.io/acts-project/ubuntu2404:68 # Some description for the image. LABEL description="Ubuntu 24.04 with Acts dependencies and ROCm/HIP + oneAPI" @@ -36,7 +36,7 @@ RUN curl -SL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRO COPY oneapi.list /etc/apt/sources.list.d/ # Install oneAPI. -ARG ONEAPI_VERSION=2024.2 +ARG ONEAPI_VERSION=2025.0 RUN apt-get update && \ apt-get install -y intel-oneapi-compiler-dpcpp-cpp-${ONEAPI_VERSION} && \ apt-get clean -y