.gitignore

@@ -1,2 +0,0 @@
-environments/*/.spack-env/
-repos/*/packages/*/__pycache__/

config-hlrs/packages.yaml

@@ -5,9 +5,8 @@ packages:
       blas: [cray-libsci]
       lapack: [cray-libsci]
       scalapack: [cray-libsci]
-      fftw-api: [cray-fftw]
-      pkgconfig: [pkg-config]
-      zlib-api: [zlib-ng+compat]
+      pkgconf: [pkg-config]
+      zlib-ng: [zlib]
   cray-mpich:
     externals:
     - spec: cray-mpich@8.1.30%gcc
@@ -35,68 +34,6 @@ packages:
       modules:
       - cray-libsci/24.03.0
     buildable: false
-  fftw:
-    externals:
-    - spec: fftw@3.3.10.7
-      prefix: /opt/cray/pe/fftw/3.3.10.7/x86_64
-      modules:
-      - cray-fftw/3.3.10.7
-    buildable: false
-  hdf5:
-    externals:
-    - spec: hdf5@1.14.3.1%cce
-      prefix: /opt/cray/pe/hdf5/1.14.3.1/cray/18.0
-      modules:
-      - cray-hdf5/1.14.3.1
-    - spec: hdf5@1.14.3.1%gcc
-      prefix: /opt/cray/pe/hdf5/1.14.3.1/gnu/12.3
-      modules:
-      - cray-hdf5/1.14.3.1      
-    buildable: false
-  netcdf-c:
-    externals:
-    - spec: netcdf-c@4.9.0.13%cce
-      prefix: /opt/cray/pe/netcdf/4.9.0.13/crayclang/18.0
-      modules:
-      - cray-netcdf/4.9.0.13
-    - spec: netcdf-c@4.9.0.13%gcc
-      prefix: /opt/cray/pe/netcdf/4.9.0.13/gnu/12.3
-      modules:
-      - cray-netcdf/4.9.0.13
-    buildable: false
-  netcdf-cxx4:
-    externals:
-    - spec: netcdf-cxx4@4.9.0.13%cce
-      prefix: /opt/cray/pe/netcdf/4.9.0.13/crayclang/18.0
-      modules:
-      - cray-netcdf/4.9.0.13
-    - spec: netcdf-cxx4@4.9.0.13%gcc
-      prefix: /opt/cray/pe/netcdf/4.9.0.13/gnu/12.3
-      modules:
-      - cray-netcdf/4.9.0.13  
-    buildable: false
-  netcdf-fortran:
-    externals:
-    - spec: netcdf-fortran@4.9.0.13%cce
-      prefix: /opt/cray/pe/netcdf/4.9.0.13/crayclang/18.0
-      modules:
-      - cray-netcdf/4.9.0.13
-    - spec: netcdf-fortran@4.9.0.13%gcc
-      prefix: /opt/cray/pe/netcdf/4.9.0.13/gnu/12.3
-      modules:
-      - cray-netcdf/4.9.0.13
-    buildable: false
-  parallel-netcdf:
-    externals:
-    - spec: parallel-netcdf@1.12.3.13%cce
-      prefix: /opt/cray/pe/parallel-netcdf/1.12.3.13/crayclang/18.0
-      modules:
-      - cray-parallel-netcdf/1.12.3.13
-    - spec: parallel-netcdf@1.12.3.13%gcc
-      prefix: /opt/cray/pe/parallel-netcdf/1.12.3.13/gnu/12.3
-      modules:
-      - cray-parallel-netcdf/1.12.3.13
-    buildable: false
 # Packages which have not been discovered by spack external find 
 # and packages which are not in the OS image but low-level.
 # Declare libs as externals only if a -devel OS package is installed
@@ -111,7 +48,9 @@ packages:
       prefix: /usr
     buildable: false
   libxml2:
-    require: '%gcc@7.5'
+    externals:
+    - spec: libxml2@2.9.14
+    buildable: false
   libdwarf:
     require: '%gcc@7.5'
   zstd:
@@ -120,23 +59,6 @@ packages:
     require: '%gcc@7.5'
   zlib-ng:
     require: '%gcc@7.5'
-  xz:
-    require: '%gcc@7.5'
-  binutils:
-    require:
-      - '%gcc@7.5'
-      - '+libiberty' 
-# Some basic python packages which are part of the OS python
-  py-pip:
-    externals:
-    - spec: py-pip@20.0.2
-      prefix: /usr
-    buildable: false
-  py-setuptools:
-    externals:
-    - spec: py-setuptools@44.1.1
-      prefix: /usr
-    buildable: false
 # packages which have been discovered by spack external find --all
   python:
     externals:
@@ -178,6 +100,11 @@ packages:
     - spec: openjdk@11.0.19_0-suse-150000.3.96.1-x8664
       prefix: /usr
     buildable: false
+  binutils:
+    externals:
+    - spec: binutils@2.39.0
+      prefix: /usr
+    buildable: false
   zip:
     externals:
     - spec: zip@3.0
@@ -193,6 +120,11 @@ packages:
     - spec: subversion@1.14.1
       prefix: /usr
     buildable: false
+  xz:
+    externals:
+    - spec: xz@5.2.3
+      prefix: /usr
+    buildable: false
   lustre:
     externals:
     - spec: lustre@2.15.0.7_rc2_cray_25_ga33b7d9
@@ -344,11 +276,10 @@ packages:
       prefix: /usr
     buildable: false
   sqlite:
-    require: '%gcc@7.5'
-#    externals:
-#    - spec: sqlite@3.39.3+fts~functions+rtree  # does not provide include files
-#      prefix: /usr
-#    buildable: false
+    externals:
+    - spec: sqlite@3.39.3+fts~functions+rtree
+      prefix: /usr
+    buildable: false
   findutils:
     externals:
     - spec: findutils@4.8.0

environments/hlrs/spack.yaml

@@ -1,9 +1,8 @@
 # This is a Spack Environment file fot he main HLRS software stack
 spack:
-  definitions:
-    - core_compiler: [gcc@7.5]
-    - compilers: [gcc@13.2, cce@18.0]
-    - mpis: [cray-mpich@8.1.30]
+#  definitions:
+#    core_compiler: [gcc@7.5]
+#    compilers: [gcc@13.2, cce@18.0]    
 #  packages:
 #    all:
 #      compiler: [gcc@13.2, cce@18.0]
@@ -11,12 +10,13 @@ spack:
   specs:
     - matrix:    # modules for low-level tools
       - [libunwind, papi]
-      - [$%core_compiler]
+      - ['%gcc@7.5']
+#      - [$%core_compiler]
     - matrix:
       - [mpip, extrae]
-      - ['cflags="-Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=int-conversion"']
-      - [$^mpis]
-      - [$%compilers]
+      - ['cflags="-Wno-error=implicit-function-declaration -Wno-error=implicit-int"']
+      - [^mpi]
+      - ['%gcc@13.2', '%cce@18.0'] 
   view: false
   concretizer:
     unify: when_possible