ADD: rhel8 envs

env/rhel7/x86_64/admin/stable/spack.yaml

@@ -13,8 +13,8 @@ spack:
     - gcc_12.3.0_openmpi:
       - opal@master/l4dkgyf
   include:
-  - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
+  - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/rhel7/x86_64/admin/testing/spack.yaml

@@ -8,8 +8,8 @@ spack:
       # Strongly adviced to avoid problems with buildcaches
       padded_length: 256
   include:
-    - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/rhel7/x86_64/admin/unstable/spack.yaml

@@ -21,8 +21,8 @@ spack:
     - oneapi_2024.1.0_openmpi:
       - gromacs@2024.1/pi5t2pp # ~cuda
   include:
-    - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/rhel7/x86_64/sysconfigs/compilers.yaml

@@ -15,10 +15,10 @@ compilers:
   - compiler:
       spec: gcc@=12.3.0
       paths:
-        cc: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/gcc-12.3.0-zpn75bqd4uuxamtoonk5tkiproitfqpt/bin/gcc
-        cxx: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/gcc-12.3.0-zpn75bqd4uuxamtoonk5tkiproitfqpt/bin/g++
-        f77: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/gcc-12.3.0-zpn75bqd4uuxamtoonk5tkiproitfqpt/bin/gfortran
-        fc: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/gcc-12.3.0-zpn75bqd4uuxamtoonk5tkiproitfqpt/bin/gfortran
+        cc: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/gcc-12.3.0-zpn75bqd4uuxamtoonk5tkiproitfqpt/bin/gcc
+        cxx: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/gcc-12.3.0-zpn75bqd4uuxamtoonk5tkiproitfqpt/bin/g++
+        f77: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/gcc-12.3.0-zpn75bqd4uuxamtoonk5tkiproitfqpt/bin/gfortran
+        fc: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/gcc-12.3.0-zpn75bqd4uuxamtoonk5tkiproitfqpt/bin/gfortran
       flags: {}
       operating_system: rhel7
       target: x86_64
@@ -28,10 +28,10 @@ compilers:
   - compiler:
       spec: oneapi@=2024.1.0
       paths:
-        cc: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/intel-oneapi-compilers-2024.1.0-4xhusak77uwpnggnimldlea4qydtzxy7/compiler/2024.1/bin/icx
-        cxx: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/intel-oneapi-compilers-2024.1.0-4xhusak77uwpnggnimldlea4qydtzxy7/compiler/2024.1/bin/icpx
-        f77: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/intel-oneapi-compilers-2024.1.0-4xhusak77uwpnggnimldlea4qydtzxy7/compiler/2024.1/bin/ifx
-        fc: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/intel-oneapi-compilers-2024.1.0-4xhusak77uwpnggnimldlea4qydtzxy7/compiler/2024.1/bin/ifx
+        cc: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/intel-oneapi-compilers-2024.1.0-4xhusak77uwpnggnimldlea4qydtzxy7/compiler/2024.1/bin/icx
+        cxx: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/intel-oneapi-compilers-2024.1.0-4xhusak77uwpnggnimldlea4qydtzxy7/compiler/2024.1/bin/icpx
+        f77: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/intel-oneapi-compilers-2024.1.0-4xhusak77uwpnggnimldlea4qydtzxy7/compiler/2024.1/bin/ifx
+        fc: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-rhel7-x86_64/gcc-4.8.5/intel-oneapi-compilers-2024.1.0-4xhusak77uwpnggnimldlea4qydtzxy7/compiler/2024.1/bin/ifx
       flags: {}
       operating_system: rhel7
       target: x86_64

env/rhel7/x86_64/users/stable/spack.yaml

@@ -2,10 +2,10 @@ spack:
   concretizer:
     unify: false
   include:
-    - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml
   include_concrete:
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/stable
+    - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/stable
   specs: []
   upstreams:
     stable:

env/rhel7/x86_64/users/unstable/spack.yaml

@@ -2,11 +2,11 @@ spack:
   concretizer:
     unify: false
   include:
-    - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml
   include_concrete:
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/stable
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/unstable
+    - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/stable
+    - /afs/psi.ch/sys/spack/spack-psi/env/rhel7/x86_64/admin/unstable
   specs: []
   upstreams:
     stable:

env/rhel8/x86_64/admin/stable/spack.yaml

@@ -0,0 +1,35 @@
+spack:
+  concretizer:
+    unify: false
+  config:
+    install_tree:
+      root: $spack/opt/spack/stable
+  definitions:
+    - compilers:
+      - gcc@=12.3.0
+      - intel-oneapi-compilers@=2024.1.0
+    - gcc_4.8.5:
+      - fpart@1.6.0/lcygtky
+    - gcc_12.3.0_openmpi:
+      - opal@master/l4dkgyf
+  include:
+  - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
+  mirrors:
+    local_psi: file:///afs/psi.ch/software/spack/testing
+  modules:
+    default:
+      roots:
+        tcl: $spack/opt/spack/stable/modulefiles
+  specs:
+  - matrix:
+    - [$compilers]
+    - ['%gcc@4.8.5']
+  - matrix:
+    - [$gcc_4.8.5]
+    - ['%gcc@4.8.5']
+  - matrix:
+    - [$gcc_12.3.0_openmpi]
+    - [^openmpi%gcc]
+    - ['%gcc@12.3.0']
+  view: false

env/rhel8/x86_64/admin/testing/spack.yaml

@@ -0,0 +1,20 @@
+---
+spack:
+  concretizer:
+    unify: false
+  config:
+    install_tree:
+      root: $spack/opt/spack/testing
+      # Strongly adviced to avoid problems with buildcaches
+      padded_length: 256
+  include:
+    - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
+  mirrors:
+    local_psi: file:///afs/psi.ch/software/spack/testing
+  modules:
+    default:
+      roots:
+        tcl: $spack/opt/spack/testing/modulefiles
+  specs: []
+  view: false

env/rhel8/x86_64/admin/unstable/spack.yaml

@@ -0,0 +1,44 @@
+---
+spack:
+  concretizer:
+    unify: false
+  config:
+    install_tree:
+      root: $spack/opt/spack/unstable
+  definitions:
+    - gcc_12.3.0:
+      - cellranger@8.0.1/6h63gx
+      - fastqc@0.12.1/dkkcfu5
+      - ffbidx@main/vyjua6z
+      - sratoolkit@3.1.1/2szh2jy
+      - star@2.7.11a/icumpki
+    - gcc_12.3.0_openmpi:
+      - cp2k@2024.1/2bayb45 # ~cuda
+      - cp2k@2024.1/exkrpix # +cuda
+      - quantum-espresso@7.3.1/yuxkoz2 # hdf5=parallel
+      - py-alphafold@2.3.2/rrfdppp # ~cuda
+      - py-alphafold@2.3.2/tqziprv # +cuda
+    - oneapi_2024.1.0_openmpi:
+      - gromacs@2024.1/pi5t2pp # ~cuda
+  include:
+    - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/compilers.yaml
+  mirrors:
+    local_psi: file:///afs/psi.ch/software/spack/testing
+  modules:
+    default:
+      roots:
+        tcl: $spack/opt/spack/unstable/modulefiles
+  specs:
+  - matrix:
+    - [$gcc_12.3.0]
+    - ['%gcc@12.3.0']
+  - matrix:
+    - [$gcc_12.3.0_openmpi]
+    - [^openmpi%gcc]
+    - ['%gcc@12.3.0']
+  - matrix:
+    - [$oneapi_2024.1.0_openmpi]
+    - [^openmpi%oneapi]
+    - ['%oneapi@2024.1.0']
+  view: false

env/rhel8/x86_64/sysconfigs/compilers.yaml

@@ -0,0 +1,14 @@
+compilers:
+  - compiler:
+      environment: {}
+      extra_rpaths: []
+      flags: {}
+      modules: []
+      operating_system: rhel8
+      paths:
+        cc: /usr/bin/gcc
+        cxx: /usr/bin/g++
+        f77: /usr/bin/gfortran
+        fc: /usr/bin/gfortran
+      spec: gcc@8.5.0
+      target: x86_64

env/rhel8/x86_64/sysconfigs/packages.yaml

@@ -0,0 +1,224 @@
+---
+packages:
+  all:
+    compiler: [gcc@8.5.0, oneapi, nvhpc]
+    prefer:
+    - spec: '^openmpi'
+    providers:
+      blas: [openblas, intel-oneapi-mkl, nvhpc]
+      lapack: [openblas, intel-oneapi-mkl, nvhpc]
+      mpi: [openmpi, mpich, intel-oneapi-mpi]
+      pkgconfig: [pkg-config]
+    require:
+    - spec: 'target=skylake_avx512'
+      when: "%nvhpc"
+      message: "nvhpc compilers cannot target generic x86_64 microarchitecture."
+    - spec: "os=rhel8"
+    target: [x86_64]
+    # Default GPU arch
+    variants:
+      - cuda_arch=60
+  autoconf:
+    require: '%gcc@8.5.0'
+  automake:
+    require: '%gcc@8.5.0'
+  berkeley-db:
+    require: '%gcc@8.5.0'
+  binutils:
+    require: '%gcc@8.5.0'
+  boost:
+    require: '%gcc'
+  bzip2:
+    require: '%gcc@8.5.0'
+  ca-certificates-mozilla:
+    require: '%gcc@8.5.0'
+  cairo:
+    require: '%gcc@8.5.0'
+  cmake:
+    require: '%gcc'
+  coreutils:
+    require: '%gcc@8.5.0'
+  cp2k:
+    require: 'build_system=makefile'
+  cpio:
+    require: '%gcc'
+  ctffind:
+    require: '%gcc'
+  # Makes sure the binary works on any sytem (incl. Gwendolen)
+  cuda:
+    require: '@12.2:'
+  curl:
+    require: '%gcc@8.5.0'
+  cvs:
+    require: '%gcc@8.5.0'
+  diffutils:
+    require: '%gcc@8.5.0'
+  doxygen:
+    require: '%gcc'
+  expat:
+    require: '%gcc@8.5.0'
+  file:
+    require: '%gcc@8.5.0'
+  findutils:
+    require: '%gcc@8.5.0'
+  flex:
+    require: '%gcc@8.5.0'
+  fltk:
+    require: '%gcc'
+  fontconfig:
+    require: '%gcc'
+  freetype:
+    require: '%gcc@8.5.0'
+  gams:
+    require: '%gcc@8.5.0'
+  gawk:
+    require: '%gcc@8.5.0'
+  gcc:
+    require: '%gcc@8.5.0'
+  gdbm:
+    require: '%gcc@8.5.0'
+  gettext:
+    buildable: false
+    externals:
+      - prefix: /usr
+        spec: gettext@0.19.8.1
+  ghostscript:
+    require: '%gcc@8.5.0'
+  git:
+    require: '%gcc@8.5.0'
+  glew:
+    require: '%gcc'
+  gmake:
+    require: '%gcc@8.5.0'
+  groff:
+    require: '%gcc@8.5.0'
+  harfbuzz:
+    require: '%gcc'
+  hcoll:
+    require: '%gcc@8.5.0'
+  icu4c:
+    require: '@67.1%gcc@12.3.0'
+  intel-oneapi-compilers:
+    require: '%gcc@8.5.0'
+  libbsd:
+    require: '%gcc@8.5.0'
+  libcroco:
+    require: '%gcc@8.5.0'
+  libepoxy:
+    require: '%gcc@8.5.0'
+  libevent:
+    require: '%gcc@8.5.0'
+  libfuse:
+    require: '%gcc@8.5.0'
+  libice:
+    require: '%gcc@8.5.0'
+  libiconv:
+    require: '%gcc@8.5.0'
+  libidn2:
+    require: '%gcc@8.5.0'
+  libjpeg-turbo:
+    require: '%gcc@8.5.0'
+  libmd:
+    require: '%gcc@8.5.0'
+  libpciaccess:
+    require: '%gcc@8.5.0'
+  libpthread:
+    require: '%gcc@8.5.0'
+  libpthread-stubs:
+    require: '%gcc@8.5.0'
+  libreadline:
+    require: '%gcc@8.5.0'
+  librsvg:
+    require: '%gcc'
+  libsigsegv:
+    require: '%gcc@8.5.0'
+  libtiff:
+    require: '%gcc'
+  libtool:
+    require: '%gcc@8.5.0'
+  libx11:
+    require: '%gcc@8.5.0'
+  libxcb:
+    require: '%gcc@8.5.0'
+  libxext:
+    require: '%gcc@8.5.0'
+  libxft:
+    require: '%gcc'
+  libxml2:
+    require: '%gcc@8.5.0'
+  libxpm:
+    require: '%gcc@8.5.0'
+  libxt:
+    require: '%gcc'
+  m4:
+    require: '%gcc@8.5.0'
+  ncurses:
+    require: '%gcc@8.5.0'
+  ninja:
+    require: '%gcc@8.5.0'
+  nlohmann-json:
+    require: '%gcc@8.5.0'
+  numactl:
+    require: '%gcc@8.5.0'
+  nvhpc:
+    require: '%gcc@8.5.0 install_type=network'
+  openblas:
+    require: '%gcc'
+  openmpi:
+    require:
+      - spec: schedulers=slurm fabrics=auto pmi-interface=pmix +cxx +cuda +legacylaunchers
+      - spec: '+cxx_exceptions'
+        when: '%gcc'
+  openssh:
+    require: '%gcc@8.5.0'
+  openssl:
+    require: '%gcc@8.5.0'
+  pcre2:
+    require: '%gcc@8.5.0'
+  perl:
+    require: '%gcc@8.5.0'
+  pkg-config:
+    require: '%gcc@8.5.0'
+  py-numpy:
+    require: '%gcc@12.3.0'
+  python:
+    require: '%gcc'
+  readline:
+    require: '%gcc@8.5.0'
+  rsync:
+    require: '%gcc@8.5.0'
+  ruby:
+    require: '%gcc@8.5.0'
+  sed:
+    require: '%gcc@8.5.0'
+  slurm:
+    buildable: false
+    externals:
+      - prefix: /usr
+        spec: slurm@24-05-2-1 +pmix +hwloc +hdf5 +mariadb +pam
+  sqlite:
+    require: '%gcc@8.5.0'
+  subversion:
+    require: '%gcc@8.5.0'
+  tar:
+    require: '%gcc@8.5.0'
+  texinfo:
+    require: '%gcc@8.5.0'
+  unuran:
+    require: '%gcc@8.5.0'
+  util-linux-uuid:
+    require: '%gcc@8.5.0'
+  util-macros:
+    require: '%gcc@8.5.0'
+  valgrind:
+    require: '%gcc@8.5.0'
+  xerces-c:
+    require: '%gcc@8.5.0'
+  xxhash:
+    require: '%gcc@8.5.0'
+  xz:
+    require: '%gcc@8.5.0'
+  zlib:
+    require: '%gcc@8.5.0'
+  zstd:
+    require: '%gcc@8.5.0'

env/rhel8/x86_64/users/stable/spack.yaml

@@ -0,0 +1,14 @@
+spack:
+  concretizer:
+    unify: false
+  include:
+    - $spack/../spack-psi/env/rhel8/x86_64/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel8/x86_64/sysconfigs/compilers.yaml
+  include_concrete:
+    - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/stable
+  specs: []
+  upstreams:
+    stable:
+      install_tree: >-
+        $spack/opt/spack/stable
+  view: false

env/rhel8/x86_64/users/unstable/spack.yaml

@@ -0,0 +1,16 @@
+spack:
+  concretizer:
+    unify: false
+  include:
+    - $spack/../spack-psi/env/rhel8/x86_64/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel8/x86_64/sysconfigs/compilers.yaml
+  include_concrete:
+    - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/stable
+    - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/unstable
+  specs: []
+  upstreams:
+    stable:
+      install_tree: $spack/opt/spack/stable
+    unstable:
+      install_tree: $spack/opt/spack/unstable
+  view: false

env/sles15/aarch64/admin/stable/spack.yaml

@@ -9,8 +9,8 @@ spack:
   - gcc_12.3_mpich:
     - relion@4.0.1/ve5sish     #+cuda
   include:
-    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/sles15/aarch64/admin/testing/spack.yaml

@@ -7,8 +7,8 @@ spack:
       # Strongly adviced to avoid problems with buildcaches
       padded_length: 256
   include:
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+  - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/sles15/aarch64/admin/unstable/spack.yaml

@@ -23,8 +23,8 @@ spack:
   - nvhpc_23.9_openmpi:
     - quantum-espresso@7.3.1/le35al7 #+cuda
   include:
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+  - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/sles15/aarch64/users/stable/spack.yaml

@@ -2,10 +2,10 @@ spack:
   concretizer:
     unify: false
   include:
-    - $spack/spack-psi/env/sles15/aarch64/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/sles15/aarch64/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/sles15/aarch64/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/sles15/aarch64/sysconfigs/compilers.yaml
   include_concrete:
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/aarch64/admin/stable
+    - /afs/psi.ch/sys/spack/spack-psi/env/sles15/aarch64/admin/stable
   specs: []
   upstreams:
     stable:

env/sles15/aarch64/users/unstable/spack.yaml

@@ -2,11 +2,11 @@ spack:
   concretizer:
     unify: false
   include:
-  - $spack/spack-psi/env/sles15/aarch64/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/sles15/aarch64/sysconfigs/compilers.yaml
+  - $spack/../spack-psi/env/sles15/aarch64/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/sles15/aarch64/sysconfigs/compilers.yaml
   include_concrete:
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/aarch64/admin/stable
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/aarch64/admin/unstable
+    - /afs/psi.ch/sys/spack/spack-psi/env/sles15/aarch64/admin/stable
+    - /afs/psi.ch/sys/spack/spack-psi/env/sles15/aarch64/admin/unstable
   specs: []
   upstreams:
     stable:

env/sles15/x86_64/admin/stable/spack.yaml

@@ -11,8 +11,8 @@ spack:
   - gcc_12.3_mpich:
     - relion@4.0.1/ve5sish     #+cuda
   include:
-    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/sles15/x86_64/admin/testing/spack.yaml

@@ -7,8 +7,8 @@ spack:
       # Strongly adviced to avoid problems with buildcaches
       padded_length: 256
   include:
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+  - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/sles15/x86_64/admin/unstable/spack.yaml

@@ -25,8 +25,8 @@ spack:
   - nvhpc_23.9_openmpi:
     - quantum-espresso@7.3.1/le35al7 #+cuda
   include:
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+  - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:

env/sles15/x86_64/sysconfigs/compilers.yaml

@@ -65,10 +65,10 @@ compilers:
 - compiler:
       spec: intel@=2021.6.0
       paths:
-        cc: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/intel64/icc
-        cxx: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/intel64/icpc
-        f77: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/intel64/ifort
-        fc: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/intel64/ifort
+        cc: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/intel64/icc
+        cxx: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/intel64/icpc
+        f77: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/intel64/ifort
+        fc: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/intel64/ifort
       flags: {}
       operating_system: sles15
       target: x86_64
@@ -79,8 +79,8 @@ compilers:
 - compiler:
       spec: oneapi@=2022.1.0
       paths:
-        cc: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/icx
-        cxx: /afs/psi.ch/sys/spack/system/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/icpx
+        cc: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/icx
+        cxx: /afs/psi.ch/sys/spack/0.22.0/opt/spack/stable/linux-sles15-x86_64/gcc-7.5.0/intel-oneapi-compilers-2022.1.0-jjfubnqeg5udrhlho6owzlpi6odqsey5/compiler/2022.1.0/linux/bin/icpx
         f77: null
         fc: null
       flags: {}

env/sles15/x86_64/users/stable/spack.yaml

@@ -2,10 +2,10 @@ spack:
   concretizer:
     unify: false
   include:
-    - $spack/spack-psi/env/sles15/x86_64/sysconfigs/packages.yaml
-    - $spack/spack-psi/env/sles15/x86_64/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/sles15/x86_64/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/sles15/x86_64/sysconfigs/compilers.yaml
   include_concrete:
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/stable
+    - /afs/psi.ch/sys/spack/spack-psi/env/sles15/x86_64/admin/stable
   specs: []
   upstreams:
     stable:

env/sles15/x86_64/users/unstable/spack.yaml

@@ -2,11 +2,11 @@ spack:
   concretizer:
     unify: false
   include:
-  - $spack/spack-psi/env/sles15/x86_64/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/sles15/x86_64/sysconfigs/compilers.yaml
+  - $spack/../spack-psi/env/sles15/x86_64/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/sles15/x86_64/sysconfigs/compilers.yaml
   include_concrete:
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/stable
-    - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/unstable
+    - /afs/psi.ch/sys/spack/spack-psi/env/sles15/x86_64/admin/stable
+    - /afs/psi.ch/sys/spack/spack-psi/env/sles15/x86_64/admin/unstable
   specs: []
   upstreams:
     stable:

packages/gams/package.py

@@ -0,0 +1,13 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+import os
+
+from spack.package import *
+from spack.pkg.builtin.gams import Gams as SpackGams
+
+
+class Gams(SpackGams):
+    version("48.1", md5="5a59a973edfc4e3170b9535760593d62", expand=False)

packages/mfem/mfem_conduit_spack.patch

@@ -0,0 +1,37 @@
+diff --git a/config/defaults.mk b/config/defaults.mk
+index d6b8d59a1..d1ba6fb9a 100644
+--- a/config/defaults.mk
++++ b/config/defaults.mk
+@@ -452,7 +452,7 @@ FMS_LIB = -Wl,-rpath,$(FMS_DIR)/lib -L$(FMS_DIR)/lib -lfms
+ 
+ # Conduit and required libraries configuration
+ CONDUIT_DIR = @MFEM_DIR@/../conduit
+-CONDUIT_OPT = -I$(CONDUIT_DIR)/include/conduit
++CONDUIT_OPT = -I$(CONDUIT_DIR)/include
+ CONDUIT_LIB = \
+    $(XLINKER)-rpath,$(CONDUIT_DIR)/lib -L$(CONDUIT_DIR)/lib \
+    -lconduit -lconduit_relay -lconduit_blueprint  -ldl
+@@ -469,8 +469,8 @@ endif
+ # Sidre and required libraries configuration
+ # Be sure to check the HDF5_DIR (set above) is correct
+ SIDRE_DIR = @MFEM_DIR@/../axom
+-SIDRE_OPT = -I$(SIDRE_DIR)/include -I$(CONDUIT_DIR)/include/conduit\
+- -I$(HDF5_DIR)/include
++SIDRE_OPT = -I$(SIDRE_DIR)/include -I$(CONDUIT_DIR)/include/conduit \
++            -I$(CONDUIT_DIR)/include -I$(HDF5_DIR)/include
+ SIDRE_LIB = \
+    $(XLINKER)-rpath,$(SIDRE_DIR)/lib -L$(SIDRE_DIR)/lib \
+    $(XLINKER)-rpath,$(CONDUIT_DIR)/lib -L$(CONDUIT_DIR)/lib \
+diff --git a/fem/conduitdatacollection.hpp b/fem/conduitdatacollection.hpp
+index 6ff1804e0..ad0a272a4 100644
+--- a/fem/conduitdatacollection.hpp
++++ b/fem/conduitdatacollection.hpp
+@@ -17,7 +17,7 @@
+ #ifdef MFEM_USE_CONDUIT
+ 
+ #include "datacollection.hpp"
+-#include <conduit.hpp>
++#include <conduit/conduit.hpp>
+ 
+ namespace mfem
+ {

packages/mfem/pachage.py

@@ -0,0 +1,13 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+from spack.package import *
+from spack.pkg.builtin.mfem import Mfem as SpackMfem
+
+
+class Mfem(SpackMfem):
+
+    patch(mfem_conduit_spack.patch)