Merge pull request #6572 from markalle/v40x_fortran_macro

in-place conversion macro writes into INPUT argument

ompi/mpi/fortran/base/fint_2_int.h

@@ -11,7 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
- * Copyright (c) 2014      Research Organization for Information Science
+ * Copyright (c) 2014-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
@@ -161,9 +161,24 @@
 
 /*
  * Define MACROS to take account of different size of logical from int
+ *
+ * There used to be an in-place option for the below conversions of
+ * logical arrays.  So if mpi_cart_create(..., periods, ...) took an
+ * input array of Fortran logicals, it would walk the array converting
+ * the elements to C-logical values, then at the end it would restore
+ * the values back to Fortran logicals.
+ *
+ * The problem with that is periods is an INPUT argument and some
+ * Fortran compilers even put it in read-only memory because of that.
+ * So writing to it wasn't generally okay, even though we were restoring it
+ * before returning.
+ *
+ * The in-place option is hence only valid if no conversion is ever needed
+ * (e.g. Fortran logical and C int have the same size *and** Fortran logical
+ * .TRUE. value is 1 in C.
  */
 
-#if OMPI_SIZEOF_FORTRAN_LOGICAL == SIZEOF_INT
+#if (OMPI_SIZEOF_FORTRAN_LOGICAL == SIZEOF_INT) && (OMPI_FORTRAN_VALUE_TRUE == 1)
 #  define OMPI_LOGICAL_NAME_DECL(in)               /* Not needed for int==logical */
 #  define OMPI_LOGICAL_NAME_CONVERT(in)        in  /* Not needed for int==logical */
 #  define OMPI_LOGICAL_SINGLE_NAME_CONVERT(in) in /* Not needed for int==logical */
@@ -172,7 +187,6 @@
 #  define OMPI_ARRAY_LOGICAL_2_INT_ALLOC(in,n)     /* Not needed for int==logical */
 #  define OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(in)     /* Not needed for int==logical */
 
-#  if OMPI_FORTRAN_VALUE_TRUE == 1
 #  define OMPI_FORTRAN_MUST_CONVERT_LOGICAL_2_INT    0
 #  define OMPI_LOGICAL_2_INT(a) a
 #  define OMPI_INT_2_LOGICAL(a) a
@@ -180,29 +194,8 @@
 #  define OMPI_ARRAY_INT_2_LOGICAL(in, n)
 #  define OMPI_SINGLE_INT_2_LOGICAL(a)            /* Single-OUT variable -- Not needed for int==logical, true=1 */
 #else
-#    define OMPI_FORTRAN_MUST_CONVERT_LOGICAL_2_INT    1
-#    define OMPI_LOGICAL_2_INT(a) ((a)==0? 0 : 1)
-#    define OMPI_INT_2_LOGICAL(a) ((a)==0? 0 : OMPI_FORTRAN_VALUE_TRUE)
-#    define OMPI_SINGLE_INT_2_LOGICAL(a) *a=OMPI_INT_2_LOGICAL(OMPI_LOGICAL_NAME_CONVERT(*a))
-#    define OMPI_ARRAY_LOGICAL_2_INT(in, n) do { \
-       int converted_n = (int)(n); \
-       OMPI_ARRAY_LOGICAL_2_INT_ALLOC(in, converted_n + 1); \
-       while (--converted_n >= 0) { \
-         OMPI_LOGICAL_ARRAY_NAME_CONVERT(in)[converted_n]=OMPI_LOGICAL_2_INT(in[converted_n]); \
-       } \
-     } while (0)
-#    define OMPI_ARRAY_INT_2_LOGICAL(in, n) do { \
-       int converted_n = (int)(n); \
-       while (--converted_n >= 0) { \
-         in[converted_n]=OMPI_INT_2_LOGICAL(OMPI_LOGICAL_ARRAY_NAME_CONVERT(in)[converted_n]); \
-       } \
-       OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(in); \
-     }  while (0)
-
-#  endif
-#else
 /*
- * For anything other than Fortran-logical == C-int, we have to convert
+ * For anything other than Fortran-logical == C-int or some .TRUE. is not 1 in C, we have to convert
  */
 #  define OMPI_FORTRAN_MUST_CONVERT_LOGICAL_2_INT    1
 #  define OMPI_LOGICAL_NAME_DECL(in)           int c_##in
@@ -238,7 +231,7 @@
        } \
        OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(in); \
      }  while (0)
-#endif /* OMPI_SIZEOF_FORTRAN_LOGICAL */
+#endif /* OMPI_SIZEOF_FORTRAN_LOGICAL && OMPI_FORTRAN_VALUE_TRUE */
 
 
 #endif /* OMPI_FORTRAN_BASE_FINT_2_INT_H */

ompi/mpi/fortran/mpif-h/cart_create_f.c

@@ -12,6 +12,7 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -96,5 +97,5 @@ void ompi_cart_create_f(MPI_Fint *old_comm, MPI_Fint *ndims, MPI_Fint *dims,
      * Need to convert back into Fortran, to not surprise the user
      */
     OMPI_ARRAY_FINT_2_INT_CLEANUP(dims);
-    OMPI_ARRAY_INT_2_LOGICAL(periods, size);
+    OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(periods); 
 }

ompi/mpi/fortran/mpif-h/cart_map_f.c

@@ -12,6 +12,7 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -89,6 +90,6 @@ void ompi_cart_map_f(MPI_Fint *comm, MPI_Fint *ndims, MPI_Fint *dims,
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     OMPI_ARRAY_FINT_2_INT_CLEANUP(dims);
-    OMPI_ARRAY_INT_2_LOGICAL(periods, size);
+    OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(periods); 
     OMPI_SINGLE_INT_2_FINT(newrank);
 }

ompi/mpi/fortran/mpif-h/cart_sub_f.c

@@ -12,6 +12,7 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2019 IBM Corporation. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -101,5 +102,5 @@ void ompi_cart_sub_f(MPI_Fint *comm, ompi_fortran_logical_t *remain_dims,
         *new_comm = PMPI_Comm_c2f(c_new_comm);
     }
 
-    OMPI_ARRAY_INT_2_LOGICAL(remain_dims, ndims);
+    OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(remain_dims); 
 }