From e5c7fe87aa07e17a98e5c9633280a91f5134dd20 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 13 Mar 2025 03:26:47 +0100 Subject: [PATCH] spla: update to use oneapi packages (#49435) Signed-off-by: Massimiliano Culpo --- var/spack/repos/builtin/packages/spla/package.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/spla/package.py b/var/spack/repos/builtin/packages/spla/package.py index fc2ab852c56..33eb2e1b1de 100644 --- a/var/spack/repos/builtin/packages/spla/package.py +++ b/var/spack/repos/builtin/packages/spla/package.py @@ -67,10 +67,11 @@ class Spla(CMakePackage): conflicts("^hip@6.0.0:", when="@:1.6.0 +rocm") # v1.6.1 includes fix for hip 6.0 # Propagate openmp to blas - depends_on("openblas threads=openmp", when="+openmp ^[virtuals=blas] openblas") - depends_on("amdblis threads=openmp", when="+openmp ^[virtuals=blas] amdblis") - depends_on("blis threads=openmp", when="+openmp ^[virtuals=blas] blis") - depends_on("intel-mkl threads=openmp", when="+openmp ^[virtuals=blas] intel-mkl") + with when("+openmp"): + requires("^openblas threads=openmp", when="^[virtuals=blas] openblas") + requires("^amdblis threads=openmp", when="^[virtuals=blas] amdblis") + requires("^blis threads=openmp", when="^[virtuals=blas] blis") + requires("^intel-oneapi-mkl threads=openmp", when="^[virtuals=blas] intel-oneapi-mkl") # Fix CMake find module for AMD BLIS, # which uses a different library name for the multi-threaded version @@ -100,7 +101,7 @@ def cmake_args(self): args += ["-DSPLA_HOST_BLAS=BLIS"] elif spec["blas"].name == "atlas": args += ["-DSPLA_HOST_BLAS=ATLAS"] - elif spec["blas"].name == "intel-mkl": + elif spec["blas"].name == "intel-oneapi-mkl": args += ["-DSPLA_HOST_BLAS=MKL"] elif spec["blas"].name == "netlib-lapack": args += ["-DSPLA_HOST_BLAS=GENERIC"]