Skip to content
Snippets Groups Projects
Unverified Commit 0d08e18d authored by Brian Van Essen's avatar Brian Van Essen Committed by GitHub
Browse files

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.
parent 3fc963b1
No related branches found
No related tags found
No related merge requests found
...@@ -469,7 +469,7 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None): ...@@ -469,7 +469,7 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
# use those for mpi wrappers, b/c spec['mpi'].mpicxx # use those for mpi wrappers, b/c spec['mpi'].mpicxx
# etc make return the spack compiler wrappers # etc make return the spack compiler wrappers
# which can trip up mpi detection in CMake 3.14 # which can trip up mpi detection in CMake 3.14
if cpp_compiler == "CC": if spec['mpi'].mpicc == spack_cc:
mpicc_path = "cc" mpicc_path = "cc"
mpicxx_path = "CC" mpicxx_path = "CC"
mpifc_path = "ftn" mpifc_path = "ftn"
......
...@@ -117,9 +117,6 @@ def cmake_args(self): ...@@ -117,9 +117,6 @@ def cmake_args(self):
args = [ args = [
'-DCMAKE_INSTALL_MESSAGE:STRING=LAZY', '-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), '-DBUILD_SHARED_LIBS:BOOL=%s' % ('+shared' in spec),
'-DHydrogen_ENABLE_OPENMP:BOOL=%s' % ('+hybrid' in spec), '-DHydrogen_ENABLE_OPENMP:BOOL=%s' % ('+hybrid' in spec),
'-DHydrogen_ENABLE_QUADMATH:BOOL=%s' % ('+quad' in spec), '-DHydrogen_ENABLE_QUADMATH:BOOL=%s' % ('+quad' in spec),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment