Partial eigenspectrum (#26)

eth-cscs · Dec 6, 2024 · dcc9912 · dcc9912
1 parent 3c688bc
commit dcc9912
Show file tree

Hide file tree

Showing 7 changed files with 636 additions and 44 deletions.
diff --git a/ci/ci-common.yml b/ci/ci-common.yml
@@ -30,8 +30,8 @@ stages:
     reports:
       dotenv: build.env
   variables:
-    SPACK_SHA: 05c7ff4595a4e574cbcf45475c626b9b94c22af1
-    SPACK_BUILDCACHE: develop-2024-06-02
+    SPACK_SHA: develop-2024-12-01
+    SPACK_BUILDCACHE: develop-2024-12-01
     SPACK_DLAF_FORTRAN_REPO: ./spack
     DOCKER_BUILD_ARGS: '[
         "BASE_IMAGE",

diff --git a/ci/docker/build.Dockerfile b/ci/docker/build.Dockerfile
@@ -59,7 +59,9 @@ RUN spack external find \
 # Enable Spack build cache
 ARG SPACK_BUILDCACHE
 RUN spack mirror add ${SPACK_BUILDCACHE} https://binaries.spack.io/${SPACK_BUILDCACHE}
-RUN spack buildcache keys --install --trust --force
+RUN spack mirror add develop https://binaries.spack.io/develop && \
+    spack buildcache keys --install --trust --force && \
+    spack mirror rm develop
 
 # Add custom Spack repo
 ARG SPACK_DLAF_FORTRAN_REPO

diff --git a/ci/docker/common.yaml b/ci/docker/common.yaml
@@ -39,6 +39,9 @@ packages:
   hwloc:
     variants:
       - '~libxml2'
+  dla-future:
+    require:
+      - '@master'
   git:
     # Force git as non-buildable to allow deprecated versions in environments
     # https://github.com/spack/spack/pull/30040

diff --git a/spack/packages/dla-future-fortran/package.py b/spack/packages/dla-future-fortran/package.py
@@ -24,6 +24,10 @@ class DlaFutureFortran(CMakePackage):
     version("0.2.0", sha256="7fd3e1779c111b35f0d2701a024398b4f6e8dea4af523b6c8617d28c0b7ae61a")
     version("0.1.0", sha256="9fd8a105cbb2f3e1daf8a49910f98fce68ca0b954773dba98a91464cf2e7c1da")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+    depends_on("fortran", type="build")
+
     variant("shared", default=True, description="Build shared libraries.")
     variant("test", default=False, description="Build tests.")
 
@@ -33,6 +37,7 @@ class DlaFutureFortran(CMakePackage):
 
     depends_on("dla-future@0.4.1:0.5 +scalapack", when="@0.1.0")
     depends_on("dla-future@0.6.0: +scalapack", when="@0.2.0:")
+    depends_on("dla-future@master: +scalapack", when="@main")
     depends_on("dla-future +shared", when="+shared")
 
     depends_on("mpi", when="+test")