Merge pull request #30724 from jbedorf:fix_30440
PiperOrigin-RevId: 258819909
This commit is contained in:
commit
7dfc439541
@ -1189,8 +1189,8 @@ def set_other_mpi_vars(environ_cp):
|
|||||||
os.path.join(mpi_home, 'include/mpi_portable_platform.h'),
|
os.path.join(mpi_home, 'include/mpi_portable_platform.h'),
|
||||||
'third_party/mpi/mpi_portable_platform.h')
|
'third_party/mpi/mpi_portable_platform.h')
|
||||||
# TODO(gunan): avoid editing files in configure
|
# TODO(gunan): avoid editing files in configure
|
||||||
sed_in_place('third_party/mpi/mpi.bzl', 'MPI_LIB_IS_OPENMPI=False',
|
sed_in_place('third_party/mpi/mpi.bzl', 'MPI_LIB_IS_OPENMPI = False',
|
||||||
'MPI_LIB_IS_OPENMPI=True')
|
'MPI_LIB_IS_OPENMPI = True')
|
||||||
else:
|
else:
|
||||||
# MVAPICH / MPICH
|
# MVAPICH / MPICH
|
||||||
symlink_force(
|
symlink_force(
|
||||||
@ -1198,8 +1198,8 @@ def set_other_mpi_vars(environ_cp):
|
|||||||
symlink_force(
|
symlink_force(
|
||||||
os.path.join(mpi_home, 'include/mpicxx.h'), 'third_party/mpi/mpicxx.h')
|
os.path.join(mpi_home, 'include/mpicxx.h'), 'third_party/mpi/mpicxx.h')
|
||||||
# TODO(gunan): avoid editing files in configure
|
# TODO(gunan): avoid editing files in configure
|
||||||
sed_in_place('third_party/mpi/mpi.bzl', 'MPI_LIB_IS_OPENMPI=True',
|
sed_in_place('third_party/mpi/mpi.bzl', 'MPI_LIB_IS_OPENMPI = True',
|
||||||
'MPI_LIB_IS_OPENMPI=False')
|
'MPI_LIB_IS_OPENMPI = False')
|
||||||
|
|
||||||
if os.path.exists(os.path.join(mpi_home, 'lib/libmpi.so')):
|
if os.path.exists(os.path.join(mpi_home, 'lib/libmpi.so')):
|
||||||
symlink_force(
|
symlink_force(
|
||||||
|
Loading…
Reference in New Issue
Block a user