FIX: forgotten libfabric@1.15.2.0

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

@@ -1,4 +1,3 @@
----
 spack:
   concretizer:
     unify: false
@@ -8,15 +7,16 @@ 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
-  include_concrete:
-    - /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/testing
+  - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
+  #include_concrete:
+  #- /afs/psi.ch/sys/spack/spack-psi/env/rhel8/x86_64/admin/testing
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:
     default:
       roots:
         tcl: $spack/opt/spack/testing/modulefiles
-  specs: []
+  specs:
+  - opencv
   view: false

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

@@ -12,6 +12,7 @@ spack:
       - ffbidx@main/vyjua6z
       - sratoolkit@3.1.1/2szh2jy
       - star@2.7.11a/icumpki
+      - opencv@4.10.0/7fjszca
     - gcc_12.3.0_openmpi:
       - cp2k@2024.1/2bayb45 # ~cuda
       - cp2k@2024.1/exkrpix # +cuda

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

@@ -24,11 +24,11 @@ spack:
         cray-mpich:
           environment:
             set:
-              SLURM_MPI_TYPE: 'pmix'
+              SLURM_MPI_TYPE: pmix
         openmpi:
           environment:
             set:
-              SLURM_MPI_TYPE: 'pmix'
+              SLURM_MPI_TYPE: pmix
               OMPI_MCA_mtl_ofi_disable_hmem: 'true'
         openmpi@main:
           environment:

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

@@ -36,6 +36,7 @@ spack:
     - py-torchaudio@2.5.1/trrglyu
   - nvhpc_24.11_openmpi:
     - quantum-espresso@7.4/oed4w6w  #+cuda +mpigpu hdf5=parallel
+    - quantum-espresso@7.3.1/d5wpqzw
   include:
   - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
   - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
@@ -90,8 +91,52 @@ spack:
     - [$gcc_13.2_openmpi]
     - ['%gcc@13.2']
     - [^openmpi]
+  - matrix:
+    - [$gcc_14.2_openmpi]
+    - ['%gcc@14.2']
+    - [^openmpi]
   - matrix:
     - [$nvhpc_24.11_openmpi]
     - ['%nvhpc@24.11']
     - [^openmpi]
   view: false
+  compilers:
+  - compiler:
+      spec: gcc@=14.2.0
+      paths:
+        cc: /afs/psi.ch/sys/spack/develop/opt/spack/unstable/linux-sles15-aarch64/gcc-7.5.0/gcc-14.2.0-tln2ck4lolcipi2fj2klu5dei3oac4sv/bin/gcc
+        cxx: /afs/psi.ch/sys/spack/develop/opt/spack/unstable/linux-sles15-aarch64/gcc-7.5.0/gcc-14.2.0-tln2ck4lolcipi2fj2klu5dei3oac4sv/bin/g++
+        f77: /afs/psi.ch/sys/spack/develop/opt/spack/unstable/linux-sles15-aarch64/gcc-7.5.0/gcc-14.2.0-tln2ck4lolcipi2fj2klu5dei3oac4sv/bin/gfortran
+        fc: /afs/psi.ch/sys/spack/develop/opt/spack/unstable/linux-sles15-aarch64/gcc-7.5.0/gcc-14.2.0-tln2ck4lolcipi2fj2klu5dei3oac4sv/bin/gfortran
+      flags: {}
+      operating_system: sles15
+      target: aarch64
+      modules: []
+      environment: {}
+      extra_rpaths: []
+  - compiler:
+      spec: gcc@=7.5.0
+      paths:
+        cc: /usr/bin/gcc
+        cxx: /usr/bin/g++
+        f77: /usr/bin/gfortran
+        fc: /usr/bin/gfortran
+      flags: {}
+      operating_system: sles15
+      target: aarch64
+      modules: []
+      environment: {}
+      extra_rpaths: []
+  - compiler:
+      spec: gcc@=12.3.0
+      paths:
+        cc: /usr/bin/gcc-12
+        cxx: /usr/bin/g++-12
+        f77: /usr/bin/gfortran-12
+        fc: /usr/bin/gfortran-12
+      flags: {}
+      operating_system: sles15
+      target: aarch64
+      modules: []
+      environment: {}
+      extra_rpaths: []

env/sles15/aarch64/sysconfigs/packages.yaml

@@ -32,7 +32,10 @@ packages:
   cce:
     externals:
       - modules:
+<<<<<<< Updated upstream
         - libfabric/1.22.0
+=======
+>>>>>>> Stashed changes
         - PrgEnv-cray/8.5.0
         - cce/17.0.0
         spec: cce@=17.0.0
@@ -161,9 +164,9 @@ packages:
     buildable: true
     externals:
       - modules:
-          - libfabric/1.22.0
+          - libfabric/1.22.0 
         prefix: /opt/cray/libfabric/1.22.0
-        spec: libfabric@1.15.2.0
+        spec: libfabric@1.22.0
   libiconv:
     require: '%gcc@7.5.0'
   libidn2:

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

@@ -36,7 +36,7 @@ spack:
           environment:
             set:
               SLURM_MPI_TYPE: 'pmix'
-              LD_LIBRARY_PATH: /opt/cray/libfabric/1.22.0/lib64
+              LD_LIBRARY_PATH: '/opt/cray/libfabric/1.22.0/lib64'
         openmpi:
           environment:
             set:

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

@@ -10,7 +10,7 @@ spack:
   - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
   - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
   include_concrete:
-    - /afs/psi.ch/sys/spack/spack-psi/env/sles15/aarch64/admin/testing
+  - /afs/psi.ch/sys/spack/spack-psi/env/sles15/aarch64/admin/testing
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:
@@ -26,7 +26,8 @@ spack:
         openmpi:
           environment:
             set:
-              SLURM_MPI_TYPE: 'pmix'
+              SLURM_MPI_TYPE: pmix
               OMPI_MCA_mtl_ofi_disable_hmem: 'true'
-  specs: []
+  specs:
+  - 
   view: false

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

@@ -23,6 +23,7 @@ spack:
     - sratoolkit@3.1.1/7oqp6a3
   - gcc_13.2:
     - dmtcp@3.0.0/e76t6c5
+    - gams@49.1/vztjqs4
   - gcc_12.3_mpich:
     - cp2k@2024.1/2jesise     #~cuda
     - cp2k@2024.1/zqm5fme     #+cuda

env/sles15/x86_64/sysconfigs/packages.yaml

@@ -152,12 +152,12 @@ packages:
     require: '%gcc@7.5.0'
   # Crayism
   libfabric:
-    buildable: false
+    buildable: true
     externals:
       - modules:
           - libfabric/1.22.0
         prefix: /opt/cray/libfabric/1.22.0
-        spec: libfabric@1.15.2.0
+        spec: libfabric@1.22.0
   libiconv:
     require: '%gcc@7.5.0'
   libidn2:

packages/gams/package.py

@@ -11,3 +11,4 @@ from spack.pkg.builtin.gams import Gams as SpackGams
 
 class Gams(SpackGams):
     version("48.1", md5="5a59a973edfc4e3170b9535760593d62", expand=False)
+    version("49.1", md5="bc9b82d015c9672f8c153003c7a5dd2a", expand=False)