Merge pull request #10119 from hppritcha/topic/fortran_elemental_v41x

v4.1.x: FORTRAN:add elemental attribute to handle compars
open-mpi · Mar 15, 2022 · 655afb9 · 655afb9
2 parents 21a2855 + a971c56
commit 655afb9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/NEWS b/NEWS
@@ -61,7 +61,10 @@ included in the vX.Y.Z section and be denoted as:
 4.1.3 -- March, 2022
 --------------------
 
-- Minor datatype performance improvements in the CUDA-based code paths.q
+- Added support for ELEMENTAL to the MPI handle comparison functions
+  in the mpi_f08 module.  Thanks to Salvatore Filippone for raising
+  the issue.
+- Minor datatype performance improvements in the CUDA-based code paths.
 - Fix MPI_ALLTOALLV when used with MPI_IN_PLACE.
 - Fix MPI_BOTTOM handling for non-blocking collectives.  Thanks to
   Lisandro Dalcin for reporting the problem.

diff --git a/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 b/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90
@@ -240,104 +240,104 @@ module mpi_f08_types
 
 !... .EQ. operator
 !-----------------
-  logical function ompi_comm_op_eq(a, b)
+  elemental logical function ompi_comm_op_eq(a, b)
     type(MPI_Comm), intent(in) :: a, b
     ompi_comm_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_comm_op_eq
 
-  logical function ompi_datatype_op_eq(a, b)
+  elemental logical function ompi_datatype_op_eq(a, b)
     type(MPI_Datatype), intent(in) :: a, b
     ompi_datatype_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_datatype_op_eq
 
-  logical function ompi_errhandler_op_eq(a, b)
+  elemental logical function ompi_errhandler_op_eq(a, b)
     type(MPI_Errhandler), intent(in) :: a, b
     ompi_errhandler_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_errhandler_op_eq
 
-  logical function ompi_file_op_eq(a, b)
+  elemental logical function ompi_file_op_eq(a, b)
     type(MPI_File), intent(in) :: a, b
     ompi_file_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_file_op_eq
 
-  logical function ompi_group_op_eq(a, b)
+  elemental logical function ompi_group_op_eq(a, b)
     type(MPI_Group), intent(in) :: a, b
     ompi_group_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_group_op_eq
 
-  logical function ompi_info_op_eq(a, b)
+  elemental logical function ompi_info_op_eq(a, b)
     type(MPI_Info), intent(in) :: a, b
     ompi_info_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_info_op_eq
 
-  logical function ompi_message_op_eq(a, b)
+  elemental logical function ompi_message_op_eq(a, b)
     type(MPI_Message), intent(in) :: a, b
     ompi_message_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_message_op_eq
 
-  logical function ompi_op_op_eq(a, b)
+  elemental logical function ompi_op_op_eq(a, b)
     type(MPI_Op), intent(in) :: a, b
     ompi_op_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_op_op_eq
 
-  logical function ompi_request_op_eq(a, b)
+  elemental logical function ompi_request_op_eq(a, b)
     type(MPI_Request), intent(in) :: a, b
     ompi_request_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_request_op_eq
 
-  logical function ompi_win_op_eq(a, b)
+  elemental logical function ompi_win_op_eq(a, b)
     type(MPI_Win), intent(in) :: a, b
     ompi_win_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
   end function ompi_win_op_eq
 
 !... .NE. operator
 !-----------------
-  logical function ompi_comm_op_ne(a, b)
+  elemental logical function ompi_comm_op_ne(a, b)
     type(MPI_Comm), intent(in) :: a, b
     ompi_comm_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_comm_op_ne
 
-  logical function ompi_datatype_op_ne(a, b)
+  elemental logical function ompi_datatype_op_ne(a, b)
     type(MPI_Datatype), intent(in) :: a, b
     ompi_datatype_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_datatype_op_ne
 
-  logical function ompi_errhandler_op_ne(a, b)
+  elemental logical function ompi_errhandler_op_ne(a, b)
     type(MPI_Errhandler), intent(in) :: a, b
     ompi_errhandler_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_errhandler_op_ne
 
-  logical function ompi_file_op_ne(a, b)
+  elemental logical function ompi_file_op_ne(a, b)
     type(MPI_File), intent(in) :: a, b
     ompi_file_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_file_op_ne
 
-  logical function ompi_group_op_ne(a, b)
+  elemental logical function ompi_group_op_ne(a, b)
     type(MPI_Group), intent(in) :: a, b
     ompi_group_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_group_op_ne
 
-  logical function ompi_info_op_ne(a, b)
+  elemental logical function ompi_info_op_ne(a, b)
     type(MPI_Info), intent(in) :: a, b
     ompi_info_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_info_op_ne
 
-  logical function ompi_message_op_ne(a, b)
+  elemental logical function ompi_message_op_ne(a, b)
     type(MPI_Message), intent(in) :: a, b
     ompi_message_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_message_op_ne
 
-  logical function ompi_op_op_ne(a, b)
+  elemental logical function ompi_op_op_ne(a, b)
     type(MPI_Op), intent(in) :: a, b
     ompi_op_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_op_op_ne
 
-  logical function ompi_request_op_ne(a, b)
+  elemental logical function ompi_request_op_ne(a, b)
     type(MPI_Request), intent(in) :: a, b
     ompi_request_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_request_op_ne
 
-  logical function ompi_win_op_ne(a, b)
+  elemental logical function ompi_win_op_ne(a, b)
     type(MPI_Win), intent(in) :: a, b
     ompi_win_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
   end function ompi_win_op_ne