Use spack's 1.0 release branch and separate spack-packages repo in CI

ci/ci-ext-custom.yml

@@ -14,6 +14,8 @@ include:
   extends: .container-runner-eiger
   variables:
     SLURM_CONSTRAINT: mc
+    # Need to reset as remote adds SLURM_MPI_TYPE: pmi2
+    SLURM_MPI_TYPE: cray_shasta
 
 .dlaf-container-runner-daint-gh200:
   extends: .container-runner-daint-gh200

ci/common-ci.yml

@@ -30,10 +30,12 @@ variables:
     - TAG_APTGET=`echo ${EXTRA_APTGET} | sha256sum - | head -c 6`
     - TAG_COMPILER=`echo ${COMPILER}_CXX${CXXSTD} | sed 's/[@]//g'`
     - TAG_DOCKERFILE=`sha256sum $DOCKERFILE | head -c 12`
-    - TAG_SPACK=`echo $SPACK_SHA | sed "s/develop-//g" | head -c 16`
+    - TAG_SPACK=`echo $SPACK_SHA | sed "s/develop-//g" | head -c 8`
+    - TAG_SPACK_PACKAGES=`echo $SPACK_PACKAGES_SHA | sed "s/develop-//g" | head -c 8`
+    - TAG_ALPS_CLUSTER_CONFIG=`echo $ALPS_CLUSTER_CONFIG_SHA | head -c 8`
     - TAG_REPO=`find $SPACK_DLAF_REPO -type f -exec sha256sum {} \; | sha256sum - | head -c 12`
     - TAG_ENVIRONMENT=`cat $SPACK_ENVIRONMENT $COMMON_SPACK_ENVIRONMENT | sha256sum | head -c 12`
-    - TAG=${TAG_IMAGE}-${TAG_APTGET}-${TAG_COMPILER}-MKL${USE_MKL}-${TAG_DOCKERFILE}-${TAG_SPACK}-${TAG_REPO}-${TAG_ENVIRONMENT}
+    - TAG=${TAG_IMAGE}-${TAG_APTGET}-${TAG_COMPILER}-MKL${USE_MKL}-${TAG_DOCKERFILE}-${TAG_SPACK}-${TAG_SPACK_PACKAGES}-${TAG_ALPS_CLUSTER_CONFIG}-${TAG_REPO}-${TAG_ENVIRONMENT}
     - export PERSIST_IMAGE_NAME=$DEPS_IMAGE:$TAG
     - echo "DEPS_IMAGE=$PERSIST_IMAGE_NAME" > build.env
     - echo "USE_MKL=$USE_MKL" >> build.env
@@ -44,11 +46,15 @@ variables:
     reports:
       dotenv: build.env
   variables:
-    SPACK_SHA: develop-2025-02-09
+    SPACK_SHA: fbadf557433ae3d8cb8a2b63a81303de42a9fd6f
+    SPACK_PACKAGES_SHA: bf71e784ba28818a05468ce4ffef405fa7c3d151
+    ALPS_CLUSTER_CONFIG_SHA: 3c26eb25bdfa3151b637c040154a55bb9da31ba1
     SPACK_DLAF_REPO: ./spack
     DOCKER_BUILD_ARGS: '[
         "BASE_IMAGE",
         "SPACK_SHA",
+        "SPACK_PACKAGES_SHA",
+        "ALPS_CLUSTER_CONFIG_SHA",
         "EXTRA_APTGET",
         "COMPILER",
         "CXXSTD",

ci/cpu/asan_ubsan_lsan.yml

@@ -14,7 +14,7 @@ cpu asan ubsan lsan deps:
   extends: .build_deps_common
   variables:
     EXTRA_APTGET: "clang-18 libclang-rt-18-dev libomp-18-dev llvm-18"
-    COMPILER: clang@18
+    COMPILER: llvm@18
     SPACK_ENVIRONMENT: ci/docker/asan-ubsan-lsan.yaml
     USE_MKL: "ON"
     DEPS_IMAGE: $CSCS_REGISTRY_PATH/cpu-asan-ubsan-lsan/deps

ci/cpu/clang15_release.yml

@@ -14,7 +14,7 @@ cpu clang15 release deps:
   extends: .build_deps_common
   variables:
     EXTRA_APTGET: "clang-15"
-    COMPILER: clang@15
+    COMPILER: llvm@15
     SPACK_ENVIRONMENT: ci/docker/release-cpu-serial.yaml
     USE_MKL: "ON"
     DEPS_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang15-release/deps

ci/cpu/clang15_release_cxx20.yml

@@ -14,7 +14,7 @@ cpu clang15 cxx20 release deps:
   extends: .build_deps_common
   variables:
     EXTRA_APTGET: "clang-15 libomp-15-dev"
-    COMPILER: clang@15
+    COMPILER: llvm@15
     CXXSTD: 20
     SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml
     USE_MKL: "ON"

ci/cpu/clang15_release_stdexec.yml

@@ -14,7 +14,7 @@ cpu clang15 stdexec release deps:
   extends: .build_deps_common
   variables:
     EXTRA_APTGET: "clang-15 libomp-15-dev"
-    COMPILER: clang@15
+    COMPILER: llvm@15
     CXXSTD: 20
     SPACK_ENVIRONMENT: ci/docker/release-cpu-stdexec.yaml
     USE_MKL: "ON"

ci/cpu/clang16_release.yml

@@ -14,7 +14,7 @@ cpu clang16 release deps:
   extends: .build_deps_common
   variables:
     EXTRA_APTGET: "clang-16 libomp-16-dev"
-    COMPILER: clang@16
+    COMPILER: llvm@16
     SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml
     USE_MKL: "ON"
     DEPS_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang16-release/deps

ci/cpu/clang18_release.yml

@@ -14,7 +14,7 @@ cpu clang18 release deps:
   extends: .build_deps_common
   variables:
     EXTRA_APTGET: "clang-18 libomp-18-dev"
-    COMPILER: clang@18
+    COMPILER: llvm@18
     SPACK_ENVIRONMENT: ci/docker/release-cpu.yaml
     USE_MKL: "ON"
     DEPS_IMAGE: $CSCS_REGISTRY_PATH/cpu-clang18-release/deps

ci/cpu/gcc13_codecov.yml

@@ -16,7 +16,8 @@ cpu gcc13 codecov deps:
     COMPILER: gcc@13
     SPACK_ENVIRONMENT: ci/docker/debug-cpu.yaml
     DEPS_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc13-codecov/deps
-    USE_CODECOV: "true"
+    # https://github.com/eth-cscs/DLA-Future/pull/1311
+    # USE_CODECOV: "true"
 
 cpu gcc13 codecov build:
   extends:

ci/docker/build.Dockerfile

@@ -33,31 +33,25 @@ RUN apt-get -yqq update && \
     ${EXTRA_APTGET} && \
     rm -rf /var/lib/apt/lists/*
 
-# Install MKL and remove static libs (to keep image smaller)
-ARG USE_MKL=ON
-ARG MKL_VERSION=2024.0
-ARG MKL_SPEC=2024.0.0
-RUN if [ "$USE_MKL" = "ON" ]; then \
-      wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB 2>/dev/null > /etc/apt/trusted.gpg.d/intel.asc  && \
-      apt-add-repository 'deb https://apt.repos.intel.com/oneapi all main' && \
-      apt-get install -y -qq --no-install-recommends intel-oneapi-mkl-devel-${MKL_VERSION} && \
-      rm -rf /var/lib/apt/lists/* && \
-      find "/opt/intel/oneapi" -name "*.a" -delete ; \
-    fi
-
-# This is the spack version we want to have
+# These are the versions of spack and spack-packages we want to have
 ARG SPACK_SHA
 ENV SPACK_SHA=$SPACK_SHA
+ARG SPACK_PACKAGES_SHA
+ENV SPACK_PACKAGES_SHA=$SPACK_PACKAGES_SHA
 
 # Install the specific ref of Spack provided by the user and find compilers
 RUN mkdir -p /opt/spack && \
-    curl -Ls "https://api.github.com/repos/spack/spack/tarball/$SPACK_SHA" | tar --strip-components=1 -xz -C /opt/spack
+    curl -Ls "https://api.github.com/repos/spack/spack/tarball/$SPACK_SHA" | tar --strip-components=1 -xz -C /opt/spack && \
+    mkdir -p /opt/spack-packages && \
+    curl -Ls "https://api.github.com/repos/spack/spack-packages/tarball/$SPACK_PACKAGES_SHA" | tar --strip-components=1 -xz -C /opt/spack-packages
+RUN spack repo add --scope site /opt/spack-packages/repos/spack_repo/builtin
 
-# Find compilers + Add gfortran to clang specs + Define which compiler we want to use
+# Find compilers + Define which compiler we want to use
 ARG COMPILER
-RUN spack compiler find && \
-    gawk -i inplace '$0 ~ "compiler:" {flag=0} $0 ~ "spec:.*clang" {flag=1} flag == 1 && $1 ~ "^f[c7]" && $2 ~ "null" {gsub("null","/usr/bin/gfortran",$0)} {print $0}' /root/.spack/linux/compilers.yaml && \
-    spack config add "packages:all:require:[\"%${COMPILER}\"]"
+RUN spack external find gcc llvm && \
+    spack config add "packages:cxx:require:'${COMPILER}'" && \
+    spack config add "packages:c:require:'${COMPILER}'" && \
+    spack config add "packages:fortran:require:gcc"
 
 RUN spack external find \
     autoconf \
@@ -74,10 +68,7 @@ RUN spack external find \
     perl \
     pkg-config \
     python \
-    xz && \
-    if [ "$USE_MKL" = "ON" ]; then \
-      echo -e "  intel-oneapi-mkl:\n    externals:\n    - spec: \"intel-oneapi-mkl@$MKL_SPEC mpi_family=mpich\"\n      prefix: /opt/intel/oneapi\n    buildable: False" >> ~/.spack/packages.yaml ; \
-    fi
+    xz
 
 # Add our custom spack repo from here
 ARG SPACK_DLAF_REPO
@@ -86,10 +77,12 @@ COPY $SPACK_DLAF_REPO /user_repo
 RUN spack repo add --scope site /user_repo
 
 ### Workaround until CE provides full MPI substitution.
-# Add ~/site/repo if it exists in the base image
-RUN if [ -d ~/site/repo ]; then \
-      spack repo add --scope site ~/site/repo; \
-    fi
+ARG ALPS_CLUSTER_CONFIG_SHA
+ENV ALPS_CLUSTER_CONFIG_SHA=$ALPS_CLUSTER_CONFIG_SHA
+RUN mkdir -p /opt/alps-cluster-config && \
+    curl -Ls "https://api.github.com/repos/eth-cscs/alps-cluster-config/tarball/$ALPS_CLUSTER_CONFIG_SHA" | \
+    tar --strip-components=1 -xz -C /opt/alps-cluster-config && \
+    spack repo add --scope site /opt/alps-cluster-config/site/spack_repo/alps
 
 # Set this to a spack.yaml file which contains a spec
 # e.g. --build-arg SPACK_ENVIRONMENT=ci/spack/my-env.yaml

ci/docker/common-amdgpu.yaml

@@ -22,24 +22,31 @@ packages:
   mpi:
     ### Workaround until CE provides full MPI substitution.
     require: 'cray-mpich'
+  xpmem:
+    require:
+      - '~kernel-module'
+  cray-gtl:
+    buildable: True
+  cray-mpich:
+    buildable: True
+  cray-pals:
+    buildable: True
+  cray-pmi:
+    buildable: True
   blaspp:
     variants:
       - '~cuda'
       - '~openmp'
       - '~rocm'
   intel-oneapi-mkl:
     require:
-      - 'threads=openmp'
+      - 'threads=none'
   openblas:
     variants:
       - 'threads=openmp'
-  openssl:
-    # without version spack concretizes openssl@3.3.1 that doesn't build due to deprecation
-    require:
-      - '@3.3.2'
   libfabric:
     require:
-      - '@1.15.2'
+      - '@1.22.0'
   hwloc:
     variants:
       - '~libxml2'

ci/docker/common-gh200.yaml

@@ -24,6 +24,17 @@ packages:
   mpi:
     ### Workaround until CE provides full MPI substitution.
     require: 'cray-mpich'
+  xpmem:
+    require:
+      - '~kernel-module'
+  cray-gtl:
+    buildable: True
+  cray-mpich:
+    buildable: True
+  cray-pals:
+    buildable: True
+  cray-pmi:
+    buildable: True
   blaspp:
     variants:
       - '~cuda'
@@ -38,14 +49,10 @@ packages:
   openblas:
     variants:
       - 'threads=openmp'
-  openssl:
-    # without version spack concretizes openssl@3.3.1 that doesn't build due to deprecation
-    require:
-      - '@3.3.2'
   libfabric:
     # Fix version to be compatible with version on todi
     require:
-      - '@1.15.2'
+      - '@1.22.0'
   hwloc:
     variants:
       - '~libxml2'