diff --git a/ompi/mca/coll/portals4/coll_portals4_allreduce.c b/ompi/mca/coll/portals4/coll_portals4_allreduce.c index 57d681d9f6..61f140cd0f 100644 --- a/ompi/mca/coll/portals4/coll_portals4_allreduce.c +++ b/ompi/mca/coll/portals4/coll_portals4_allreduce.c @@ -265,7 +265,7 @@ allreduce_kary_tree_top(const void *sendbuf, void *recvbuf, int count, ompi_coll_portals4_get_peer(comm, child[i]), mca_coll_portals4_component.pt_idx, match_bits_rtr, 0, NULL, 0)) != PTL_OK) - return opal_stderr("Put RTR failed", __FILE__, __LINE__, ret); + return opal_stderr("Put RTR failed %d", __FILE__, __LINE__, ret); } } } @@ -408,7 +408,7 @@ int ompi_coll_portals4_iallreduce_intra(const void* sendbuf, void* recvbuf, int allreduce_kary_tree_top(sendbuf, recvbuf, count, dtype, op, comm, request, portals4_module); - puts("iallreduce"); + opal_output_verbose(10, ompi_coll_base_framework.framework_output, "iallreduce"); return (OMPI_SUCCESS); } diff --git a/ompi/mca/coll/portals4/coll_portals4_bcast.c b/ompi/mca/coll/portals4/coll_portals4_bcast.c index fe0431d903..db23a21029 100644 --- a/ompi/mca/coll/portals4/coll_portals4_bcast.c +++ b/ompi/mca/coll/portals4/coll_portals4_bcast.c @@ -409,9 +409,9 @@ bcast_kary_tree_top(void *buff, int count, */ if (rank != root) { - ack_thr = segment_nb; + trig_thr = segment_nb; if (is_sync) { - if ((ret = PtlCTWait(request->u.bcast.trig_ct_h, ack_thr, &ct)) != 0) { + if ((ret = PtlCTWait(request->u.bcast.trig_ct_h, trig_thr, &ct)) != 0) { opal_stderr("PtlCTWait failed", __FILE__, __LINE__, ret); } } @@ -421,7 +421,7 @@ bcast_kary_tree_top(void *buff, int count, mca_coll_portals4_component.finish_pt_idx, 0, 0, NULL, (uintptr_t) request, request->u.bcast.trig_ct_h, - ack_thr)) != 0) { + trig_thr)) != 0) { return opal_stderr("PtlTriggeredPut failed", __FILE__, __LINE__, ret); } @@ -696,8 +696,9 @@ bcast_pipeline_top(void *buff, int count, */ if (rank != root) { + trig_thr = segment_nb; if (is_sync) { - if ((ret = PtlCTWait(request->u.bcast.trig_ct_h, segment_nb, &ct)) != 0) { + if ((ret = PtlCTWait(request->u.bcast.trig_ct_h, trig_thr, &ct)) != 0) { opal_stderr("PtlCTWait failed", __FILE__, __LINE__, ret); } } @@ -707,7 +708,7 @@ bcast_pipeline_top(void *buff, int count, mca_coll_portals4_component.finish_pt_idx, 0, 0, NULL, (uintptr_t) request, request->u.bcast.trig_ct_h, - segment_nb)) != 0) { + trig_thr)) != 0) { return opal_stderr("PtlTriggeredPut failed", __FILE__, __LINE__, ret); } } @@ -831,7 +832,7 @@ ompi_coll_portals4_ibcast_intra(void *buff, int count, return OMPI_ERROR; } - puts("ibcast"); + opal_output_verbose(10, ompi_coll_base_framework.framework_output, "ibcast_intra"); return (OMPI_SUCCESS); } @@ -860,5 +861,6 @@ ompi_coll_portals4_ibcast_intra_fini(ompi_coll_portals4_request_t *request) ompi_request_complete(&request->super, true); OPAL_THREAD_UNLOCK(&ompi_request_lock); + opal_output_verbose(10, ompi_coll_base_framework.framework_output, "ibcast_intra_fini"); return (OMPI_SUCCESS); } diff --git a/ompi/mca/coll/portals4/coll_portals4_reduce.c b/ompi/mca/coll/portals4/coll_portals4_reduce.c index 39928cfb85..92933ebeec 100644 --- a/ompi/mca/coll/portals4/coll_portals4_reduce.c +++ b/ompi/mca/coll/portals4/coll_portals4_reduce.c @@ -428,7 +428,7 @@ ompi_coll_portals4_ireduce_intra(const void* sendbuf, void* recvbuf, int count, OMPI_COLL_PORTALS4_REQUEST_RETURN(request); } - puts("ireduce"); + opal_output_verbose(10, ompi_coll_base_framework.framework_output, "ireduce"); return (OMPI_SUCCESS); }