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

updates to conduit and ascent packages (#7040)

Browse source 
* Remove variants disabling blas and lapack for py-numpy, issues
  building these have been resolved
* For CMake greater than 3.10, FindMPI changed, so use
  MPIEXE_EXECUTABLE instead of MPIEXE for 3.10 and newer
This commit is contained in:
Cyrus Harrison 2018-02-12 10:20:46 -08:00 committed by scheibelp
parent ef270615f0
commit e4ba199fc1
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
var/spack/repos/builtin/packages/ascent/package.py
View file

@ -97,9 +97,7 @@ class Ascent(Package):
# causes duplicate state issues when running compiled python modules.
depends_on("python+shared")
extends("python", when="+python")
# TODO: blas and lapack are disabled due to build
# issues Cyrus experienced on OSX 10.11.6
depends_on("py-numpy~blas~lapack", when="+python", type=('build', 'run'))
depends_on("py-numpy", when="+python", type=('build', 'run'))
#######################
# MPI
@ -298,8 +296,14 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
spec['mpi'].mpifc))
mpiexe_bin = join_path(spec['mpi'].prefix.bin, 'mpiexec')
if os.path.isfile(mpiexe_bin):
cfg.write(cmake_cache_entry("MPIEXEC",
mpiexe_bin))
# starting with cmake 3.10, FindMPI expects MPIEXEC_EXECUTABLE
# vs the older versions which expect MPIEXEC
if self.spec["cmake"].satisfies('@3.10:'):
cfg.write(cmake_cache_entry("MPIEXEC_EXECUTABLE",
mpiexe_bin))
else:
cfg.write(cmake_cache_entry("MPIEXEC",
mpiexe_bin))
else:
cfg.write(cmake_cache_entry("ENABLE_MPI", "OFF"))

14
var/spack/repos/builtin/packages/conduit/package.py
View file

@ -97,9 +97,7 @@ class Conduit(Package):
# causes duplicate state issues when running compiled python modules.
depends_on("python+shared")
extends("python", when="+python")
# TODO: blas and lapack are disabled due to build
# issues Cyrus experienced on OSX 10.11.6
depends_on("py-numpy~blas~lapack", when="+python", type=('build', 'run'))
depends_on("py-numpy", when="+python", type=('build', 'run'))
#######################
# I/O Packages
@ -311,8 +309,14 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
spec['mpi'].mpifc))
mpiexe_bin = join_path(spec['mpi'].prefix.bin, 'mpiexec')
if os.path.isfile(mpiexe_bin):
cfg.write(cmake_cache_entry("MPIEXEC",
mpiexe_bin))
# starting with cmake 3.10, FindMPI expects MPIEXEC_EXECUTABLE
# vs the older versions which expect MPIEXEC
if self.spec["cmake"].satisfies('@3.10:'):
cfg.write(cmake_cache_entry("MPIEXEC_EXECUTABLE",
mpiexe_bin))
else:
cfg.write(cmake_cache_entry("MPIEXEC",
mpiexe_bin))
else:
cfg.write(cmake_cache_entry("ENABLE_MPI", "OFF"))