This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, 3.2.x has been created at 88557f903875b4f2a44283a343eee4ac045aeb2a (commit) - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/88557f903875b4f2a44283a343eee4ac04... commit 88557f903875b4f2a44283a343eee4ac045aeb2a Author: Ken Raffenetti <[email protected]> Date: Thu Aug 18 12:04:51 2016 -0500 hcoll: Add reference to internal requests Signed-off-by: Tomislav Janjusic <[email protected]> diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index e0d2136..123a71f 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -364,6 +364,7 @@ static void *get_coll_handle(void) { MPID_Request *req; req = MPID_Request_create(); + MPIR_Request_add_ref(req); req->kind = MPID_COLL_REQUEST; return (void *) req; } http://git.mpich.org/mpich.git/commitdiff/ca5e6a6befeeffbc8347da7b32058d5210... commit ca5e6a6befeeffbc8347da7b32058d5210911161 Author: Ken Raffenetti <[email protected]> Date: Thu Aug 18 12:03:51 2016 -0500 hcoll: Use MPIU_Assert Signed-off-by: Tomislav Janjusic <[email protected]> diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index 996cf7f..e0d2136 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -1,6 +1,5 @@ #include "hcoll.h" #include "hcoll/api/hcoll_dte.h" -#include <assert.h> static int recv_nb(dte_data_representation_t data, uint32_t count, @@ -54,7 +53,7 @@ static void progress(void) * error codes. The progress function pointer right now * expects that the function returns void. */ ret = hcoll_do_progress(&made_progress); - assert(ret == MPI_SUCCESS); + MPIU_Assert(ret == MPI_SUCCESS); } } http://git.mpich.org/mpich.git/commitdiff/5fe0a4918ac41e7e5f9035ac561e703490... commit 5fe0a4918ac41e7e5f9035ac561e7034902fefb0 Author: Ken Raffenetti <[email protected]> Date: Tue Aug 16 15:53:58 2016 -0500 hcoll: Fix usage of progress hook MPICH progress hooks now take a made_progress parameter. We just set it to true for now for correctness purposes. Signed-off-by: Tomislav Janjusic <[email protected]> diff --git a/src/mpid/common/hcoll/hcoll_init.c b/src/mpid/common/hcoll/hcoll_init.c index c04704a..daa0caa 100644 --- a/src/mpid/common/hcoll/hcoll_init.c +++ b/src/mpid/common/hcoll/hcoll_init.c @@ -226,8 +226,7 @@ int hcoll_comm_destroy(MPID_Comm * comm_ptr, void *param) int hcoll_do_progress(int *made_progress) { - if (made_progress) - *made_progress = 0; + *made_progress = 1; hcoll_progress_fn(); return MPI_SUCCESS; diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index 82fa961..996cf7f 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -44,6 +44,7 @@ static int world_rank(rte_grp_handle_t grp_h, rte_ec_handle_t ec); static void progress(void) { int ret; + int made_progress; if (0 == world_comm_destroying) { MPID_Progress_test(); @@ -52,7 +53,7 @@ static void progress(void) /* FIXME: The hcoll library needs to be updated to return * error codes. The progress function pointer right now * expects that the function returns void. */ - ret = hcoll_do_progress(); + ret = hcoll_do_progress(&made_progress); assert(ret == MPI_SUCCESS); } } http://git.mpich.org/mpich.git/commitdiff/d20930987ec9d4aee5830fbf89f72af6e0... commit d20930987ec9d4aee5830fbf89f72af6e02807d3 Author: Ken Raffenetti <[email protected]> Date: Thu Aug 18 11:43:09 2016 -0500 hcoll: Remove unused function Signed-off-by: Tomislav Janjusic <[email protected]> diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index e7288a4..82fa961 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -23,8 +23,6 @@ static int ec_handle_compare(rte_ec_handle_t handle_1, static int get_ec_handles(int num_ec, int *ec_indexes, rte_grp_handle_t, rte_ec_handle_t * ec_handles); -static int get_my_ec(rte_grp_handle_t, rte_ec_handle_t * ec_handle); - static int group_size(rte_grp_handle_t group); static int my_rank(rte_grp_handle_t grp_h); static int ec_on_local_node(rte_ec_handle_t ec, rte_grp_handle_t group); @@ -294,21 +292,6 @@ static int get_ec_handles(int num_ec, } #undef FUNCNAME -#define FUNCNAME get_my_ec -#undef FCNAME -#define FCNAME MPL_QUOTE(FUNCNAME) -static int get_my_ec(rte_grp_handle_t grp_h, rte_ec_handle_t * ec_handle) -{ - MPID_Comm *comm; - comm = (MPID_Comm *) grp_h; - int my_rank = MPIR_Comm_rank(comm); - ec_handle->handle = (void *) (comm->vcrt->vcr_table[my_rank]); - ec_handle->rank = my_rank; - return HCOLL_SUCCESS; -} - - -#undef FUNCNAME #define FUNCNAME group_size #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) http://git.mpich.org/mpich.git/commitdiff/1db759cd3878fbf0b531a7ce630093ba78... commit 1db759cd3878fbf0b531a7ce630093ba789e9bd6 Author: Ken Raffenetti <[email protected]> Date: Thu Aug 18 11:41:44 2016 -0500 hcoll: Fix ec_handles The glue code used to rely on access to VCs, which are no longer exposed to the upper layers. This commit hacks in access to them again to get hcoll working. We will add a new device interface to not be CH3 specific. Signed-off-by: Tomislav Janjusic <[email protected]> diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index ea543fe..e7288a4 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -288,7 +288,7 @@ static int get_ec_handles(int num_ec, comm = (MPID_Comm *) grp_h; for (i = 0; i < num_ec; i++) { ec_handles[i].rank = ec_indexes[i]; - ec_handles[i].handle = (void *) (comm->vcrt->vcr_table[ec_indexes[i]]); + ec_handles[i].handle = (void *) (comm->dev.vcrt->vcr_table[ec_indexes[i]]); } return HCOLL_SUCCESS; } @@ -430,5 +430,5 @@ static void coll_handle_complete(void *handle) #define FCNAME MPL_QUOTE(FUNCNAME) static int world_rank(rte_grp_handle_t grp_h, rte_ec_handle_t ec) { - return (MPIR_Process.comm_world->rank); + return ((struct MPIDI_VC *)ec.handle)->pg_rank; } ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository