diff options
| author | Daryl W. Grunau <DarylGrunau@gmail.com> | 2023-08-26 07:44:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-26 08:44:57 -0500 |
| commit | b370ecfbdae97507209e2b23914ae3834a3bb090 (patch) | |
| tree | 144819101fb7700b74f3f96b8362b6de03b2e868 | |
| parent | 04d55b7600ef956c5f0bcd368af8b7d5d313ce97 (diff) | |
| download | spack-b370ecfbdae97507209e2b23914ae3834a3bb090.tar.gz spack-b370ecfbdae97507209e2b23914ae3834a3bb090.tar.bz2 spack-b370ecfbdae97507209e2b23914ae3834a3bb090.tar.xz spack-b370ecfbdae97507209e2b23914ae3834a3bb090.zip | |
py-scipy: re-apply scipy/scipy#14935 workaround (#39555)
* re-apply scipy/scipy#14935 workaround
* restrict to %intel and eliminate Version() check
---------
Co-authored-by: Daryl W. Grunau <dwg@lanl.gov>
| -rw-r--r-- | var/spack/repos/builtin/packages/py-scipy/package.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 58f19f8621..36e84550ba 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -193,9 +193,8 @@ class PyScipy(PythonPackage): env.set("NPY_DISTUTILS_APPEND_FLAGS", "1") # https://github.com/scipy/scipy/issues/14935 - if self.spec.satisfies("%intel ^py-pythran") or self.spec.satisfies("%oneapi ^py-pythran"): - if self.spec["py-pythran"].version < Version("0.12"): - env.set("SCIPY_USE_PYTHRAN", "0") + if self.spec.satisfies("%intel ^py-pythran"): + env.set("SCIPY_USE_PYTHRAN", "0") # Pick up BLAS/LAPACK from numpy if self.spec.satisfies("@:1.8"): |