Merge pull request #6876 from hzhou/2401_abi

abi: redefine MPI_THREAD_XXX constants into macros Approved-by: Ken Raffenetti
pmodels · Jan 22, 2024 · c2f04da · c2f04da
2 parents c5f56f7 + 7a3f687
commit c2f04da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/maint/gen_abi.py b/maint/gen_abi.py
@@ -33,6 +33,7 @@ def load_mpi_abi_h(mpi_abi_h):
         G.abi_h_lines = In.readlines()
 
 def dump_mpi_abi_internal_h(mpi_abi_internal_h):
+    define_constants = {}
     def gen_mpi_abi_internal_h(out):
         re_Handle = r'\bMPI_(Comm|Datatype|Errhandler|Group|Info|Message|Op|Request|Session|Win|KEYVAL_INVALID|TAG_UB|IO|HOST|WTIME_IS_GLOBAL|APPNUM|LASTUSEDCODE|UNIVERSE_SIZE|WIN_BASE|WIN_DISP_UNIT|WIN_SIZE|WIN_CREATE_FLAVOR|WIN_MODEL)\b'
         for line in G.abi_h_lines:
@@ -78,6 +79,10 @@ def gen_mpi_abi_internal_h(out):
             elif RE.match(r'^extern\s+(\w+\s*\**)\s+(MPI_\w+);', line):
                 (T, name) = RE.m.group(1,2)
                 out.append("extern %s %s MPICH_API_PUBLIC;" % (T, name))
+            elif RE.match(r'\s*(MPI_THREAD_\w+)\s*=\s*(\d+)', line):
+                # These constants need to be converted from enum-constants into macro-constants
+                define_constants[RE.m.group(1)] = RE.m.group(2)
+                pass
             else:
                 # replace param prefix
                 out.append(re.sub(re_Handle, r'ABI_\1', line.rstrip()))
@@ -93,6 +98,8 @@ def gen_mpi_abi_internal_h(out):
         print("#define MPI_ABI_INTERNAL_H_INCLUDED", file=Out)
         print("", file=Out)
 
+        for k in define_constants:
+            print("#define %s %s" % (k, define_constants[k]), file=Out)
         print("", file=Out)
         for line in output_lines:
             print(line, file=Out)

diff --git a/maint/local_python/binding_c.py b/maint/local_python/binding_c.py
@@ -1007,12 +1007,12 @@ def process_handle(p):
         else:
             if p['param_direction'] == 'out':
                 # pass NULL thru for error-checking
-                pre_filters.append("MPI_%s %s_i;" % (T, name))
+                pre_filters.append("MPI_%s %s_i = MPI_%s_NULL;" % (T, name, T.upper()))
                 pre_filters.append("MPI_%s *%s = NULL;" % (T, name))
                 pre_filters.append("if (%s_abi != NULL) {" % name)
                 pre_filters.append("    %s = &%s_i;" % (name, name))
                 pre_filters.append("}")
-                post_filters.append("if (ret == MPI_SUCCESS && %s_abi != NULL) {" % name)
+                post_filters.append("if (%s_abi != NULL) {" % name)
                 post_filters.append("    *%s_abi = ABI_%s_from_mpi(%s_i);" % (name, T, name));
                 post_filters.append("}")
             elif p['param_direction'] == 'inout' or func['name'] == "MPI_Cancel":