Merge branches 'issue-524-team_number' and 'PIC-static-lib'

Author: zbeekman

CMakeLists.txt

@@ -719,7 +719,7 @@ if(opencoarrays_aware_compiler)
     add_caf_test(comp_allocated_2 2 comp_allocated_2)
     add_caf_test(alloc_comp_get_convert_nums 2 alloc_comp_get_convert_nums)
     if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8)
-      add_caf_test(team_number 2 team_number)
+      add_caf_test(team_number 8 team_number)
       add_caf_test(teams_subset 3 teams_subset)
       add_caf_test(get_communicator 3  get_communicator)
       add_caf_test(alloc_comp_multidim_shape 2 alloc_comp_multidim_shape)

prerequisites/install-functions/report_results.sh

@@ -69,10 +69,10 @@ report_results()
     if [[ -d "${compiler_install_root%/}/lib" || -d "${compiler_install_root%/}/lib64" ]]; then
       echo "# Prepend the compiler library paths to the ${LD_LIB_P_VAR} environment variable:" | tee -a setup.sh setup.csh
       compiler_lib_paths="${compiler_install_root%/}/lib64/:${compiler_install_root%/}/lib"
-      echo "if [[ -z \"\${!LD_LIB_P_VAR}\" ]]; then                                       " >> setup.sh
+      echo "if [[ -z \"\${!${LD_LIB_P_VAR}}\" ]]; then                                    " >> setup.sh
       echo "  export ${LD_LIB_P_VAR}=\"${compiler_lib_paths%/}\"                          " >> setup.sh
       echo "else                                                                          " >> setup.sh
-      echo "  export ${LD_LIB_P_VAR}=\"${compiler_lib_paths%/}:\${!LD_LIB_P_VAR}\"        " >> setup.sh
+      echo "  export ${LD_LIB_P_VAR}=\"${compiler_lib_paths%/}:\${!${LD_LIB_P_VAR}}\"     " >> setup.sh
       echo "fi                                                                            " >> setup.sh
       echo "setenv LD_LIBRARY_PATH \"${compiler_lib_paths%/}:\${LD_LIBRARY_PATH}\"        " >> setup.csh
     fi

src/mpi/CMakeLists.txt

@@ -39,6 +39,9 @@ target_link_libraries(caf_mpi_static
   PUBLIC ${MPI_C_LINK_FLAGS}
   PUBLIC ${MPI_C_LIBRARIES}
   PRIVATE opencoarrays_mod)
+set_target_properties(caf_mpi_static
+  PROPERTIES
+  POSITION_INDEPENDENT_CODE TRUE)
 target_include_directories(caf_mpi
   PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_INCLUDE_PATH}>)
 target_include_directories(caf_mpi_static

src/mpi/mpi_caf.c

@@ -8152,12 +8152,10 @@ PREFIX(get_communicator) (caf_team_t *team)
 int
 PREFIX(team_number) (caf_team_t *team)
 {
-  if (team != NULL) caf_runtime_error("team_number does not yet support "
-                                      "the optional team argument");
-
-  // if (used_teams->prev == NULL) 
-  //   return -1;
-  return used_teams->team_list_elem->team_id;
+  if (team != NULL)
+    return ((caf_teams_list *)team)->team_id;
+  else
+    return used_teams->team_list_elem->team_id; /* current team */
 }
 
 void PREFIX(end_team) (caf_team_t *team __attribute__((unused)))

src/tests/unit/teams/team-number.f90

@@ -37,7 +37,9 @@ program main
 
   integer, parameter :: standard_initial_value=-1
 
-  type(team_type), target :: home
+  type(team_type) :: parent, child
+
+  if (num_images() < 8) error stop "I need at least 8 images to function."
 
   call assert(team_number()==standard_initial_value,"initial team number conforms with Fortran standard before 'change team'")
 
@@ -47,11 +49,17 @@ program main
    !! TODO: uncomment the above assertion after implementing support for team_number's optional argument:
 
   after_change_team: block
-    associate(my_team=>mod(this_image(),2)+1)
+    associate(parent_team_number => 100 + (num_images()-1)/4, child_team_number => 1000 + mod(num_images()-1,4)/2)
       !! Prepare for forming two teams: my_team = 1 for even image numbers in the initial team; 2 for odd image numbers
-      form team(my_team,home)
-      change team(home)
-        call assert(team_number()==my_team,"team number conforms with Fortran standard after 'change team'")
+      form team(parent_team_number,parent)
+      change team(parent)
+        call assert(team_number()==parent_team_number,"team number conforms with Fortran standard after 'change team'")
+        form team (child_team_number, child)
+        change team(child)
+          call assert(team_number()==child_team_number,"team number conforms with Fortran standard after 'change team'")
+          call assert(team_number(child)==child_team_number,"team_number(child) conforms with Fortran standard after 'change team'")
+          call assert(team_number(parent)==parent_team_number,"team_number(parent) conforms with Fortran standard")
+        end team
       end team
       call assert(team_number()==standard_initial_value,"initial team number conforms with Fortran standard")
     end associate