Skip to content

Commit

Permalink
Fix BLT MPI Fortran includes
Browse files Browse the repository at this point in the history
  • Loading branch information
@white238
white238 committed May 10, 2019
1 parent 6c81acf commit 643af37
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion host-configs/rzuseqlac-bgqos_0-clang@4.0.0_gfortran.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ set(ENABLE_FIND_MPI OFF CACHE BOOL "Use wrapper directly to stop FindMPI returni

set(ENABLE_WRAP_ALL_TESTS_WITH_MPIEXEC ON CACHE BOOL "Ensures that tests will be wrapped with srun to run on the backend nodes")

set(MPI_Fortran_INCLUDE_PATH "/usr/local/tools/deg/drivers/V1R2M0/ppc64/comm/gcc/include" CACHE PATH "Pass in an explicit path to help find mpif.h")
set(BLT_MPI_INCLUDES "/usr/local/tools/deg/drivers/V1R2M0/ppc64/comm/gcc/include" CACHE PATH "Pass in an explicit path to help find mpif.h")

set(MPIEXEC "/usr/bin/srun" CACHE PATH "")

Expand Down
2 changes: 1 addition & 1 deletion host-configs/rzuseqlac-bgqos_0-clang@4.0.0_xlf.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ set(ENABLE_FIND_MPI OFF CACHE BOOL "Use wrapper directly to stop FindMPI returni

set(ENABLE_WRAP_ALL_TESTS_WITH_MPIEXEC ON CACHE BOOL "Ensures that tests will be wrapped with srun to run on the backend nodes")

set(MPI_Fortran_INCLUDE_PATH "/usr/local/tools/deg/drivers/V1R2M0/ppc64/comm/gcc/include" CACHE PATH "Pass in an explicit path to help find mpif.h")
set(BLT_MPI_INCLUDES "/usr/local/tools/deg/drivers/V1R2M0/ppc64/comm/gcc/include" CACHE PATH "Pass in an explicit path to help find mpif.h")

set(MPIEXEC "/usr/bin/srun" CACHE PATH "")

Expand Down
2 changes: 1 addition & 1 deletion scripts/uberenv/packages/uberenv-axom/package.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def install(self, spec, prefix):
"Use wrapper directly to stop FindMPI returning the wrong linker flags."))
cfg.write(cmake_cache_option("ENABLE_WRAP_ALL_TESTS_WITH_MPIEXEC", True,
"Ensures that tests will be wrapped with srun to run on the backend nodes"))
cfg.write(cmake_cache_entry("MPI_Fortran_INCLUDE_PATH",
cfg.write(cmake_cache_entry("BLT_MPI_INCLUDES",
"/usr/local/tools/deg/drivers/V1R2M0/ppc64/comm/gcc/include",
"Pass in an explicit path to help find mpif.h"))
else:
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/blt
Submodule blt updated 15 files
+10 −0 .mailmap
+66 −12 README.md
+2 −0 RELEASE-NOTES.md
+3 −3 appveyor.yml
+24 −6 cmake/thirdparty/SetupMPI.cmake
+4 −41 docs/creating_documentation.rst
+47 −33 docs/creating_execs_and_libs.rst
+37 −16 docs/external_dependencies.rst
+25 −17 docs/setup_blt.rst
+3 −2 docs/tutorial/blank_project/CMakeLists.txt
+22 −9 docs/tutorial/calc_pi/CMakeLists.txt
+2 −1 docs/tutorial/calc_pi/test_1.cpp
+2 −2 docs/tutorial/calc_pi/test_2.cpp
+26 −17 docs/unit_testing.rst
+8 −8 host-configs/llnl-surface-chaos_5_x86_64_ib-gcc@4.9.3.cmake

0 comments on commit 643af37

Please sign in to comment.