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

Fix condition to enable mpi4py. (#11707)

Browse Source 
* Fix condition to enable mpi4py.

* flake8

* Catalyst as paraview for mpi4py.

* Catalyst needs numpy and mpi4py.

* Remove leftover enable python.
This commit is contained in:
Dan Lipsa 2019-06-17 09:30:29 -04:00 committed by Chuck Atkins
parent 6e067a05c7
commit 83c7959580
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
var/spack/repos/builtin/packages/catalyst/package.py
View File

@ -60,6 +60,12 @@ class Catalyst(CMakePackage):
depends_on('mpi') depends_on('mpi')
depends_on('python@2.7:2.8', when='+python', type=('build', 'link', 'run')) depends_on('python@2.7:2.8', when='+python', type=('build', 'link', 'run'))
depends_on('python@3:', when='+python3', type=('build', 'link', 'run')) depends_on('python@3:', when='+python3', type=('build', 'link', 'run'))
depends_on('py-numpy', when='+python', type=('build', 'run'))
depends_on('py-numpy', when='+python3', type=('build', 'run'))
depends_on('py-mpi4py', when='+python+mpi', type=('build', 'run'))
depends_on('py-mpi4py', when='+python3+mpi', type=('build', 'run'))
depends_on('gl@3.2:', when='+rendering') depends_on('gl@3.2:', when='+rendering')
depends_on('mesa+osmesa', when='+rendering+osmesa') depends_on('mesa+osmesa', when='+rendering+osmesa')
depends_on('glx', when='+rendering~osmesa') depends_on('glx', when='+rendering~osmesa')
@ -206,12 +212,17 @@ def nvariant_bool(feature):
'-DVTK_USE_X:BOOL=%s' % nvariant_bool('+osmesa'), '-DVTK_USE_X:BOOL=%s' % nvariant_bool('+osmesa'),
'-DVTK_USE_OFFSCREEN:BOOL=%s' % variant_bool('+osmesa'), '-DVTK_USE_OFFSCREEN:BOOL=%s' % variant_bool('+osmesa'),
'-DVTK_OPENGL_HAS_OSMESA:BOOL=%s' % variant_bool('+osmesa'), '-DVTK_OPENGL_HAS_OSMESA:BOOL=%s' % variant_bool('+osmesa'),
'-DPARAVIEW_ENABLE_PYTHON:BOOL=%s' % variant_bool('+python')
] ]
if '+python' in spec or '+python3' in spec: if '+python' in spec or '+python3' in spec:
cmake_args.append( cmake_args.extend([
'-DPARAVIEW_ENABLE_PYTHON:BOOL=ON',
'-DPYTHON_EXECUTABLE:FILEPATH=%s' % '-DPYTHON_EXECUTABLE:FILEPATH=%s' %
spec['python'].command.path) spec['python'].command.path,
'-DVTK_USE_SYSTEM_MPI4PY:BOOL=%s' % variant_bool('+mpi')
])
else:
cmake_args.append('-DPARAVIEW_ENABLE_PYTHON:BOOL=OFF')
return cmake_args return cmake_args
def cmake(self, spec, prefix): def cmake(self, spec, prefix):

7
var/spack/repos/builtin/packages/paraview/package.py
View File

@ -193,7 +193,6 @@ def nvariant_bool(feature):
'-DVTK_USE_SYSTEM_HDF5:BOOL=%s' % variant_bool('+hdf5'), '-DVTK_USE_SYSTEM_HDF5:BOOL=%s' % variant_bool('+hdf5'),
'-DVTK_USE_SYSTEM_JPEG:BOOL=ON', '-DVTK_USE_SYSTEM_JPEG:BOOL=ON',
'-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON', '-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON',
'-DVTK_USE_SYSTEM_MPI4PY:BOOL=%s' % variant_bool('+python+mpi'),
'-DVTK_USE_SYSTEM_NETCDF:BOOL=ON', '-DVTK_USE_SYSTEM_NETCDF:BOOL=ON',
'-DVTK_USE_SYSTEM_EXPAT:BOOL=ON', '-DVTK_USE_SYSTEM_EXPAT:BOOL=ON',
'-DVTK_USE_SYSTEM_TIFF:BOOL=ON', '-DVTK_USE_SYSTEM_TIFF:BOOL=ON',
@ -211,8 +210,12 @@ def nvariant_bool(feature):
if '+python' in spec or '+python3' in spec: if '+python' in spec or '+python3' in spec:
cmake_args.extend([ cmake_args.extend([
'-DPARAVIEW_ENABLE_PYTHON:BOOL=ON', '-DPARAVIEW_ENABLE_PYTHON:BOOL=ON',
'-DPYTHON_EXECUTABLE:FILEPATH=%s' % spec['python'].command.path '-DPYTHON_EXECUTABLE:FILEPATH=%s' %
spec['python'].command.path,
'-DVTK_USE_SYSTEM_MPI4PY:BOOL=%s' % variant_bool('+mpi')
]) ])
else:
cmake_args.append('-DPARAVIEW_ENABLE_PYTHON:BOOL=OFF')
if '+mpi' in spec: if '+mpi' in spec:
cmake_args.extend([ cmake_args.extend([