ompi-codegen.patch from dalcinl

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c.py

@@ -117,7 +117,6 @@ def dump_header(self):
         self.dump()
 
         self.define_all('MPI_Datatype', consts.PREDEFINED_DATATYPES)
-        self.define_all('MPI_Op', consts.COLLECTIVE_OPERATIONS)
         self.define_all('MPI_Op', consts.RESERVED_OPS)
         self.define_all('MPI_Comm', consts.RESERVED_COMMUNICATORS)
         self.define_all('MPI_Errhandler', consts.RESERVED_ERRHANDLERS)
@@ -428,10 +427,11 @@ def generate_message_convert_fn_intern_to_abi(self):
         self.generic_convert_reverse(ConvertOMPIToStandard.MESSAGE, 'message', 'MPI_Message', consts.RESERVED_MESSAGES)
 
     def generate_op_convert_fn(self):
-        self.generic_convert(ConvertFuncs.OP, 'op', 'MPI_Op', consts.COLLECTIVE_OPERATIONS)
+        self.generic_convert(ConvertFuncs.OP, 'op', 'MPI_Op', consts.RESERVED_OPS)
 
     def generate_op_convert_fn_intern_to_abi(self):
-        self.generic_convert_reverse(ConvertOMPIToStandard.OP, 'op', 'MPI_Op', consts.RESERVED_OPS)
+        # Only need to convert MPI_OP_NULL (fist item in consts.RESERVED_OPS)
+        self.generic_convert_reverse(ConvertOMPIToStandard.OP, 'op', 'MPI_Op', consts.RESERVED_OPS[:1])
 
     def generate_session_convert_fn(self):
         self.generic_convert(ConvertFuncs.SESSION, 'session', 'MPI_Session', consts.RESERVED_SESSIONS)

ompi/mpi/bindings/ompi_bindings/consts.py

@@ -217,8 +217,8 @@
 ]
 
 RESERVED_INFOS = [
-    'MPI_INFO_ENV',
     'MPI_INFO_NULL',
+    'MPI_INFO_ENV',
 ]
 
 RESERVED_FILES = [
@@ -227,6 +227,20 @@
 
 RESERVED_OPS = [
     'MPI_OP_NULL',
+    'MPI_MAX',
+    'MPI_MIN',
+    'MPI_SUM',
+    'MPI_PROD',
+    'MPI_MAXLOC',
+    'MPI_MINLOC',
+    'MPI_BAND',
+    'MPI_BOR',
+    'MPI_BXOR',
+    'MPI_LAND',
+    'MPI_LOR',
+    'MPI_LXOR',
+    'MPI_REPLACE',
+    'MPI_NO_OP',
 ]
 
 RESERVED_MESSAGES = [
@@ -277,23 +291,6 @@
     'MPI_STATUS_IGNORE',
 ]
 
-COLLECTIVE_OPERATIONS = [
-    'MPI_MAX',
-    'MPI_MIN',
-    'MPI_SUM',
-    'MPI_PROD',
-    'MPI_MAXLOC',
-    'MPI_MINLOC',
-    'MPI_BAND',
-    'MPI_BOR',
-    'MPI_BXOR',
-    'MPI_LAND',
-    'MPI_LOR',
-    'MPI_LXOR',
-    'MPI_REPLACE',
-    'MPI_NO_OP',
-]
-
 COMM_GROUP_COMPARE_VALS = [
     'MPI_IDENT',
     'MPI_CONGRUENT',

ompi/mpi/c/comm_disconnect.c.in

@@ -31,7 +31,7 @@
 #include "ompi/memchecker.h"
 #include "ompi/dpm/dpm.h"
 
-PROTOTYPE ERROR_CLASS comm_disconnect(COMM_OUT comm)
+PROTOTYPE ERROR_CLASS comm_disconnect(COMM_INOUT comm)
 {
     int ret = MPI_SUCCESS;
 

ompi/mpi/c/errhandler_free.c.in

@@ -36,7 +36,8 @@ PROTOTYPE ERROR_CLASS errhandler_free(ERRHANDLER_INOUT errhandler)
        *and* the reference count is 1 (meaning that this FREE would
        actually free the underlying intrinsic object).  This is ugly
        but necessary -- see below. */
-    if (NULL == errhandler ||
+    if (NULL == errhandler || NULL == *errhandler ||
+        MPI_ERRHANDLER_NULL == *errhandler ||
         (ompi_errhandler_is_intrinsic(*errhandler) &&
          1 == (*errhandler)->super.obj_reference_count)) {
       return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ERRHANDLER,

ompi/mpi/c/group_free.c.in

@@ -50,8 +50,8 @@ PROTOTYPE ERROR_CLASS group_free(GROUP_INOUT group)
     if (MPI_PARAM_CHECK) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
 
-        if ((NULL == group) ||
-            (MPI_GROUP_NULL == *group) || (NULL == *group) ) {
+        if (NULL == group || NULL == *group ||
+            MPI_GROUP_NULL == *group) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_GROUP,
                                           FUNC_NAME);
         }

ompi/mpi/c/info_free.c.in

@@ -50,7 +50,8 @@ PROTOTYPE ERROR_CLASS info_free(INFO_INOUT info)
      * fashion so that there are no dangling pointers.
      */
     if (MPI_PARAM_CHECK) {
-        if (NULL == info || MPI_INFO_NULL == *info ||
+        if (NULL == info || NULL == *info ||
+            MPI_INFO_NULL == *info || MPI_INFO_ENV == *info ||
             ompi_info_is_freed(*info)) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_INFO,
                                           FUNC_NAME);

ompi/mpi/c/op_free.c.in

@@ -34,7 +34,8 @@ PROTOTYPE ERROR_CLASS op_free(OP_INOUT op)
 
   if (MPI_PARAM_CHECK) {
     OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-    if (NULL == op ||
+    if (NULL == op || NULL == *op ||
+        MPI_OP_NULL == *op ||
         ompi_op_is_intrinsic(*op)) {
       return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_OP,
                                     FUNC_NAME);

ompi/mpi/c/type_free.c.in

@@ -40,7 +40,8 @@ PROTOTYPE ERROR_CLASS type_free(DATATYPE_INOUT type)
 
    if( MPI_PARAM_CHECK ) {
       OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-      if (NULL == type || NULL == *type || MPI_DATATYPE_NULL == *type ||
+      if (NULL == type || NULL == *type ||
+          MPI_DATATYPE_NULL == *type ||
           ompi_datatype_is_predefined(*type)) {
         return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_TYPE,
                                       FUNC_NAME );

ompi/mpi/c/win_free.c.in

@@ -35,7 +35,8 @@ PROTOTYPE ERROR_CLASS win_free(WIN_INOUT win)
     if (MPI_PARAM_CHECK) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
 
-        if (ompi_win_invalid(*win)) {
+        if (NULL == win ||
+            ompi_win_invalid(*win)) {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_WIN, FUNC_NAME);
         }
     }