mv get_team->get_communicator; build if have MPI

Author: Damian Rouson

CMakeLists.txt

@@ -229,6 +229,8 @@ if (NOT MPIEXEC)
 report this bug to the OpenCoarrays developers at
 https://github.com/sourceryinstitute/opencoarrays/issues, otherwise use point CMake
 to the desired MPI runtime.")
+else()
+  add_definitions(-DHAVE_MPI)
 endif()
 
 get_filename_component(MPIEXEC_RELATIVE_LOC "${MPIEXEC}"
@@ -545,7 +547,7 @@ if(opencoarrays_aware_compiler)
       add_mpi_test(async_comp_alloc 6 ${tests_root}/unit/init_register/async_comp_alloc)
       if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8)
         add_mpi_test(team_number 2 ${tests_root}/unit/teams/team_number)
-        add_mpi_test(get_team 3 ${tests_root}/unit/teams/get_team)
+        add_mpi_test(get_communicator 3 ${tests_root}/unit/teams/get_communicator)
       endif()
     endif()
   endif()

src/extensions/opencoarrays.F90

@@ -47,7 +47,9 @@ module opencoarrays
   public :: error_stop
   public :: sync_all
   public :: team_number
-  public :: get_team
+#ifdef HAVE_MPI
+  public :: get_communicator
+#endif
 #ifdef COMPILER_SUPPORTS_ATOMICS
   public :: event_type
   public :: event_post
@@ -117,9 +119,9 @@ function team_number(team_type_ptr) result(my_team_number) bind(C,name="_gfortra
     end function
 
 #ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    function get_team(team_type_ptr) result(my_team) bind(C,name="_caf_extensions_get_team")
+    function get_communicator(team_type_ptr) result(my_team) bind(C,name="_caf_extensions_get_communicator")
 #else
-    function get_team(team_type_ptr) result(my_team) bind(C,name="_gfortran_caf_get_team")
+    function get_communicator(team_type_ptr) result(my_team) bind(C,name="_gfortran_caf_get_communicator")
 #endif
        use iso_c_binding, only : c_int,c_ptr
        implicit none

src/libcaf.h

@@ -299,7 +299,6 @@ void PREFIX (change_team) (caf_team_t *, int);
 void PREFIX (end_team) (caf_team_t *);
 void PREFIX (sync_team) (caf_team_t *, int);
 int PREFIX (team_number) (caf_team_t *);
-MPI_Fint PREFIX (get_team) (caf_team_t *);
 
 int PREFIX (image_status) (int);
 void PREFIX (failed_images) (gfc_descriptor_t *, int, int *);
@@ -317,4 +316,10 @@ void PREFIX (unlock) (caf_token_t, size_t, int, int *, char *, int);
 void PREFIX (event_post) (caf_token_t, size_t, int, int *, char *, int);
 void PREFIX (event_wait) (caf_token_t, size_t, int, int *, char *, int);
 void PREFIX (event_query) (caf_token_t, size_t, int, int *, int *);
+
+/* Language extension */
+#ifdef HAVE_MPI
+MPI_Fint PREFIX (get_communicator) (caf_team_t *);
+#endif
+
 #endif  /* LIBCAF_H  */

src/mpi/mpi_caf.c

@@ -4877,9 +4877,9 @@ void PREFIX (change_team) (caf_team_t *team, int coselector __attribute__ ((unus
 }
 
 MPI_Fint
-PREFIX (get_team) (caf_team_t *team)
+PREFIX (get_communicator) (caf_team_t *team)
 {
-  if(team != NULL) caf_runtime_error("get_team does not yet support the optional team argument");
+  if(team != NULL) caf_runtime_error("get_communicator does not yet support the optional team argument");
 
   MPI_Comm* comm_ptr = teams_list->team;
 

src/tests/unit/teams/CMakeLists.txt

@@ -2,6 +2,6 @@ add_executable(team_number team-number.f90)
 target_link_libraries(team_number OpenCoarrays)
 target_include_directories(team_number PRIVATE ${CMAKE_BINARY_DIR}/mod)
 
-add_executable(get_team get-team.f90)
-target_link_libraries(get_team OpenCoarrays)
-target_include_directories(get_team PRIVATE ${CMAKE_BINARY_DIR}/mod)
+add_executable(get_communicator get-communicator.f90)
+target_link_libraries(get_communicator OpenCoarrays)
+target_include_directories(get_communicator PRIVATE ${CMAKE_BINARY_DIR}/mod)

src/tests/unit/teams/get-team.f90 renamed to src/tests/unit/teams/get-communicator.f90

@@ -28,17 +28,17 @@
 ! OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 program main
-  !! summary: Test get_team function, an OpenCoarrays-specific language extension
-  use opencoarrays, only : get_team
+  !! summary: Test get_commiunicator function, an OpenCoarrays-specific language extension
+  use opencoarrays, only : get_communicator
 
   implicit none
 
-  call mpi_matches_caf(get_team())
+  call mpi_matches_caf(get_communicator())
     !! verify # ranks = # images and image number = rank + 1
 
   block
     use iso_fortran_env, only : team_type
-    use opencoarrays, only : get_team, team_number !! TODO: remove team_number once gfortran supports it
+    use opencoarrays, only : get_communicator, team_number !! TODO: remove team_number once gfortran supports it
 
     type(team_type) :: league
     integer, parameter :: num_teams=2
@@ -52,7 +52,7 @@ program main
       change team(league)
         !! join my destination team
 
-        call mpi_matches_caf(get_team())
+        call mpi_matches_caf(get_communicator())
           !! verify new # ranks = new # images and new image number = new rank + 1
 
         associate(my_team=>team_number())