From d6ac16ca168013acc835e4137949121a432363c8 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 10 Mar 2025 08:29:47 +0100 Subject: [PATCH] dyhidrogen: update to use oneapi packages (#49303) Signed-off-by: Massimiliano Culpo --- .../repos/builtin/packages/dihydrogen/package.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py index f89dca5c414..b077a24bb9a 100644 --- a/var/spack/repos/builtin/packages/dihydrogen/package.py +++ b/var/spack/repos/builtin/packages/dihydrogen/package.py @@ -8,33 +8,31 @@ # This is a hack to get around some deficiencies in Hydrogen. -def get_blas_entries(inspec): +def get_blas_entries(dyhidrogen_spec): entries = [] - spec = inspec["hydrogen"] + spec = dyhidrogen_spec["hydrogen"] if spec.satisfies("blas=openblas"): entries.append(cmake_cache_option("DiHydrogen_USE_OpenBLAS", True)) - elif "blas=mkl" in spec or spec.satisfies("^intel-mkl"): + elif spec.satisfies("blas=mkl"): entries.append(cmake_cache_option("DiHydrogen_USE_MKL", True)) - elif "blas=essl" in spec or spec.satisfies("^essl"): + elif spec.satisfies("blas=essl"): entries.append(cmake_cache_string("BLA_VENDOR", "IBMESSL")) # IF IBM ESSL is used it needs help finding the proper LAPACK libraries entries.append( cmake_cache_string( "LAPACK_LIBRARIES", - "%s;-llapack;-lblas" - % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), + f"{';'.join(f'-l{lib}' for lib in spec['essl'].libs.names)};-llapack;-lblas", ) ) entries.append( cmake_cache_string( "BLAS_LIBRARIES", - "%s;-lblas" - % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), + f"{';'.join(f'-l{lib}' for lib in spec['essl'].libs.names)};-lblas", ) ) elif spec.satisfies("blas=accelerate"): entries.append(cmake_cache_option("DiHydrogen_USE_ACCELERATE", True)) - elif spec.satisfies("^netlib-lapack"): + elif spec.satisfies("^[virtuals=blas,lapack] netlib-lapack"): entries.append(cmake_cache_string("BLA_VENDOR", "Generic")) return entries