hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

py-numpy: update (#8003)

Browse source 
* 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.
This commit is contained in:
Elizabeth Fischer 2018-05-03 23:53:41 -04:00 committed by Adam J. Stewart
parent 60c1e41e4c
commit d52eb8b34d
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
var/spack/repos/builtin/packages/py-numpy/package.py
View file

@ -149,8 +149,12 @@ def patch(self):
def build_args(self, spec, prefix): def build_args(self, spec, prefix):
args = [] 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'): if self.version >= Version('1.10.0'):
# 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)] args = ['-j', str(make_jobs)]
return args return args

5
var/spack/repos/builtin/packages/py-scipy/package.py
View file

@ -74,9 +74,10 @@ def build_args(self, spec, prefix):
args = [] args = []
# Build in parallel # 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 # 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)]) args.extend(['-j', str(make_jobs)])
return args return args