From 313524dc6d9b2de46b3a7c8ae94354dd07da6652 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 5 Mar 2025 19:44:37 +0100 Subject: [PATCH] qrupdate: update to use oneapi packages (#49304) Signed-off-by: Massimiliano Culpo --- .../repos/builtin/packages/qrupdate/package.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py index f06b45fd3ea..172b7c87b52 100644 --- a/var/spack/repos/builtin/packages/qrupdate/package.py +++ b/var/spack/repos/builtin/packages/qrupdate/package.py @@ -10,7 +10,8 @@ class Qrupdate(MakefilePackage, SourceforgePackage): """qrupdate is a Fortran library for fast updates of QR and - Cholesky decompositions.""" + Cholesky decompositions. + """ homepage = "https://sourceforge.net/projects/qrupdate/" sourceforge_mirror_path = "qrupdate/qrupdate-1.1.2.tar.gz" @@ -35,7 +36,7 @@ def edit(self, spec, prefix): makefile = FileFilter("Makefile") makefile.filter("make", "$(MAKE)") - # We may like to compile with any Forran compiler, not always gfortran + # We may like to compile with any Fortran compiler, not always gfortran makefile = FileFilter("Makeconf") makefile.filter("FC=gfortran", "FC ?= gfortran") @@ -45,16 +46,11 @@ def edit(self, spec, prefix): def build(self, spec, prefix): lapack_blas = spec["lapack"].libs + spec["blas"].libs - make_args = [ - "BLAS={0}".format(lapack_blas.ld_flags), - "LAPACK={0}".format(lapack_blas.ld_flags), - ] + make_args = [f"BLAS={lapack_blas.ld_flags}", f"LAPACK={lapack_blas.ld_flags}"] # If 64-bit BLAS is used: - if ( - spec.satisfies("^openblas+ilp64") - or spec.satisfies("^intel-mkl+ilp64") - or spec.satisfies("^intel-parallel-studio+mkl+ilp64") + if spec.satisfies("^[virtuals=lapack] openblas+ilp64") or spec.satisfies( + "^[virtuals=lapack] intel-oneapi-mkl+ilp64" ): if spec.satisfies("%intel") or spec.satisfies("%oneapi") or spec.satisfies("%nvhpc"): # 64bits integer for ifort and nvfortran are promoted by: