diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2020-06-22 00:32:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-22 09:32:55 +0200 |
| commit | 0d08e18df5106a276543e1eb058d42e7f7dff88d (patch) | |
| tree | 692c43c5aecc7065e1a89a86c164ed66f8e29328 | |
| parent | 3fc963b1f919baa46f5f6f15bb1ca19f2404f600 (diff) | |
| download | spack-0d08e18df5106a276543e1eb058d42e7f7dff88d.tar.gz spack-0d08e18df5106a276543e1eb058d42e7f7dff88d.tar.bz2 spack-0d08e18df5106a276543e1eb058d42e7f7dff88d.tar.xz spack-0d08e18df5106a276543e1eb058d42e7f7dff88d.zip | |
Minor cleanup for conduit and hydrogen (#17136)
* Fix how the Conduit detects that the MPI compiler is the same as the
CC compiler and is more careful when it sets the MPI compilers to be
the Cray PE system compilers.
* Remove unnecessary push of the MPI compilers to the C compilers for Hydrogen.
| -rw-r--r-- | var/spack/repos/builtin/packages/conduit/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hydrogen/package.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index b8b23bccbe..8481ddce82 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -469,7 +469,7 @@ class Conduit(Package): # use those for mpi wrappers, b/c spec['mpi'].mpicxx # etc make return the spack compiler wrappers # which can trip up mpi detection in CMake 3.14 - if cpp_compiler == "CC": + if spec['mpi'].mpicc == spack_cc: mpicc_path = "cc" mpicxx_path = "CC" mpifc_path = "ftn" diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index c28d0872d9..449fe046dc 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -117,9 +117,6 @@ class Hydrogen(CMakePackage): args = [ '-DCMAKE_INSTALL_MESSAGE:STRING=LAZY', - '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, - '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx, - '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc, '-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec), '-DHydrogen_ENABLE_OPENMP:BOOL=%s' % ('+hybrid' in spec), '-DHydrogen_ENABLE_QUADMATH:BOOL=%s' % ('+quad' in spec), |