coll: Enable func check in mca_coll_base_comm_select

Now nbpreq COLL was added and all `*_init` functions of the COLL interface are available. So let's enable the check of availability of those functions on a communicator creation. Signed-off-by: KAWASHIMA Takahiro <[email protected]>
open-mpi · Jan 19, 2017 · 690703e · 690703e
1 parent b1fc59f
commit 690703e
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/ompi/mca/coll/base/coll_base_comm_select.c b/ompi/mca/coll/base/coll_base_comm_select.c
@@ -271,10 +271,24 @@ int mca_coll_base_comm_select(ompi_communicator_t * comm)
         CHECK_NULL(which_func, comm, ireduce_scatter) ||
         ((OMPI_COMM_IS_INTRA(comm)) && CHECK_NULL(which_func, comm, iscan)) ||
         CHECK_NULL(which_func, comm, iscatter) ||
-        CHECK_NULL(which_func, comm, iscatterv)) {
-        /* TODO -- Once the persistent collective communication request
-         * function is implemented then check if persistent collectives have
-         * been set. */
+        CHECK_NULL(which_func, comm, iscatterv) ||
+        CHECK_NULL(which_func, comm, allgather_init) ||
+        CHECK_NULL(which_func, comm, allgatherv_init) ||
+        CHECK_NULL(which_func, comm, allreduce_init) ||
+        CHECK_NULL(which_func, comm, alltoall_init) ||
+        CHECK_NULL(which_func, comm, alltoallv_init) ||
+        CHECK_NULL(which_func, comm, alltoallw_init) ||
+        CHECK_NULL(which_func, comm, barrier_init) ||
+        CHECK_NULL(which_func, comm, bcast_init) ||
+        ((OMPI_COMM_IS_INTRA(comm)) && CHECK_NULL(which_func, comm, exscan_init)) ||
+        CHECK_NULL(which_func, comm, gather_init) ||
+        CHECK_NULL(which_func, comm, gatherv_init) ||
+        CHECK_NULL(which_func, comm, reduce_init) ||
+        CHECK_NULL(which_func, comm, reduce_scatter_block_init) ||
+        CHECK_NULL(which_func, comm, reduce_scatter_init) ||
+        ((OMPI_COMM_IS_INTRA(comm)) && CHECK_NULL(which_func, comm, scan_init)) ||
+        CHECK_NULL(which_func, comm, scatter_init) ||
+        CHECK_NULL(which_func, comm, scatterv_init)) {
         /* TODO -- Once the topology flags are set before coll_select then
          * check if neighborhood collectives have been set. */