From 5d8ca81e82cb74e1353fa0a11f8a5a2bba29ebc2 Mon Sep 17 00:00:00 2001 From: Annop Wongwathanarat Date: Tue, 18 Apr 2023 17:08:29 +0100 Subject: [PATCH] py-scipy: link with OpenMP version of armpl-gcc when requested (#37002) --- .../repos/builtin/packages/py-scipy/package.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index a094b0d280..f882d413e0 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -203,10 +203,16 @@ def install(self, spec, prefix): lapack = "mkl-dynamic-lp64-seq" if spec["blas"].name in ["blis", "amdblis"]: blas = "blis" - if blas == "armpl": - blas += "-dynamic-lp64-seq" - if lapack == "armpl": - lapack += "-dynamic-lp64-seq" + if "armpl" in blas: + if "_mp" in blas: + blas = "armpl-dynamic-lp64-omp" + else: + blas = "armpl-dynamic-lp64-seq" + if "armpl" in lapack: + if "_mp" in lapack: + lapack = "armpl-dynamic-lp64-omp" + else: + lapack = "armpl-dynamic-lp64-seq" args = [ "setup",