coll/csel: enable compositional algorithms

autogen.sh

@@ -531,7 +531,7 @@ fn_gen_binding_c() {
 
 fn_json_gen() {
     echo_n "generating json char arrays... "
-    ./maint/tuning/coll/json_gen.sh
+    ./maint/json_gen.sh
     echo "done"
 }
 

dummy

@@ -0,0 +1,2 @@
+1
+1

maint/tuning/coll/json_gen.sh → maint/json_gen.sh

@@ -33,6 +33,5 @@ cat > $cfile<<EOF
 EOF
 
 # create specific json buffers
-create_json_buf maint/tuning/coll/mpir/generic.json MPII_coll_generic_json
-create_json_buf maint/tuning/coll/ch4/generic.json MPIDI_coll_generic_json
-create_json_buf maint/tuning/coll/ch4/posix_generic.json MPIDI_POSIX_coll_generic_json
+create_json_buf src/mpi/coll/coll_composition.json MPII_coll_composition_json
+create_json_buf src/mpi/coll/coll_selection.json   MPII_coll_selection_json

maint/local_python/binding_c.py

@@ -1782,17 +1782,9 @@ def push_impl_decl(func, impl_name=None):
 
     if func['_impl_param_list']:
         params = ', '.join(func['_impl_param_list'])
-        if func['dir'] == 'coll':
-            # block collective use an extra coll_attr
-            if not RE.match(r'MPI_(I.*|Neighbor.*|.*_init)$', func['name']):
-                params = params + ", int coll_attr"
     else:
         params="void"
 
-    if func['dir'] == 'coll':
-        # collective also dump MPIR_Xxx(...)
-        mpir_name = re.sub(r'^MPIX?_', 'MPIR_', func['name'])
-        G.impl_declares.append("int %s(%s);" % (mpir_name, params))
     # dump MPIR_Xxx_impl(...)
     if func['dir'] == 'io':
         G.io_impl_declares.append("int %s(%s);" % (impl_name, params))
@@ -1821,29 +1813,6 @@ def dump_CHECKENUM(var, errname, t, type="ENUM"):
     G.out.append("goto fn_fail;")
     dump_if_close()
 
-def dump_body_coll(func):
-    # collectives call MPIR_Xxx
-    mpir_name = re.sub(r'^MPIX?_', 'MPIR_', func['name'])
-
-    args = ", ".join(func['_impl_arg_list'])
-
-    if RE.match(r'MPI_(I.*|.*_init)$', func['name'], re.IGNORECASE):
-        # non-blocking collectives
-        G.out.append("MPIR_Request *request_ptr = NULL;")
-        dump_line_with_break("mpi_errno = %s(%s);" % (mpir_name, args))
-        dump_error_check("")
-        G.out.append("if (!request_ptr) {")
-        G.out.append("    request_ptr = MPIR_Request_create_complete(MPIR_REQUEST_KIND__COLL);")
-        G.out.append("}")
-        G.out.append("*request = request_ptr->handle;")
-    elif RE.match(r'mpi_neighbor_', func['name'], re.IGNORECASE):
-        dump_line_with_break("mpi_errno = %s(%s);" % (mpir_name, args))
-        dump_error_check("")
-    else:
-        # blocking collectives
-        dump_line_with_break("mpi_errno = %s(%s, 0);" % (mpir_name, args))
-        dump_error_check("")
-
 def dump_coll_v_swap(func):
     # -- wrappers to make code cleaner
     def replace_arg(old, new):
@@ -2064,8 +2033,6 @@ def dump_body_normal():
                 dump_body_topo_fns(func, RE.m.group(1))
             else:
                 print("Error: unhandled special impl: [%s]" % func['impl'])
-        elif func['dir'] == 'coll':
-            dump_body_coll(func)
         else:
             dump_body_impl(func, "mpir")