From cc2e86b86f2b536cd5de36e630f9649208494ac6 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Mon, 19 May 2025 14:40:46 +0200
Subject: [PATCH 01/32] Add prgenv-gnu 25.06 gh200 recipe

---
 recipes/prgenv-gnu/25.06/gh200/compilers.yaml |  5 ++
 recipes/prgenv-gnu/25.06/gh200/config.yaml    |  7 +++
 .../prgenv-gnu/25.06/gh200/environments.yaml  | 49 +++++++++++++++++++
 .../prgenv-gnu/25.06/gh200/extra/reframe.yaml | 12 +++++
 recipes/prgenv-gnu/25.06/gh200/modules.yaml   | 23 +++++++++
 5 files changed, 96 insertions(+)
 create mode 100644 recipes/prgenv-gnu/25.06/gh200/compilers.yaml
 create mode 100644 recipes/prgenv-gnu/25.06/gh200/config.yaml
 create mode 100644 recipes/prgenv-gnu/25.06/gh200/environments.yaml
 create mode 100644 recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml
 create mode 100644 recipes/prgenv-gnu/25.06/gh200/modules.yaml

diff --git a/recipes/prgenv-gnu/25.06/gh200/compilers.yaml b/recipes/prgenv-gnu/25.06/gh200/compilers.yaml
new file mode 100644
index 000000000..549b5c0ad
--- /dev/null
+++ b/recipes/prgenv-gnu/25.06/gh200/compilers.yaml
@@ -0,0 +1,5 @@
+bootstrap:
+  spec: gcc@12.3
+gcc:
+  specs:
+  - gcc@14
diff --git a/recipes/prgenv-gnu/25.06/gh200/config.yaml b/recipes/prgenv-gnu/25.06/gh200/config.yaml
new file mode 100644
index 000000000..ace56c37a
--- /dev/null
+++ b/recipes/prgenv-gnu/25.06/gh200/config.yaml
@@ -0,0 +1,7 @@
+name: prgenv-gnu
+spack:
+  commit: 6227bd7986428678a25f22735170564aba19b449 # develop on 2025-05-19
+  repo: https://github.com/spack/spack.git
+store: /user-environment
+description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
+
diff --git a/recipes/prgenv-gnu/25.06/gh200/environments.yaml b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
new file mode 100644
index 000000000..5b5d4dd6a
--- /dev/null
+++ b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
@@ -0,0 +1,49 @@
+gcc-env:
+  compiler:
+      - toolchain: gcc
+        spec: gcc
+  mpi:
+      spec: cray-mpich@8.1.32
+      gpu: cuda
+  unify: true
+  specs:
+  - boost +chrono +filesystem +iostreams +mpi +python +regex +serialization +shared +system +timer
+  - cmake
+  - fftw
+  - fmt
+  - gsl
+  - hdf5+cxx+hl+fortran
+  - kokkos +aggressive_vectorization ~alloc_async +cuda_constexpr +cuda_lambda ~cuda_relocatable_device_code ~cuda_uvm cxxstd=17 +openmp +pic +serial +shared +tuning +wrapper
+  - kokkos-kernels +blas +cublas +cusparse +cusolver +execspace_cuda +execspace_openmp +execspace_serial +lapack +memspace_cudaspace +openmp scalars=float,double,complex_float,complex_double +serial +shared +superlu
+  - kokkos-tools +mpi +papi
+  - netlib-scalapack
+  - lua
+  - libtree
+  - lz4
+  - meson
+  - netcdf-c
+  - netcdf-cxx
+  - netcdf-fortran
+  - ninja
+  - openblas threads=openmp
+  - osu-micro-benchmarks@7.5
+  - papi ~cuda
+  - python@3.13
+  - zlib-ng
+  # add GPU-specific packages here, for easier comparison with mc version
+  - nccl
+  - nccl-tests
+  - cuda@12.8
+  - aws-ofi-nccl
+  - superlu
+  variants:
+  - +mpi
+  - +cuda
+  - cuda_arch=90a
+  views:
+    default:
+      link: roots
+      uenv:
+        add_compilers: true
+        prefix_paths:
+          LD_LIBRARY_PATH: [lib, lib64]
diff --git a/recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml b/recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml
new file mode 100644
index 000000000..a0a97c9ca
--- /dev/null
+++ b/recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml
@@ -0,0 +1,12 @@
+default:
+  features:
+    - cuda
+    - mpi
+    - osu-micro-benchmarks
+    - openmp
+    - serial
+  cc: mpicc
+  cxx: mpic++
+  ftn: mpifort
+  views:
+    - default
diff --git a/recipes/prgenv-gnu/25.06/gh200/modules.yaml b/recipes/prgenv-gnu/25.06/gh200/modules.yaml
new file mode 100644
index 000000000..623307b09
--- /dev/null
+++ b/recipes/prgenv-gnu/25.06/gh200/modules.yaml
@@ -0,0 +1,23 @@
+modules:
+  # Paths to check when creating modules for all module sets
+  prefix_inspections:
+    bin:
+      - PATH
+    lib:
+      - LD_LIBRARY_PATH
+    lib64:
+      - LD_LIBRARY_PATH
+
+  default:
+    arch_folder: false
+    # Where to install modules
+    roots:
+      tcl: /user-environment/modules
+    tcl:
+      all:
+        autoload: none
+      hash_length: 0
+      exclude_implicits: true
+      exclude: ['%gcc@7.5.0', 'gcc %gcc@7.5.0']
+      projections:
+        all: '{name}/{version}'

From 26bfbc62108cbe37e3ed48712ad4e7c392dfa653 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Thu, 22 May 2025 17:16:21 +0200
Subject: [PATCH 02/32] Small fixes to prgenv-gnu/25.06 recipe

---
 recipes/prgenv-gnu/25.06/gh200/compilers.yaml    | 2 +-
 recipes/prgenv-gnu/25.06/gh200/config.yaml       | 4 ++--
 recipes/prgenv-gnu/25.06/gh200/environments.yaml | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/compilers.yaml b/recipes/prgenv-gnu/25.06/gh200/compilers.yaml
index 549b5c0ad..0c1504e61 100644
--- a/recipes/prgenv-gnu/25.06/gh200/compilers.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/compilers.yaml
@@ -1,5 +1,5 @@
 bootstrap:
-  spec: gcc@12.3
+  spec: gcc@12
 gcc:
   specs:
   - gcc@14
diff --git a/recipes/prgenv-gnu/25.06/gh200/config.yaml b/recipes/prgenv-gnu/25.06/gh200/config.yaml
index ace56c37a..32fe2144b 100644
--- a/recipes/prgenv-gnu/25.06/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/config.yaml
@@ -1,7 +1,7 @@
 name: prgenv-gnu
 spack:
-  commit: 6227bd7986428678a25f22735170564aba19b449 # develop on 2025-05-19
-  repo: https://github.com/spack/spack.git
+  commit: 2f389f7578b4eba0ab278b8d79410b62dd5d69d5 # spack develop from 2025-05-22 + kokkos-kernels language dep
+  repo: https://github.com/msimberg/spack.git
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 
diff --git a/recipes/prgenv-gnu/25.06/gh200/environments.yaml b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
index 5b5d4dd6a..96451aadc 100644
--- a/recipes/prgenv-gnu/25.06/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
@@ -13,7 +13,7 @@ gcc-env:
   - fmt
   - gsl
   - hdf5+cxx+hl+fortran
-  - kokkos +aggressive_vectorization ~alloc_async +cuda_constexpr +cuda_lambda ~cuda_relocatable_device_code ~cuda_uvm cxxstd=17 +openmp +pic +serial +shared +tuning +wrapper
+  - kokkos +aggressive_vectorization ~alloc_async cuda_arch=90 +cuda_constexpr +cuda_lambda ~cuda_relocatable_device_code ~cuda_uvm cxxstd=17 +openmp +pic +serial +shared +tuning +wrapper
   - kokkos-kernels +blas +cublas +cusparse +cusolver +execspace_cuda +execspace_openmp +execspace_serial +lapack +memspace_cudaspace +openmp scalars=float,double,complex_float,complex_double +serial +shared +superlu
   - kokkos-tools +mpi +papi
   - netlib-scalapack
@@ -21,7 +21,7 @@ gcc-env:
   - libtree
   - lz4
   - meson
-  - netcdf-c
+  - netcdf-c build_system=cmake
   - netcdf-cxx
   - netcdf-fortran
   - ninja
@@ -33,7 +33,7 @@ gcc-env:
   # add GPU-specific packages here, for easier comparison with mc version
   - nccl
   - nccl-tests
-  - cuda@12.8
+  - cuda@12.9
   - aws-ofi-nccl
   - superlu
   variants:

From 9ab9fa47af860efcea4cb70df8077c79a91b0869 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Wed, 4 Jun 2025 19:32:42 +0200
Subject: [PATCH 03/32] Bump spack commit

---
 recipes/prgenv-gnu/25.06/gh200/config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/config.yaml b/recipes/prgenv-gnu/25.06/gh200/config.yaml
index 32fe2144b..4782c1b98 100644
--- a/recipes/prgenv-gnu/25.06/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/config.yaml
@@ -1,7 +1,7 @@
 name: prgenv-gnu
 spack:
-  commit: 2f389f7578b4eba0ab278b8d79410b62dd5d69d5 # spack develop from 2025-05-22 + kokkos-kernels language dep
-  repo: https://github.com/msimberg/spack.git
+  commit: 922b2625bc1abc610571bc8e3026085bdf950281 # msimberg-prgenv-gnu-25.06
+  repo: https://github.com/spack/spack.git
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 

From 662a5742dd665ae1ebc8fbb8ad60514042bd9318 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Wed, 4 Jun 2025 19:33:06 +0200
Subject: [PATCH 04/32] Specify version for compiler in environments.yaml

---
 recipes/prgenv-gnu/25.06/gh200/environments.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/environments.yaml b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
index 96451aadc..984eef591 100644
--- a/recipes/prgenv-gnu/25.06/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
@@ -1,7 +1,7 @@
 gcc-env:
   compiler:
       - toolchain: gcc
-        spec: gcc
+        spec: gcc@14
   mpi:
       spec: cray-mpich@8.1.32
       gpu: cuda

From 1dbd8c42718063baa5cc232c7ddea02b922a6e77 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Fri, 6 Jun 2025 13:34:35 +0200
Subject: [PATCH 05/32] Pin gcc to 14.2 instead of 14.3 because of
 incompatibility between cuda 12.9 and gcc 14.3

---
 recipes/prgenv-gnu/25.06/gh200/compilers.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/compilers.yaml b/recipes/prgenv-gnu/25.06/gh200/compilers.yaml
index 0c1504e61..76c62292c 100644
--- a/recipes/prgenv-gnu/25.06/gh200/compilers.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/compilers.yaml
@@ -2,4 +2,4 @@ bootstrap:
   spec: gcc@12
 gcc:
   specs:
-  - gcc@14
+  - gcc@14.2

From df321668200e10862f3f320188307659343df149 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Fri, 6 Jun 2025 13:35:00 +0200
Subject: [PATCH 06/32] Update spack commit

---
 recipes/prgenv-gnu/25.06/gh200/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/config.yaml b/recipes/prgenv-gnu/25.06/gh200/config.yaml
index 4782c1b98..5fff8dc54 100644
--- a/recipes/prgenv-gnu/25.06/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/config.yaml
@@ -1,6 +1,6 @@
 name: prgenv-gnu
 spack:
-  commit: 922b2625bc1abc610571bc8e3026085bdf950281 # msimberg-prgenv-gnu-25.06
+  commit: 2ba04092f5239a301cd6b8edb52bf23913b26717 # msimberg-prgenv-gnu-25.06
   repo: https://github.com/spack/spack.git
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.

From b1d7c255347c91fc3a4f0a302067f523af08ec38 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Fri, 6 Jun 2025 13:35:14 +0200
Subject: [PATCH 07/32] Remove explicit version constraints

---
 recipes/prgenv-gnu/25.06/gh200/environments.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/environments.yaml b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
index 984eef591..8b50365cc 100644
--- a/recipes/prgenv-gnu/25.06/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
@@ -26,14 +26,14 @@ gcc-env:
   - netcdf-fortran
   - ninja
   - openblas threads=openmp
-  - osu-micro-benchmarks@7.5
+  - osu-micro-benchmarks
   - papi ~cuda
-  - python@3.13
+  - python
   - zlib-ng
   # add GPU-specific packages here, for easier comparison with mc version
   - nccl
   - nccl-tests
-  - cuda@12.9
+  - cuda
   - aws-ofi-nccl
   - superlu
   variants:

From f2987f4d09e20a8c61454740b351fef6632bddfb Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Fri, 13 Jun 2025 11:30:06 +0200
Subject: [PATCH 08/32] update spack commit

---
 recipes/prgenv-gnu/25.06/gh200/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/config.yaml b/recipes/prgenv-gnu/25.06/gh200/config.yaml
index 5fff8dc54..2f6f804ed 100644
--- a/recipes/prgenv-gnu/25.06/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/config.yaml
@@ -1,6 +1,6 @@
 name: prgenv-gnu
 spack:
-  commit: 2ba04092f5239a301cd6b8edb52bf23913b26717 # msimberg-prgenv-gnu-25.06
+  commit: 639653040594f37e625afdeedf90ffc9cdced39d # msimberg-prgenv-gnu-25.06
   repo: https://github.com/spack/spack.git
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.

From 39ba8c7f976fe5083c339f544faf9248445e9fa6 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Fri, 13 Jun 2025 11:30:29 +0200
Subject: [PATCH 09/32] Remove explicit ~cuda on papi package (conflict in
 package definition)

---
 recipes/prgenv-gnu/25.06/gh200/environments.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/environments.yaml b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
index 8b50365cc..c97992e65 100644
--- a/recipes/prgenv-gnu/25.06/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
@@ -27,7 +27,7 @@ gcc-env:
   - ninja
   - openblas threads=openmp
   - osu-micro-benchmarks
-  - papi ~cuda
+  - papi
   - python
   - zlib-ng
   # add GPU-specific packages here, for easier comparison with mc version

From 08fb2faed77792b1f48a8ea3f65203817a49a8e8 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Fri, 13 Jun 2025 13:39:14 +0200
Subject: [PATCH 10/32] Add xcb-util-cursor for nsys-ui

---
 recipes/prgenv-gnu/25.06/gh200/environments.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/prgenv-gnu/25.06/gh200/environments.yaml b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
index c97992e65..a1e3e00d3 100644
--- a/recipes/prgenv-gnu/25.06/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/environments.yaml
@@ -34,6 +34,7 @@ gcc-env:
   - nccl
   - nccl-tests
   - cuda
+  - xcb-util-cursor
   - aws-ofi-nccl
   - superlu
   variants:

From cf45f2bb206b8dc4a0afd2d8bbaf79f43be4b19b Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Thu, 19 Jun 2025 11:47:56 +0200
Subject: [PATCH 11/32] Set stackinator recipe version 2 for prgenv-gnu/25.06

---
 recipes/prgenv-gnu/25.06/gh200/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/config.yaml b/recipes/prgenv-gnu/25.06/gh200/config.yaml
index 2f6f804ed..aca59b37c 100644
--- a/recipes/prgenv-gnu/25.06/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/config.yaml
@@ -4,4 +4,4 @@ spack:
   repo: https://github.com/spack/spack.git
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
-
+version: 2

From 7062cf8926048921bf2453f24fba726f5b434020 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Tue, 24 Jun 2025 14:51:56 +0200
Subject: [PATCH 12/32] Update spack and spack-packages commits for
 prgenv-gnu/25.06

---
 recipes/prgenv-gnu/25.06/gh200/config.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.06/gh200/config.yaml b/recipes/prgenv-gnu/25.06/gh200/config.yaml
index aca59b37c..5b0e0b8d5 100644
--- a/recipes/prgenv-gnu/25.06/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/config.yaml
@@ -1,7 +1,12 @@
 name: prgenv-gnu
 spack:
-  commit: 639653040594f37e625afdeedf90ffc9cdced39d # msimberg-prgenv-gnu-25.06
   repo: https://github.com/spack/spack.git
+  commit: c702f5b89eea1950c76472fbf8f0919ad12880a6
+  packages:
+    repo: https://github.com/msimberg/spack-packages.git
+    # TODO: Still unmerged: https://github.com/spack/spack-packages/pull/225,
+    # https://github.com/spack/spack-packages/pull/214
+    commit: prgenv-gnu-25.06
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2

From d5ba71631b33d745e8e886e1169cb65984000dc7 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Tue, 24 Jun 2025 17:15:41 +0200
Subject: [PATCH 13/32] Update
 recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml

---
 recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml b/recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml
index a0a97c9ca..de0931bfa 100644
--- a/recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml
+++ b/recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml
@@ -2,6 +2,7 @@ default:
   features:
     - cuda
     - mpi
+    - nccl-tests
     - osu-micro-benchmarks
     - openmp
     - serial

From 19ca5c5d5e36771ed7c15540c6b4ad660892aab5 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Tue, 24 Jun 2025 17:18:46 +0200
Subject: [PATCH 14/32] Add prgenv-gnu/25.06 to config.yaml

---
 config.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/config.yaml b/config.yaml
index 050deb42d..a70c40be7 100644
--- a/config.yaml
+++ b/config.yaml
@@ -304,6 +304,18 @@ uenvs:
         santis: [gh200]
         eiger: [zen2]
         bristen: [a100]
+    "25.06":
+      recipes:
+        # zen2 and zen3 targets use the same recipe
+        zen2: 25.06/mc
+        zen3: 25.06/mc
+        gh200: 25.06/gh200
+        a100: 25.06/a100
+      deploy:
+        daint: [gh200]
+        santis: [gh200]
+        eiger: [zen2]
+        bristen: [a100]
       develop: True
   prgenv-nvfortran:
     "24.11":

From 45eef5ac9dfbd89b415c0d35c77cb8e706121c50 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 25 Jun 2025 11:05:49 +0200
Subject: [PATCH 15/32] Only enable gh200 builds for prgenv-gnu/25.06

---
 config.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/config.yaml b/config.yaml
index a70c40be7..4de53ee9a 100644
--- a/config.yaml
+++ b/config.yaml
@@ -306,16 +306,10 @@ uenvs:
         bristen: [a100]
     "25.06":
       recipes:
-        # zen2 and zen3 targets use the same recipe
-        zen2: 25.06/mc
-        zen3: 25.06/mc
         gh200: 25.06/gh200
-        a100: 25.06/a100
       deploy:
         daint: [gh200]
         santis: [gh200]
-        eiger: [zen2]
-        bristen: [a100]
       develop: True
   prgenv-nvfortran:
     "24.11":

From af85c552d2b9a0da790da48db4222f6f0d246852 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 25 Jun 2025 16:38:47 +0200
Subject: [PATCH 16/32] Reversion prgenv-gnu 25.06 to 25.6 to match previous
 versions

---
 config.yaml                                                 | 4 ++--
 recipes/prgenv-gnu/{25.06 => 25.6}/gh200/compilers.yaml     | 0
 recipes/prgenv-gnu/{25.06 => 25.6}/gh200/config.yaml        | 0
 recipes/prgenv-gnu/{25.06 => 25.6}/gh200/environments.yaml  | 0
 recipes/prgenv-gnu/{25.06 => 25.6}/gh200/extra/reframe.yaml | 0
 recipes/prgenv-gnu/{25.06 => 25.6}/gh200/modules.yaml       | 0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename recipes/prgenv-gnu/{25.06 => 25.6}/gh200/compilers.yaml (100%)
 rename recipes/prgenv-gnu/{25.06 => 25.6}/gh200/config.yaml (100%)
 rename recipes/prgenv-gnu/{25.06 => 25.6}/gh200/environments.yaml (100%)
 rename recipes/prgenv-gnu/{25.06 => 25.6}/gh200/extra/reframe.yaml (100%)
 rename recipes/prgenv-gnu/{25.06 => 25.6}/gh200/modules.yaml (100%)

diff --git a/config.yaml b/config.yaml
index 4de53ee9a..aae493924 100644
--- a/config.yaml
+++ b/config.yaml
@@ -304,9 +304,9 @@ uenvs:
         santis: [gh200]
         eiger: [zen2]
         bristen: [a100]
-    "25.06":
+    "25.6":
       recipes:
-        gh200: 25.06/gh200
+        gh200: 25.6/gh200
       deploy:
         daint: [gh200]
         santis: [gh200]
diff --git a/recipes/prgenv-gnu/25.06/gh200/compilers.yaml b/recipes/prgenv-gnu/25.6/gh200/compilers.yaml
similarity index 100%
rename from recipes/prgenv-gnu/25.06/gh200/compilers.yaml
rename to recipes/prgenv-gnu/25.6/gh200/compilers.yaml
diff --git a/recipes/prgenv-gnu/25.06/gh200/config.yaml b/recipes/prgenv-gnu/25.6/gh200/config.yaml
similarity index 100%
rename from recipes/prgenv-gnu/25.06/gh200/config.yaml
rename to recipes/prgenv-gnu/25.6/gh200/config.yaml
diff --git a/recipes/prgenv-gnu/25.06/gh200/environments.yaml b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
similarity index 100%
rename from recipes/prgenv-gnu/25.06/gh200/environments.yaml
rename to recipes/prgenv-gnu/25.6/gh200/environments.yaml
diff --git a/recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml b/recipes/prgenv-gnu/25.6/gh200/extra/reframe.yaml
similarity index 100%
rename from recipes/prgenv-gnu/25.06/gh200/extra/reframe.yaml
rename to recipes/prgenv-gnu/25.6/gh200/extra/reframe.yaml
diff --git a/recipes/prgenv-gnu/25.06/gh200/modules.yaml b/recipes/prgenv-gnu/25.6/gh200/modules.yaml
similarity index 100%
rename from recipes/prgenv-gnu/25.06/gh200/modules.yaml
rename to recipes/prgenv-gnu/25.6/gh200/modules.yaml

From ef56ec0c006faf0cd0911851e3a3442002bbfc92 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 25 Jun 2025 16:52:50 +0200
Subject: [PATCH 17/32] Update prgenv-gnu/25.6 modules generation to match gcc
 12.3.0 as system/bootstrap compiler

---
 recipes/prgenv-gnu/25.6/gh200/modules.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/modules.yaml b/recipes/prgenv-gnu/25.6/gh200/modules.yaml
index 623307b09..5baf39c49 100644
--- a/recipes/prgenv-gnu/25.6/gh200/modules.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/modules.yaml
@@ -18,6 +18,6 @@ modules:
         autoload: none
       hash_length: 0
       exclude_implicits: true
-      exclude: ['%gcc@7.5.0', 'gcc %gcc@7.5.0']
+      exclude: ['%gcc@12.3.0']
       projections:
         all: '{name}/{version}'

From f5afe1e82698c378e09ba8d416653bceea8c5208 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 25 Jun 2025 16:53:18 +0200
Subject: [PATCH 18/32] Add prgenv-gnu/25.6 for eiger

---
 recipes/prgenv-gnu/25.6/mc/compilers.yaml     |  5 +++
 recipes/prgenv-gnu/25.6/mc/config.yaml        | 13 ++++++
 recipes/prgenv-gnu/25.6/mc/environments.yaml  | 41 +++++++++++++++++++
 recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml |  7 ++++
 recipes/prgenv-gnu/25.6/mc/modules.yaml       | 23 +++++++++++
 5 files changed, 89 insertions(+)
 create mode 100644 recipes/prgenv-gnu/25.6/mc/compilers.yaml
 create mode 100644 recipes/prgenv-gnu/25.6/mc/config.yaml
 create mode 100644 recipes/prgenv-gnu/25.6/mc/environments.yaml
 create mode 100644 recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml
 create mode 100644 recipes/prgenv-gnu/25.6/mc/modules.yaml

diff --git a/recipes/prgenv-gnu/25.6/mc/compilers.yaml b/recipes/prgenv-gnu/25.6/mc/compilers.yaml
new file mode 100644
index 000000000..0c1504e61
--- /dev/null
+++ b/recipes/prgenv-gnu/25.6/mc/compilers.yaml
@@ -0,0 +1,5 @@
+bootstrap:
+  spec: gcc@12
+gcc:
+  specs:
+  - gcc@14
diff --git a/recipes/prgenv-gnu/25.6/mc/config.yaml b/recipes/prgenv-gnu/25.6/mc/config.yaml
new file mode 100644
index 000000000..d85260bf6
--- /dev/null
+++ b/recipes/prgenv-gnu/25.6/mc/config.yaml
@@ -0,0 +1,13 @@
+name: prgenv-gnu
+spack:
+  repo: https://github.com/spack/spack.git
+  commit: c702f5b89eea1950c76472fbf8f0919ad12880a6
+  packages:
+    repo: https://github.com/msimberg/spack-packages.git
+    # TODO: Still unmerged: https://github.com/spack/spack-packages/pull/225,
+    # https://github.com/spack/spack-packages/pull/214
+    commit: prgenv-gnu-25.06
+store: /user-environment
+store: /user-environment
+description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
+version: 2
diff --git a/recipes/prgenv-gnu/25.6/mc/environments.yaml b/recipes/prgenv-gnu/25.6/mc/environments.yaml
new file mode 100644
index 000000000..96bcf6636
--- /dev/null
+++ b/recipes/prgenv-gnu/25.6/mc/environments.yaml
@@ -0,0 +1,41 @@
+gcc-env:
+  compiler:
+      - toolchain: gcc
+        spec: gcc@14
+  mpi:
+      spec: cray-mpich@8.1.32
+      gpu: Null
+  unify: true
+  specs:
+  - boost +chrono +filesystem +iostreams +mpi +python +regex +serialization +shared +system +timer
+  - cmake
+  - fftw
+  - fmt
+  - gsl
+  - hdf5+cxx+hl+fortran
+  - kokkos +aggressive_vectorization cxxstd=17 +openmp +pic +serial +shared +tuning
+  - kokkos-kernels +blas +execspace_openmp +execspace_serial +lapack +openmp scalars=float,double,complex_float,complex_double +serial +shared +superlu
+  - kokkos-tools +mpi +papi
+  - netlib-scalapack
+  - lua
+  - libtree
+  - lz4
+  - meson
+  - netcdf-c build_system=cmake
+  - netcdf-cxx
+  - netcdf-fortran
+  - ninja
+  - openblas threads=openmp
+  - osu-micro-benchmarks
+  - python
+  - superlu
+  - zlib-ng
+  variants:
+  - +mpi
+  views:
+    default:
+      link: roots
+      uenv:
+        add_compilers: true
+        prefix_paths:
+          LD_LIBRARY_PATH: [lib, lib64]
diff --git a/recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml b/recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml
new file mode 100644
index 000000000..b1570f1ca
--- /dev/null
+++ b/recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml
@@ -0,0 +1,7 @@
+default:
+  features: [osu-micro-benchmarks, mpi, serial, openmp]
+  cc: mpicc
+  cxx: mpic++
+  ftn: mpifort
+  views:
+    - default
diff --git a/recipes/prgenv-gnu/25.6/mc/modules.yaml b/recipes/prgenv-gnu/25.6/mc/modules.yaml
new file mode 100644
index 000000000..5baf39c49
--- /dev/null
+++ b/recipes/prgenv-gnu/25.6/mc/modules.yaml
@@ -0,0 +1,23 @@
+modules:
+  # Paths to check when creating modules for all module sets
+  prefix_inspections:
+    bin:
+      - PATH
+    lib:
+      - LD_LIBRARY_PATH
+    lib64:
+      - LD_LIBRARY_PATH
+
+  default:
+    arch_folder: false
+    # Where to install modules
+    roots:
+      tcl: /user-environment/modules
+    tcl:
+      all:
+        autoload: none
+      hash_length: 0
+      exclude_implicits: true
+      exclude: ['%gcc@12.3.0']
+      projections:
+        all: '{name}/{version}'

From 23f9d00c2d97fe0b8e74a088fa9047185c2367bf Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 25 Jun 2025 16:54:32 +0200
Subject: [PATCH 19/32] Add prgenv-gnu/25.6 config for clariden and eiger

---
 config.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config.yaml b/config.yaml
index 2e7c6f782..6c0a7bf81 100644
--- a/config.yaml
+++ b/config.yaml
@@ -315,10 +315,14 @@ uenvs:
         bristen: [a100]
     "25.6":
       recipes:
+        zen2: 25.6/mc
+        zen3: 25.6/mc
         gh200: 25.6/gh200
       deploy:
+        clariden: [gh200]
         daint: [gh200]
         santis: [gh200]
+        eiger: [zen2]
       develop: True
   prgenv-nvfortran:
     "24.11":

From 3cf076ff4ad59b8c7ff69046a22efde9cc6e4956 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 2 Jul 2025 10:01:49 +0200
Subject: [PATCH 20/32] Use upstream spack-packages commit for prgenv-gnu/25.6

---
 recipes/prgenv-gnu/25.6/gh200/config.yaml | 6 ++----
 recipes/prgenv-gnu/25.6/mc/config.yaml    | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/config.yaml b/recipes/prgenv-gnu/25.6/gh200/config.yaml
index 5b0e0b8d5..962a93a36 100644
--- a/recipes/prgenv-gnu/25.6/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/config.yaml
@@ -3,10 +3,8 @@ spack:
   repo: https://github.com/spack/spack.git
   commit: c702f5b89eea1950c76472fbf8f0919ad12880a6
   packages:
-    repo: https://github.com/msimberg/spack-packages.git
-    # TODO: Still unmerged: https://github.com/spack/spack-packages/pull/225,
-    # https://github.com/spack/spack-packages/pull/214
-    commit: prgenv-gnu-25.06
+    repo: https://github.com/spack/spack-packages.git
+    commit: 0c1f599673edfaaa9ca53720f2d4a281d0f7d63d
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2
diff --git a/recipes/prgenv-gnu/25.6/mc/config.yaml b/recipes/prgenv-gnu/25.6/mc/config.yaml
index d85260bf6..2512210a0 100644
--- a/recipes/prgenv-gnu/25.6/mc/config.yaml
+++ b/recipes/prgenv-gnu/25.6/mc/config.yaml
@@ -4,10 +4,7 @@ spack:
   commit: c702f5b89eea1950c76472fbf8f0919ad12880a6
   packages:
     repo: https://github.com/msimberg/spack-packages.git
-    # TODO: Still unmerged: https://github.com/spack/spack-packages/pull/225,
-    # https://github.com/spack/spack-packages/pull/214
-    commit: prgenv-gnu-25.06
-store: /user-environment
+    commit: 0c1f599673edfaaa9ca53720f2d4a281d0f7d63d
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2

From 6d19e18bb4e80a7278efbdee8b2fb0f06a992d86 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Fri, 4 Jul 2025 17:31:07 +0200
Subject: [PATCH 21/32] Pin nccl to 2.26.2 and aws-ofi-nccl to 1.14.1

---
 recipes/prgenv-gnu/25.6/gh200/environments.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/environments.yaml b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
index a1e3e00d3..c518f9937 100644
--- a/recipes/prgenv-gnu/25.6/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
@@ -31,11 +31,11 @@ gcc-env:
   - python
   - zlib-ng
   # add GPU-specific packages here, for easier comparison with mc version
-  - nccl
+  - nccl@2.26.2
   - nccl-tests
   - cuda
   - xcb-util-cursor
-  - aws-ofi-nccl
+  - aws-ofi-nccl@1.14.1
   - superlu
   variants:
   - +mpi

From fab42555f8d6b85183ac6d36f2380f6fe78aebad Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Mon, 7 Jul 2025 12:59:42 +0200
Subject: [PATCH 22/32] Bump spack and spack-packages commits again for
 prgenv-gnu/25.6

Update commits to include older aws-ofi-nccl@1.14.1
---
 recipes/prgenv-gnu/25.6/gh200/config.yaml | 4 ++--
 recipes/prgenv-gnu/25.6/mc/config.yaml    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/config.yaml b/recipes/prgenv-gnu/25.6/gh200/config.yaml
index 962a93a36..1e26c70c6 100644
--- a/recipes/prgenv-gnu/25.6/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/config.yaml
@@ -1,10 +1,10 @@
 name: prgenv-gnu
 spack:
   repo: https://github.com/spack/spack.git
-  commit: c702f5b89eea1950c76472fbf8f0919ad12880a6
+  commit: develop-2025-07-06
   packages:
     repo: https://github.com/spack/spack-packages.git
-    commit: 0c1f599673edfaaa9ca53720f2d4a281d0f7d63d
+    commit: 4509c3352addaee202b4a0bc69bc15bd85bce306
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2
diff --git a/recipes/prgenv-gnu/25.6/mc/config.yaml b/recipes/prgenv-gnu/25.6/mc/config.yaml
index 2512210a0..1e26c70c6 100644
--- a/recipes/prgenv-gnu/25.6/mc/config.yaml
+++ b/recipes/prgenv-gnu/25.6/mc/config.yaml
@@ -1,10 +1,10 @@
 name: prgenv-gnu
 spack:
   repo: https://github.com/spack/spack.git
-  commit: c702f5b89eea1950c76472fbf8f0919ad12880a6
+  commit: develop-2025-07-06
   packages:
-    repo: https://github.com/msimberg/spack-packages.git
-    commit: 0c1f599673edfaaa9ca53720f2d4a281d0f7d63d
+    repo: https://github.com/spack/spack-packages.git
+    commit: 4509c3352addaee202b4a0bc69bc15bd85bce306
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2

From 9139a80236ade58bfd49acf2575c43c3a2a93b2d Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Mon, 7 Jul 2025 14:24:22 +0200
Subject: [PATCH 23/32] Don't use develop tags for prgenv-gnu/25.6 since the
 tags are outdated

---
 recipes/prgenv-gnu/25.6/gh200/config.yaml | 2 +-
 recipes/prgenv-gnu/25.6/mc/config.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/config.yaml b/recipes/prgenv-gnu/25.6/gh200/config.yaml
index 1e26c70c6..f0d004b0f 100644
--- a/recipes/prgenv-gnu/25.6/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/config.yaml
@@ -1,7 +1,7 @@
 name: prgenv-gnu
 spack:
   repo: https://github.com/spack/spack.git
-  commit: develop-2025-07-06
+  commit: 1d625102473c8e17800c1d30b81f5b048410e286
   packages:
     repo: https://github.com/spack/spack-packages.git
     commit: 4509c3352addaee202b4a0bc69bc15bd85bce306
diff --git a/recipes/prgenv-gnu/25.6/mc/config.yaml b/recipes/prgenv-gnu/25.6/mc/config.yaml
index 1e26c70c6..f0d004b0f 100644
--- a/recipes/prgenv-gnu/25.6/mc/config.yaml
+++ b/recipes/prgenv-gnu/25.6/mc/config.yaml
@@ -1,7 +1,7 @@
 name: prgenv-gnu
 spack:
   repo: https://github.com/spack/spack.git
-  commit: develop-2025-07-06
+  commit: 1d625102473c8e17800c1d30b81f5b048410e286
   packages:
     repo: https://github.com/spack/spack-packages.git
     commit: 4509c3352addaee202b4a0bc69bc15bd85bce306

From 96baeb00c32c6f788fb21f0e73049d017e4d1955 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Fri, 11 Jul 2025 14:55:16 +0200
Subject: [PATCH 24/32] Update prgenv-gnu/25.6 recipes for removed bootstrap
 change

---
 recipes/prgenv-gnu/25.6/gh200/compilers.yaml    | 5 +----
 recipes/prgenv-gnu/25.6/gh200/environments.yaml | 4 +---
 recipes/prgenv-gnu/25.6/mc/compilers.yaml       | 5 +----
 recipes/prgenv-gnu/25.6/mc/environments.yaml    | 4 +---
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/compilers.yaml b/recipes/prgenv-gnu/25.6/gh200/compilers.yaml
index 76c62292c..840d9974d 100644
--- a/recipes/prgenv-gnu/25.6/gh200/compilers.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/compilers.yaml
@@ -1,5 +1,2 @@
-bootstrap:
-  spec: gcc@12
 gcc:
-  specs:
-  - gcc@14.2
+  version: "14.2"
diff --git a/recipes/prgenv-gnu/25.6/gh200/environments.yaml b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
index c518f9937..de64764dc 100644
--- a/recipes/prgenv-gnu/25.6/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
@@ -1,7 +1,5 @@
 gcc-env:
-  compiler:
-      - toolchain: gcc
-        spec: gcc@14
+  compiler: [gcc]
   mpi:
       spec: cray-mpich@8.1.32
       gpu: cuda
diff --git a/recipes/prgenv-gnu/25.6/mc/compilers.yaml b/recipes/prgenv-gnu/25.6/mc/compilers.yaml
index 0c1504e61..65120c9f4 100644
--- a/recipes/prgenv-gnu/25.6/mc/compilers.yaml
+++ b/recipes/prgenv-gnu/25.6/mc/compilers.yaml
@@ -1,5 +1,2 @@
-bootstrap:
-  spec: gcc@12
 gcc:
-  specs:
-  - gcc@14
+  version: "14"
diff --git a/recipes/prgenv-gnu/25.6/mc/environments.yaml b/recipes/prgenv-gnu/25.6/mc/environments.yaml
index 96bcf6636..54f4ccc2d 100644
--- a/recipes/prgenv-gnu/25.6/mc/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/mc/environments.yaml
@@ -1,7 +1,5 @@
 gcc-env:
-  compiler:
-      - toolchain: gcc
-        spec: gcc@14
+  compiler: [gcc]
   mpi:
       spec: cray-mpich@8.1.32
       gpu: Null

From a272c5edbc82da276b4cb064f43850dbc92fe708 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Mon, 28 Jul 2025 16:45:18 +0200
Subject: [PATCH 25/32] Update spack commit to v1.0 and spack-packages to
 v2025.07 for prgenv-gnu/25.6

---
 recipes/prgenv-gnu/25.6/gh200/config.yaml | 4 ++--
 recipes/prgenv-gnu/25.6/mc/config.yaml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/config.yaml b/recipes/prgenv-gnu/25.6/gh200/config.yaml
index f0d004b0f..e1f8fdbc9 100644
--- a/recipes/prgenv-gnu/25.6/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/config.yaml
@@ -1,10 +1,10 @@
 name: prgenv-gnu
 spack:
   repo: https://github.com/spack/spack.git
-  commit: 1d625102473c8e17800c1d30b81f5b048410e286
+  commit: releases/v1.0
   packages:
     repo: https://github.com/spack/spack-packages.git
-    commit: 4509c3352addaee202b4a0bc69bc15bd85bce306
+    commit: releases/v2025.07
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2
diff --git a/recipes/prgenv-gnu/25.6/mc/config.yaml b/recipes/prgenv-gnu/25.6/mc/config.yaml
index f0d004b0f..e1f8fdbc9 100644
--- a/recipes/prgenv-gnu/25.6/mc/config.yaml
+++ b/recipes/prgenv-gnu/25.6/mc/config.yaml
@@ -1,10 +1,10 @@
 name: prgenv-gnu
 spack:
   repo: https://github.com/spack/spack.git
-  commit: 1d625102473c8e17800c1d30b81f5b048410e286
+  commit: releases/v1.0
   packages:
     repo: https://github.com/spack/spack-packages.git
-    commit: 4509c3352addaee202b4a0bc69bc15bd85bce306
+    commit: releases/v2025.07
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2

From cefcecc1da0a93fc222205734f82f940e95da5ea Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Tue, 26 Aug 2025 14:37:32 +0200
Subject: [PATCH 26/32] Update networking section in prgenv-gnu/25.6 recipes

---
 recipes/prgenv-gnu/25.6/gh200/environments.yaml | 5 ++---
 recipes/prgenv-gnu/25.6/mc/environments.yaml    | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/environments.yaml b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
index de64764dc..3501da864 100644
--- a/recipes/prgenv-gnu/25.6/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
@@ -1,8 +1,7 @@
 gcc-env:
   compiler: [gcc]
-  mpi:
-      spec: cray-mpich@8.1.32
-      gpu: cuda
+  network:
+      mpi: cray-mpich@8.1.32 +cuda
   unify: true
   specs:
   - boost +chrono +filesystem +iostreams +mpi +python +regex +serialization +shared +system +timer
diff --git a/recipes/prgenv-gnu/25.6/mc/environments.yaml b/recipes/prgenv-gnu/25.6/mc/environments.yaml
index 54f4ccc2d..f0bc4fe0a 100644
--- a/recipes/prgenv-gnu/25.6/mc/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/mc/environments.yaml
@@ -1,8 +1,7 @@
 gcc-env:
   compiler: [gcc]
-  mpi:
-      spec: cray-mpich@8.1.32
-      gpu: Null
+  network:
+      mpi: cray-mpich@8.1.32
   unify: true
   specs:
   - boost +chrono +filesystem +iostreams +mpi +python +regex +serialization +shared +system +timer

From 6543cd3bf72af85cac89d67324b9fdcad1cb38b7 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Tue, 26 Aug 2025 18:27:34 +0200
Subject: [PATCH 27/32] Test latest upstream libfabric, aws-ofi-nccl, and nccl

---
 recipes/prgenv-gnu/25.6/gh200/config.yaml       | 4 ++--
 recipes/prgenv-gnu/25.6/gh200/environments.yaml | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/config.yaml b/recipes/prgenv-gnu/25.6/gh200/config.yaml
index e1f8fdbc9..6d717f495 100644
--- a/recipes/prgenv-gnu/25.6/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/config.yaml
@@ -3,8 +3,8 @@ spack:
   repo: https://github.com/spack/spack.git
   commit: releases/v1.0
   packages:
-    repo: https://github.com/spack/spack-packages.git
-    commit: releases/v2025.07
+    repo: https://github.com/msimberg/spack-packages.git
+    commit: bump-nccl-aws-ofi-nccl
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2
diff --git a/recipes/prgenv-gnu/25.6/gh200/environments.yaml b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
index 3501da864..950aa2c1c 100644
--- a/recipes/prgenv-gnu/25.6/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
@@ -2,6 +2,8 @@ gcc-env:
   compiler: [gcc]
   network:
       mpi: cray-mpich@8.1.32 +cuda
+      specs:
+      - libfabric@2.2.0
   unify: true
   specs:
   - boost +chrono +filesystem +iostreams +mpi +python +regex +serialization +shared +system +timer
@@ -28,11 +30,11 @@ gcc-env:
   - python
   - zlib-ng
   # add GPU-specific packages here, for easier comparison with mc version
-  - nccl@2.26.2
+  - nccl
   - nccl-tests
   - cuda
   - xcb-util-cursor
-  - aws-ofi-nccl@1.14.1
+  - aws-ofi-nccl
   - superlu
   variants:
   - +mpi

From a785c0fc33e8ff5b080805598acd254a44220518 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <simberg@cscs.ch>
Date: Wed, 27 Aug 2025 09:01:43 +0200
Subject: [PATCH 28/32] Pin netcdf-c version in prgenv-gnu

---
 recipes/prgenv-gnu/25.6/gh200/environments.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/environments.yaml b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
index 950aa2c1c..b4710e4a9 100644
--- a/recipes/prgenv-gnu/25.6/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
@@ -20,7 +20,7 @@ gcc-env:
   - libtree
   - lz4
   - meson
-  - netcdf-c build_system=cmake
+  - netcdf-c@4.9.2 build_system=cmake
   - netcdf-cxx
   - netcdf-fortran
   - ninja

From 807ea22f9b2d75c6e34e6d4cf5aa46bf1b008cff Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 27 Aug 2025 14:34:41 +0200
Subject: [PATCH 29/32] Remove constraints on netcdf-c in prgenv-gnu

---
 recipes/prgenv-gnu/25.6/gh200/environments.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/environments.yaml b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
index b4710e4a9..cb22665c7 100644
--- a/recipes/prgenv-gnu/25.6/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
@@ -20,7 +20,7 @@ gcc-env:
   - libtree
   - lz4
   - meson
-  - netcdf-c@4.9.2 build_system=cmake
+  - netcdf-c
   - netcdf-cxx
   - netcdf-fortran
   - ninja

From bedd88202ae005f54a2698998eabf93b230b8eb2 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Thu, 28 Aug 2025 09:41:57 +0200
Subject: [PATCH 30/32] Use upstream spack-packages in prgenv-gnu

---
 recipes/prgenv-gnu/25.6/gh200/config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/config.yaml b/recipes/prgenv-gnu/25.6/gh200/config.yaml
index 6d717f495..05f315bec 100644
--- a/recipes/prgenv-gnu/25.6/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/config.yaml
@@ -3,8 +3,8 @@ spack:
   repo: https://github.com/spack/spack.git
   commit: releases/v1.0
   packages:
-    repo: https://github.com/msimberg/spack-packages.git
-    commit: bump-nccl-aws-ofi-nccl
+    repo: https://github.com/spack/spack-packages.git
+    commit: be3e6572a6290b920908db8d2d2a2fe61441b62c
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2

From 1901d1ae7edf282cd3a5d0a9b2d5bd1432682edf Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 3 Sep 2025 10:36:58 +0200
Subject: [PATCH 31/32] Go back to system libfabric and release version of
 spack-packages

---
 recipes/prgenv-gnu/25.6/gh200/config.yaml       | 2 +-
 recipes/prgenv-gnu/25.6/gh200/environments.yaml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/config.yaml b/recipes/prgenv-gnu/25.6/gh200/config.yaml
index 05f315bec..e1f8fdbc9 100644
--- a/recipes/prgenv-gnu/25.6/gh200/config.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/config.yaml
@@ -4,7 +4,7 @@ spack:
   commit: releases/v1.0
   packages:
     repo: https://github.com/spack/spack-packages.git
-    commit: be3e6572a6290b920908db8d2d2a2fe61441b62c
+    commit: releases/v2025.07
 store: /user-environment
 description: GNU Compiler toolchain with cray-mpich, Python, CMake and other development tools.
 version: 2
diff --git a/recipes/prgenv-gnu/25.6/gh200/environments.yaml b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
index cb22665c7..87522262d 100644
--- a/recipes/prgenv-gnu/25.6/gh200/environments.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/environments.yaml
@@ -2,8 +2,6 @@ gcc-env:
   compiler: [gcc]
   network:
       mpi: cray-mpich@8.1.32 +cuda
-      specs:
-      - libfabric@2.2.0
   unify: true
   specs:
   - boost +chrono +filesystem +iostreams +mpi +python +regex +serialization +shared +system +timer

From 5f737b6fe8d8a64b4bc1f72661f422a55fcd4c06 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Wed, 3 Sep 2025 13:02:29 +0200
Subject: [PATCH 32/32] Add prgenv reframe feature to prgenv-gnu

---
 recipes/prgenv-gnu/25.6/gh200/extra/reframe.yaml | 3 ++-
 recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml    | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/recipes/prgenv-gnu/25.6/gh200/extra/reframe.yaml b/recipes/prgenv-gnu/25.6/gh200/extra/reframe.yaml
index de0931bfa..fd751101d 100644
--- a/recipes/prgenv-gnu/25.6/gh200/extra/reframe.yaml
+++ b/recipes/prgenv-gnu/25.6/gh200/extra/reframe.yaml
@@ -3,8 +3,9 @@ default:
     - cuda
     - mpi
     - nccl-tests
-    - osu-micro-benchmarks
     - openmp
+    - osu-micro-benchmarks
+    - prgenv
     - serial
   cc: mpicc
   cxx: mpic++
diff --git a/recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml b/recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml
index b1570f1ca..8fb41744e 100644
--- a/recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml
+++ b/recipes/prgenv-gnu/25.6/mc/extra/reframe.yaml
@@ -1,5 +1,10 @@
 default:
-  features: [osu-micro-benchmarks, mpi, serial, openmp]
+  features:
+    - mpi
+    - openmp
+    - osu-micro-benchmarks
+    - prgenv
+    - serial
   cc: mpicc
   cxx: mpic++
   ftn: mpifort