From 1d033abe363efce6fd352ea5a2626adc71ba256b Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 14 Dec 2025 10:13:47 -0600 Subject: [PATCH 1/6] chore: update gcc,clang to 14,20 --- containers/debian/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile index 370098e9..243a4b47 100644 --- a/containers/debian/Dockerfile +++ b/containers/debian/Dockerfile @@ -85,16 +85,13 @@ mkdir -p /etc/apt/source.list.d case ${ID} in debian) case ${VERSION_CODENAME} in - bookworm) GCC="-12" ; CLANG="-18" ;; - trixie) GCC="-14" ; CLANG="-19" ;; + trixie) GCC="-14" ; CLANG="-20" ;; *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;; esac ;; ubuntu) echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list case ${VERSION_CODENAME} in - focal) GCC="-10" ; CLANG="-16" ;; - jammy) GCC="-12" ; CLANG="-16" ;; - noble) GCC="-13" ; CLANG="-17" ;; + noble) GCC=-14" ; CLANG="-20" ;; *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;; esac ;; *) echo "Unsupported ID=${ID}" ; exit 1 ;; From de4492c9a2bbbc9b8afb0c08ef76dac2b932c599 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 14 Dec 2025 10:30:36 -0600 Subject: [PATCH 2/6] fix: typo Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- containers/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile index 243a4b47..ea8dfd1c 100644 --- a/containers/debian/Dockerfile +++ b/containers/debian/Dockerfile @@ -91,7 +91,7 @@ case ${ID} in ubuntu) echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list case ${VERSION_CODENAME} in - noble) GCC=-14" ; CLANG="-20" ;; + noble) GCC="-14" ; CLANG="-20" ;; *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;; esac ;; *) echo "Unsupported ID=${ID}" ; exit 1 ;; From 4019e7cddbc70ce0ebf720a2889d759d8639dd5f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 14 Dec 2025 10:50:09 -0600 Subject: [PATCH 3/6] feat: add flang --- containers/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile index ea8dfd1c..1628b542 100644 --- a/containers/debian/Dockerfile +++ b/containers/debian/Dockerfile @@ -106,7 +106,7 @@ fi # Install packages apt-get -yqq update apt-get -yqq install cpp${GCC} gcc${GCC} g++${GCC} gfortran${GCC} -apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} libclang${CLANG}-dev libc++${CLANG}-dev +apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} libclang${CLANG}-dev libc++${CLANG}-dev flang${CLANG} apt-get -yqq autoremove # Remove symlinks loop in nvidia/cuda:12.5.1-devel-ubuntu24.04 rm -f /usr/bin/cpp /etc/alternatives/cpp From 3102e4c2ad93c037678a4b96b822ff2db5476880 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 14 Dec 2025 17:29:22 -0600 Subject: [PATCH 4/6] chore: iwyu-0.24 --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index ef77882a..9a008960 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -242,7 +242,7 @@ packages: - '@2.1.0' iwyu: require: - - '@0.23' + - '@0.24' jana2: require: - '@2.4.3' From 36e1e2390a0c93866a073c72b8bd44597d10c605 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 14 Dec 2025 17:52:02 -0600 Subject: [PATCH 5/6] fix: add flang to update-alternatives --- containers/debian/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile index 1628b542..953e2f65 100644 --- a/containers/debian/Dockerfile +++ b/containers/debian/Dockerfile @@ -117,6 +117,7 @@ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++${GCC} 100 update-alternatives --install /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar${GCC} 100 update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran${GCC} 100 update-alternatives --install /usr/bin/clang clang /usr/bin/clang${CLANG} 100 +update-alternatives --install /usr/bin/flang flang /usr/bin/flang${CLANG} 100 update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++${CLANG} 100 update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format${CLANG} 100 update-alternatives --install /usr/bin/clang-format-diff clang-format-diff /usr/bin/clang-format-diff${CLANG} 100 From 3cff82d1d92a2bf5e610ca2be7d3b5b6ef130ad3 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 18 Dec 2025 15:25:15 -0600 Subject: [PATCH 6/6] fix: cuda +allow-unsupported-compilers Add support for unsupported compilers in CUDA. --- spack-environment/packages.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 9a008960..decb7074 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -98,6 +98,12 @@ packages: cppcoro: require: - '@10bbcdbf2be3ad3aa56febcf4c7662d771460a99' + cuda: + require: + # We disable CUDA's maximum supported compiler versions, e.g.: + # conflicts("%clang@20:", when="+cuda ^cuda@:12.9") + # https://github.com/spack/spack-packages/blob/develop/repos/spack_repo/builtin/build_systems/cuda.py + - +allow-unsupported-compilers dawn: require: - '@3_91a'