diff options
| author | Elizabeth Fischer <rpf2116@columbia.edu> | 2018-05-03 23:53:41 -0400 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-05-03 22:53:41 -0500 |
| commit | d52eb8b34def086464ae857e11e4c3a25a7cef75 (patch) | |
| tree | 607847e62c3e7914543dbfb53d21b0a0fba65c1f | |
| parent | 60c1e41e4c343a053e5084312c3b7e86b526a597 (diff) | |
| download | spack-d52eb8b34def086464ae857e11e4c3a25a7cef75.tar.gz spack-d52eb8b34def086464ae857e11e4c3a25a7cef75.tar.bz2 spack-d52eb8b34def086464ae857e11e4c3a25a7cef75.tar.xz spack-d52eb8b34def086464ae857e11e4c3a25a7cef75.zip | |
py-numpy: update (#8003)
* py-numpy: update
* Better constrain when can / cannot parallel build.
* Update SciPy parallel logic to be specific to Python 3.5+, same as in Numpy.
| -rw-r--r-- | var/spack/repos/builtin/packages/py-numpy/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-scipy/package.py | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 9fd0fdf38b..42cc6be231 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -149,9 +149,13 @@ class PyNumpy(PythonPackage): def build_args(self, spec, prefix): args = [] - # From NumPy 1.10.0 on it's possible to do a parallel build + # From NumPy 1.10.0 on it's possible to do a parallel build. if self.version >= Version('1.10.0'): - args = ['-j', str(make_jobs)] + # But Parallel build in Python 3.5+ is broken. See: + # https://github.com/spack/spack/issues/7927 + # https://github.com/scipy/scipy/issues/7112 + if spec['python'].version < Version('3.5'): + args = ['-j', str(make_jobs)] return args diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index cbe23fe69d..b26ac618e7 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -74,9 +74,10 @@ class PyScipy(PythonPackage): args = [] # Build in parallel - # Known problems with Python 3 + # Known problems with Python 3.5+ + # https://github.com/spack/spack/issues/7927 # https://github.com/scipy/scipy/issues/7112 - if not spec.satisfies('^python@3:'): + if not spec.satisfies('^python@3.5:'): args.extend(['-j', str(make_jobs)]) return args |