Fixed uncompiling non-MPI executables; moved MPI run jobs to run_mpi_…

…XXXX
dylan-jayatilaka · Sep 28, 2018 · c41191d · c41191d
1 parent 54f3c98
commit c41191d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -411,7 +411,7 @@ set(RUN_SRC
     ${RUNFILE_DIR}/run_mat{real}.foo
     ${RUNFILE_DIR}/run_mat{cpx}.foo
     ${RUNFILE_DIR}/run_mpi_matmul.foo
-    ${RUNFILE_DIR}/run_pi.foo
+    ${RUNFILE_DIR}/run_mpi_pi.foo
     ${RUNFILE_DIR}/run_qr.foo
     ${RUNFILE_DIR}/run_shell2.foo
     ${RUNFILE_DIR}/run_real.foo
@@ -468,7 +468,7 @@ add_executable(run_shell2        EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/ru
 add_executable(run_mat_real      EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/run_mat_real.F90)
 add_executable(run_mat_cpx       EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/run_mat_cpx.F90)
 add_executable(run_mpi_matmul    EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/run_mpi_matmul.F90)
-add_executable(run_pi            EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/run_pi.F90)
+add_executable(run_mpi_pi        EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/run_mpi_pi.F90)
 add_executable(run_qr            EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/run_qr.F90)
 add_executable(run_real          EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/run_real.F90)
 add_executable(run_vec_str       EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/run_vec_str.F90)
@@ -484,7 +484,7 @@ target_link_libraries(run_himz          tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIE
 target_link_libraries(run_mat_real      tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIES})
 target_link_libraries(run_mat_cpx       tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIES})
 target_link_libraries(run_mpi_matmul    tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIES})
-target_link_libraries(run_pi            tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIES})
+target_link_libraries(run_mpi_pi        tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIES})
 target_link_libraries(run_qr            tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIES})
 target_link_libraries(run_real          tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIES})
 target_link_libraries(run_vec_str       tonto ${LAPACK_LIBRARIES} ${MPI_LIBRARIES})

diff --git a/foofiles/system b/foofiles/system
diff --git a/foofiles/types.foo b/foofiles/types.foo
@@ -388,6 +388,7 @@ module TYPES
      n_processors :: INT  DEFAULT(1)
      ! The number of processors
 
+#ifdef MPI
      mpi_comm :: INT  DEFAULT(0)
      ! Communicator for all MPI routines.
 
@@ -416,6 +417,7 @@ module TYPES
 
      proc_grid_mycol :: INT DEFAULT(0)
      ! This processor's column of the processor grid
+#endif
 
    end
 
@@ -480,6 +482,7 @@ module TYPES
      n_processors :: INT  DEFAULT(1)
      ! The number of processors
 
+#ifdef MPI
      mpi_comm :: INT  DEFAULT(0)
      ! Communicator for all MPI routines.
 
@@ -488,6 +491,7 @@ module TYPES
 
      mpi_status :: VEC{INT}(MPI_STATUS_SIZE)
      ! Status field used for all MPI routines.
+#endif
 
    end
 

diff --git a/runfiles/run_pi.foo → runfiles/run_mpi_pi.foo b/runfiles/run_pi.foo → runfiles/run_mpi_pi.foo
diff --git a/runfiles/run_pi_io.foo → runfiles/run_mpi_pi_io.foo b/runfiles/run_pi_io.foo → runfiles/run_mpi_pi_io.foo