Merge pull request #9712 from vspetrov/v5.0.x_coll_ucc_dt

V5.0.x: coll/ucc: adjust to UCC API change for datatype

Author: gpaulsen

ompi/mca/coll/ucc/coll_ucc_allreduce.c

@@ -31,7 +31,7 @@ static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *r
         goto fallback;
     }
     ucc_coll_args_t coll = {
-        .mask = UCC_COLL_ARGS_FIELD_PREDEFINED_REDUCTIONS,
+        .mask      = 0,
         .coll_type = UCC_COLL_TYPE_ALLREDUCE,
         .src.info = {
             .buffer   = (void*)sbuf,
@@ -45,9 +45,7 @@ static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *r
             .datatype = ucc_dt,
             .mem_type = UCC_MEMORY_TYPE_UNKNOWN
         },
-        .reduce = {
-            .predefined_op = ucc_op,
-        },
+        .op = ucc_op,
     };
     if (MPI_IN_PLACE == sbuf) {
         coll.mask |= UCC_COLL_ARGS_FIELD_FLAGS;

ompi/mca/coll/ucc/coll_ucc_reduce.c

@@ -1,4 +1,3 @@
-
 /**
  * Copyright (c) 2021 Mellanox Technologies. All rights reserved.
  * $COPYRIGHT$
@@ -32,7 +31,7 @@ static inline ucc_status_t mca_coll_ucc_reduce_init(const void *sbuf, void *rbuf
         goto fallback;
     }
     ucc_coll_args_t coll = {
-        .mask = UCC_COLL_ARGS_FIELD_PREDEFINED_REDUCTIONS,
+        .mask = 0,
         .coll_type = UCC_COLL_TYPE_REDUCE,
         .root = root,
         .src.info = {
@@ -47,9 +46,7 @@ static inline ucc_status_t mca_coll_ucc_reduce_init(const void *sbuf, void *rbuf
             .datatype = ucc_dt,
             .mem_type = UCC_MEMORY_TYPE_UNKNOWN
         },
-        .reduce = {
-            .predefined_op = ucc_op,
-        },
+        .op = ucc_op,
     };
     if (MPI_IN_PLACE == sbuf) {
         coll.mask |= UCC_COLL_ARGS_FIELD_FLAGS;

oshmem/mca/scoll/ucc/scoll_ucc_reduce.c

@@ -33,7 +33,7 @@ static inline ucc_status_t mca_scoll_ucc_reduce_init(const void *sbuf, void *rbu
     }
 
     ucc_coll_args_t coll = {
-        .mask = UCC_COLL_ARGS_FIELD_PREDEFINED_REDUCTIONS,
+        .mask = 0,
         .coll_type = UCC_COLL_TYPE_ALLREDUCE,
         .src.info = {
             .buffer = (void *)sbuf,
@@ -47,9 +47,7 @@ static inline ucc_status_t mca_scoll_ucc_reduce_init(const void *sbuf, void *rbu
             .datatype = ucc_dt,
             .mem_type = UCC_MEMORY_TYPE_UNKNOWN
         },
-        .reduce = {
-            .predefined_op = ucc_op,
-        },
+        .op = ucc_op,
     };
 
     if (sbuf == rbuf) {