zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py-scipy: re-apply scipy/scipy#14935 workaround (#39555)

Browse Source 
* re-apply scipy/scipy#14935 workaround

* restrict to %intel and eliminate Version() check

---------

Co-authored-by: Daryl W. Grunau <dwg@lanl.gov>
This commit is contained in:
Daryl W. Grunau
2023-08-26 07:44:57 -06:00
committed by GitHub
parent 04d55b7600
commit b370ecfbda
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/py-scipy/package.py
View File

@@ -193,8 +193,7 @@ def setup_build_environment(self, env):
env.set("NPY_DISTUTILS_APPEND_FLAGS", "1") env.set("NPY_DISTUTILS_APPEND_FLAGS", "1")
# https://github.com/scipy/scipy/issues/14935 # https://github.com/scipy/scipy/issues/14935
if self.spec.satisfies("%intel ^py-pythran") or self.spec.satisfies("%oneapi ^py-pythran"): if self.spec.satisfies("%intel ^py-pythran"):
if self.spec["py-pythran"].version < Version("0.12"):
env.set("SCIPY_USE_PYTHRAN", "0") env.set("SCIPY_USE_PYTHRAN", "0")
# Pick up BLAS/LAPACK from numpy # Pick up BLAS/LAPACK from numpy