Fixing gcc 4.7.1 warning in ptpcoll bcol. Refs trac:3243.
This commit was SVN r27209. The following Trac tickets were found above: Ticket 3243 --> https://svn.open-mpi.org/trac/ompi/ticket/3243
Этот коммит содержится в:
родитель
da00d281e6
Коммит
888b04ab36
@ -1020,7 +1020,6 @@ int bcol_ptpcoll_bcast_binomial_scatter_gatther_anyroot(bcol_function_args_t *in
|
|||||||
|
|
||||||
int tag;
|
int tag;
|
||||||
int rc;
|
int rc;
|
||||||
int completed = 0;
|
|
||||||
int my_group_index = ptpcoll_module->super.sbgp_partner_module->my_index;
|
int my_group_index = ptpcoll_module->super.sbgp_partner_module->my_index;
|
||||||
int *group_list = ptpcoll_module->super.sbgp_partner_module->group_list;
|
int *group_list = ptpcoll_module->super.sbgp_partner_module->group_list;
|
||||||
uint64_t sequence_number = input_args->sequence_num;
|
uint64_t sequence_number = input_args->sequence_num;
|
||||||
@ -1104,7 +1103,7 @@ int bcol_ptpcoll_bcast_binomial_scatter_gatther_anyroot(bcol_function_args_t *in
|
|||||||
K_NOMIAL_ROOT_BCAST_NB_BINOMIAL_SCATTER(root_pow2,
|
K_NOMIAL_ROOT_BCAST_NB_BINOMIAL_SCATTER(root_pow2,
|
||||||
my_group_index, group_size, group_list,
|
my_group_index, group_size, group_list,
|
||||||
data_buffer, base_block_size, count, tag, comm, requests,
|
data_buffer, base_block_size, count, tag, comm, requests,
|
||||||
active_requests, completed);
|
active_requests);
|
||||||
|
|
||||||
goto GATHER;
|
goto GATHER;
|
||||||
}
|
}
|
||||||
@ -1288,7 +1287,6 @@ int bcol_ptpcoll_bcast_binomial_scatter_gatther_known_root(bcol_function_args_t
|
|||||||
int root_pow2 = ptpcoll_module->pow_2 - 1;
|
int root_pow2 = ptpcoll_module->pow_2 - 1;
|
||||||
int *status =
|
int *status =
|
||||||
&(ptpcoll_module->ml_mem.ml_buf_desc[buffer_index].status);
|
&(ptpcoll_module->ml_mem.ml_buf_desc[buffer_index].status);
|
||||||
int completed = 0;
|
|
||||||
|
|
||||||
PTPCOLL_VERBOSE(3, ("BCAST Anyroot, index_this_type %d, num_of_this_type %d",
|
PTPCOLL_VERBOSE(3, ("BCAST Anyroot, index_this_type %d, num_of_this_type %d",
|
||||||
const_args->index_of_this_type_in_collective + 1,
|
const_args->index_of_this_type_in_collective + 1,
|
||||||
@ -1346,7 +1344,7 @@ int bcol_ptpcoll_bcast_binomial_scatter_gatther_known_root(bcol_function_args_t
|
|||||||
K_NOMIAL_ROOT_BCAST_NB_BINOMIAL_SCATTER(root_pow2,
|
K_NOMIAL_ROOT_BCAST_NB_BINOMIAL_SCATTER(root_pow2,
|
||||||
my_group_index, group_size, group_list,
|
my_group_index, group_size, group_list,
|
||||||
data_buffer, base_block_size, count, tag, comm, requests,
|
data_buffer, base_block_size, count, tag, comm, requests,
|
||||||
active_requests, completed);
|
active_requests);
|
||||||
|
|
||||||
/* EXIT OR GO TO Gather */
|
/* EXIT OR GO TO Gather */
|
||||||
*iteration = 0;
|
*iteration = 0;
|
||||||
|
@ -55,7 +55,7 @@ int bcol_ptpcoll_bcast_binomial_scatter_gatther_known_root_extra_progress(bcol_f
|
|||||||
radix_mask_pow, \
|
radix_mask_pow, \
|
||||||
my_group_index, group_size, group_list, \
|
my_group_index, group_size, group_list, \
|
||||||
data_buffer, segment_size, count, tag, \
|
data_buffer, segment_size, count, tag, \
|
||||||
comm, send_requests, num_pending_sends, completed) \
|
comm, send_requests, num_pending_sends) \
|
||||||
do { \
|
do { \
|
||||||
int rc = OMPI_SUCCESS; \
|
int rc = OMPI_SUCCESS; \
|
||||||
int dst; \
|
int dst; \
|
||||||
@ -108,15 +108,6 @@ do {
|
|||||||
++(*num_pending_sends); \
|
++(*num_pending_sends); \
|
||||||
radix_mask >>= 1; \
|
radix_mask >>= 1; \
|
||||||
radix_mask_pow--; \
|
radix_mask_pow--; \
|
||||||
} \
|
|
||||||
\
|
|
||||||
if (*num_pending_sends > 0) { \
|
|
||||||
completed = mca_bcol_ptpcoll_test_all_for_match(num_pending_sends, send_requests, &rc); \
|
|
||||||
if (OMPI_SUCCESS != rc) { \
|
|
||||||
return OMPI_ERROR; \
|
|
||||||
} \
|
|
||||||
} else { \
|
|
||||||
completed = 1; \
|
|
||||||
} \
|
} \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
@ -565,15 +556,7 @@ PR_SCATTHER:
|
|||||||
my_group_index, group_size, group_list,
|
my_group_index, group_size, group_list,
|
||||||
data_buffer, base_block_size,
|
data_buffer, base_block_size,
|
||||||
count, tag, comm, requests,
|
count, tag, comm, requests,
|
||||||
active_requests, completed);
|
active_requests);
|
||||||
|
|
||||||
#if 0
|
|
||||||
if (0 == completed) {
|
|
||||||
return BCOL_FN_STARTED;
|
|
||||||
} else {
|
|
||||||
return BCOL_FN_COMPLETE;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Since the next step (gather) does not really require
|
/* Since the next step (gather) does not really require
|
||||||
completion on scatter , we may return complete */
|
completion on scatter , we may return complete */
|
||||||
@ -626,7 +609,6 @@ int bcol_ptpcoll_bcast_binomial_test_and_scatter_known_root(mca_bcol_ptpcoll_mod
|
|||||||
{
|
{
|
||||||
int *group_list = ptpcoll_module->super.sbgp_partner_module->group_list;
|
int *group_list = ptpcoll_module->super.sbgp_partner_module->group_list;
|
||||||
int rc;
|
int rc;
|
||||||
int completed = 0;
|
|
||||||
int *active_requests =
|
int *active_requests =
|
||||||
&(ptpcoll_module->ml_mem.ml_buf_desc[buffer_index].active_requests);
|
&(ptpcoll_module->ml_mem.ml_buf_desc[buffer_index].active_requests);
|
||||||
ompi_communicator_t* comm = ptpcoll_module->super.sbgp_partner_module->group_comm;
|
ompi_communicator_t* comm = ptpcoll_module->super.sbgp_partner_module->group_comm;
|
||||||
@ -657,7 +639,7 @@ int bcol_ptpcoll_bcast_binomial_test_and_scatter_known_root(mca_bcol_ptpcoll_mod
|
|||||||
my_group_index, group_size, group_list,
|
my_group_index, group_size, group_list,
|
||||||
data_buffer, base_block_size,
|
data_buffer, base_block_size,
|
||||||
count, tag, comm, requests,
|
count, tag, comm, requests,
|
||||||
active_requests, completed);
|
active_requests);
|
||||||
|
|
||||||
|
|
||||||
return BCOL_FN_COMPLETE;
|
return BCOL_FN_COMPLETE;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user