Bump spack in CI (#1084)

eth-cscs · Jan 19, 2024 · 56b6b2a · 56b6b2a
1 parent f60f526
commit 56b6b2a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/ci/common-ci.yml b/ci/common-ci.yml
@@ -34,7 +34,7 @@ stages:
     reports:
       dotenv: build.env
   variables:
-    SPACK_SHA: 7d8100c63f16e7d65a6819c38911a5f2b66819c9 # alby/fix-intel-oneapi-mkl-threading
+    SPACK_SHA: ce81175cf30ce31b769c03561b0123de6e9e7cc4
     SPACK_DLAF_REPO: ./spack
     DOCKER_BUILD_ARGS: '[
         "BASE_IMAGE",

diff --git a/spack/packages/dla-future/package.py b/spack/packages/dla-future/package.py
@@ -58,9 +58,6 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage):
 
     conflicts("intel-oneapi-mkl", when="@:0.3")
 
-    # https://github.com/spack/spack/issues/42084
-    conflicts("netlib-scalapack", when="^[virtuals=lapack] intel-oneapi-mkl")
-
     depends_on("umpire~examples")
     depends_on("umpire~cuda", when="~cuda")
     depends_on("umpire~rocm", when="~rocm")