diff options
| author | Cyrus Harrison <cyrush@llnl.gov> | 2018-02-12 10:20:46 -0800 |
|---|---|---|
| committer | scheibelp <scheibel1@llnl.gov> | 2018-02-12 10:20:46 -0800 |
| commit | e4ba199fc1d16c28ee1400da12f3c070404f8cdc (patch) | |
| tree | d612b28dce08ed7f7d897a2f34d63671e2a83390 | |
| parent | ef270615f034ccfd909a3d9b6765eb7c58e3bba8 (diff) | |
| download | spack-e4ba199fc1d16c28ee1400da12f3c070404f8cdc.tar.gz spack-e4ba199fc1d16c28ee1400da12f3c070404f8cdc.tar.bz2 spack-e4ba199fc1d16c28ee1400da12f3c070404f8cdc.tar.xz spack-e4ba199fc1d16c28ee1400da12f3c070404f8cdc.zip | |
updates to conduit and ascent packages (#7040)
* 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
| -rw-r--r-- | var/spack/repos/builtin/packages/ascent/package.py | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/conduit/package.py | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index eda0f93c1c..9cf1f4a7a5 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -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 @@ class Ascent(Package): 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")) diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 2ce7edc8cd..7c288d60ac 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -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 @@ class Conduit(Package): 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")) |