add abi_get/set_fortran_booleans c interfaces

hppritcha · hppritcha · commit 1eab41d00b9b · 2025-09-24T20:12:44.000-06:00
Signed-off-by: Howard Pritchard &lt;howardp@lanl.gov&gt;
diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in
@@ -1450,6 +1450,8 @@ OMPI_DECLSPEC  int MPI_Abi_version(int *abi_major, int *abi_minor);
 OMPI_DECLSPEC  int MPI_Abi_details(int *buflen, char *details, MPI_Info *info);
 OMPI_DECLSPEC  int MPI_Abi_get_fortran_info(MPI_Info *info);
 OMPI_DECLSPEC  int MPI_Abi_set_fortran_info(MPI_Info info);
+OMPI_DECLSPEC  int MPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set);
+OMPI_DECLSPEC  int MPI_Abi_set_fortran_booleans(int logical_size, void *logical_true, void *logical_false);
 OMPI_DECLSPEC  int MPI_Abort(MPI_Comm comm, int errorcode);
 OMPI_DECLSPEC  int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
                                   int target_rank, MPI_Aint target_disp, int target_count,
@@ -2626,6 +2628,8 @@ OMPI_DECLSPEC  int PMPI_Abi_version(int *abi_major, int *abi_minor);
 OMPI_DECLSPEC  int PMPI_Abi_details(int *buflen, char *details, MPI_Info *info);
 OMPI_DECLSPEC  int PMPI_Abi_get_fortran_info(MPI_Info *info);
 OMPI_DECLSPEC  int PMPI_Abi_set_fortran_info(MPI_Info info);
+OMPI_DECLSPEC  int PMPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set);
+OMPI_DECLSPEC  int PMPI_Abi_set_fortran_booleans(int logical_size, void *logical_true, void *logical_false);
 OMPI_DECLSPEC  int PMPI_Abort(MPI_Comm comm, int errorcode);
 OMPI_DECLSPEC  int PMPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
                                    int target_rank, MPI_Aint target_disp, int target_count,
diff --git a/ompi/mpi/bindings/ompi_bindings/c_type.py b/ompi/mpi/bindings/ompi_bindings/c_type.py
@@ -1944,29 +1944,14 @@ class TypeEventCBFunction(Type):
     def type_text(self, enable_count=False):
         return 'MPI_T_event_cb_function'
 
-@Type.add_type('VOID', abi_type=['ompi'])
+@Type.add_type('VOID')
 class TypeVoid(Type):
 
     def type_text(self, enable_count=False):
         return 'void *'
 
-@Type.add_type('VOID', abi_type=['standard'])
-class TypeVoidStandard(StandardABIType):
-
-    def type_text(self, enable_count=False):
-        return 'void *'
-
-@Type.add_type('VOID_CONST', abi_type=['ompi'])
+@Type.add_type('VOID_CONST')
 class TypeVoidConst(Type):
 
     def type_text(self, enable_count=False):
         return 'const void *'
-
-@Type.add_type('VOID_CONST', abi_type=['standard'])
-class TypeVoidConst(StandardABIType):
-
-    def type_text(self, enable_count=False):
-        return 'const void *'
-
-
-
diff --git a/ompi/mpi/c/Makefile.am b/ompi/mpi/c/Makefile.am
@@ -52,6 +52,8 @@ headers = bindings.h
 prototype_sources = \
         abi_get_fortran_info.c.in \
         abi_set_fortran_info.c.in \
+        abi_get_fortran_booleans.c.in \
+        abi_set_fortran_booleans.c.in \
         abort.c.in \
         accumulate.c.in \
         add_error_class.c.in \
diff --git a/ompi/mpi/c/abi_get_fortran_booleans.c.in b/ompi/mpi/c/abi_get_fortran_booleans.c.in
@@ -0,0 +1,48 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2020 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2018-2025 Triad National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include "ompi/mpi/c/bindings.h"
+#include "ompi/runtime/params.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/errhandler/errhandler.h"
+#include "ompi/info/info.h"
+#include "ompi/mpi/c/bindings.h"
+
+PROTOTYPE ERROR_CLASS abi_get_fortran_booleans(INT logical_size, VOID logical_true, 
+                                               VOID logical_false, INT_OUT is_set)
+{
+    int ret = MPI_SUCCESS;
+
+    if (MPI_PARAM_CHECK) {
+        if ((NULL == logical_true) || (NULL == logical_false) ||
+            (NULL == is_set)) {
+            return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG,
+                                          FUNC_NAME);
+        }
+    }
+
+    ret = ompi_abi_get_fortran_booleans(logical_size, logical_true, logical_false, is_set);
+    OMPI_ERRHANDLER_NOHANDLE_RETURN( ret, ret, FUNC_NAME );
+}
diff --git a/ompi/mpi/c/abi_set_fortran_booleans.c.in b/ompi/mpi/c/abi_set_fortran_booleans.c.in
@@ -0,0 +1,47 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2020 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2018-2025 Triad National Security, LLC. All rights
+ *                         reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include "ompi/mpi/c/bindings.h"
+#include "ompi/runtime/params.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/errhandler/errhandler.h"
+#include "ompi/info/info.h"
+#include "ompi/mpi/c/bindings.h"
+
+PROTOTYPE ERROR_CLASS abi_set_fortran_booleans(INT logical_size, VOID logical_true, 
+                                               VOID logical_false)
+{
+    int ret = MPI_SUCCESS;
+
+    if (MPI_PARAM_CHECK) {
+        if ((NULL == logical_true) || (NULL == logical_false)) {
+            return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG,
+                                          FUNC_NAME);
+        }
+    }
+
+    ret = ompi_abi_set_fortran_booleans(logical_size, logical_true, logical_false);
+    OMPI_ERRHANDLER_NOHANDLE_RETURN( ret, ret, FUNC_NAME );
+}
diff --git a/ompi/mpi/c/abi_set_fortran_info.c.in b/ompi/mpi/c/abi_set_fortran_info.c.in
@@ -32,25 +32,14 @@
 PROTOTYPE ERROR_CLASS abi_set_fortran_info(INFO info)
 {
     int ret = MPI_SUCCESS;
-    static bool already_called = false;
 
     if (MPI_PARAM_CHECK) {
         if (NULL == info) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_INFO,
                                           FUNC_NAME);
         }
-        if (true == already_called) {
-            return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ABI,
-                                          FUNC_NAME);
-        }
     }
 
-    already_called = true;
-
-#if OMPI_BUILD_FORTRAN_BINDINGS
-    return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ABI, FUNC_NAME);
-#endif
-
     ret = ompi_abi_set_fortran_info(info);
     OMPI_ERRHANDLER_NOHANDLE_RETURN( ret, ret, FUNC_NAME );
 }
diff --git a/ompi/mpi/c/bindings.h b/ompi/mpi/c/bindings.h
@@ -125,6 +125,7 @@ int ompi_isendrecv(const void * sendbuf, size_t sendcount, MPI_Datatype sendtype
 int ompi_abi_get_fortran_info(ompi_info_t **info);
 int ompi_abi_set_fortran_info(ompi_info_t *info);
 int ompi_abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set);
+int ompi_abi_set_fortran_booleans(int logical_size, void *logical_true, void *logical_false);
 
 END_C_DECLS
 
diff --git a/ompi/mpi/c/ompi_abi_fortran.c b/ompi/mpi/c/ompi_abi_fortran.c

Original file line number	Diff line number	Diff line change
`@@ -32,25 +32,14 @@`
`32`	`32`	`PROTOTYPE ERROR_CLASS abi_set_fortran_info(INFO info)`
`33`	`33`	`{`
`34`	`34`	`int ret = MPI_SUCCESS;`
`35`		`- static bool already_called = false;`
`36`	`35`
`37`	`36`	`if (MPI_PARAM_CHECK) {`
`38`	`37`	`if (NULL == info) {`
`39`	`38`	`return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_INFO,`
`40`	`39`	`FUNC_NAME);`
`41`	`40`	`}`
`42`		`- if (true == already_called) {`
`43`		`- return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ABI,`
`44`		`- FUNC_NAME);`
`45`		`- }`
`46`	`41`	`}`
`47`	`42`
`48`		`- already_called = true;`
`49`		`-`
`50`		`-#if OMPI_BUILD_FORTRAN_BINDINGS`
`51`		`- return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ABI, FUNC_NAME);`
`52`		`-#endif`
`53`		`-`
`54`	`43`	`ret = ompi_abi_set_fortran_info(info);`
`55`	`44`	`OMPI_ERRHANDLER_NOHANDLE_RETURN( ret, ret, FUNC_NAME );`
`56`	`45`	`}`