From ba3bf6592f1b23771fbd12d31ba04d0d672f32d6 Mon Sep 17 00:00:00 2001 From: Edgar Gabriel Date: Wed, 26 Oct 2005 12:56:56 +0000 Subject: [PATCH] fixing some warnings. No idea yet why the static builds fail... This commit was SVN r7879. --- ompi/mca/coll/hierarch/coll_hierarch_allreduce.c | 4 ++-- ompi/mca/coll/hierarch/coll_hierarch_barrier.c | 2 +- ompi/mca/coll/hierarch/coll_hierarch_bcast.c | 2 +- ompi/mca/coll/hierarch/coll_hierarch_component.c | 14 +++++++++----- ompi/mca/coll/hierarch/coll_hierarch_reduce.c | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c b/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c index 4c3d550008..0ae6b0f67f 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c @@ -42,11 +42,11 @@ int mca_coll_hierarch_allreduce_intra(void *sbuf, void *rbuf, int count, struct mca_coll_base_comm_t *data=NULL; struct ompi_communicator_t *llcomm=NULL; struct ompi_communicator_t *lcomm=NULL; - int rank, lrank; + int rank; int lroot, llroot; long extent, true_extent, lb, true_lb; char *tmpbuf=NULL, *tbuf=NULL; - int ret; + int ret=OMPI_SUCCESS; int root=0; rank = ompi_comm_rank ( comm ); diff --git a/ompi/mca/coll/hierarch/coll_hierarch_barrier.c b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c index de87e8ceb5..34772ddf9e 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_barrier.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c @@ -39,7 +39,7 @@ int mca_coll_hierarch_barrier_intra(struct ompi_communicator_t *comm) struct ompi_communicator_t *lcomm=NULL; int root=0; int lroot, llroot; - int rank, ret; + int rank, ret=OMPI_SUCCESS; rank = ompi_comm_rank ( comm ); data = comm->c_coll_selected_data; diff --git a/ompi/mca/coll/hierarch/coll_hierarch_bcast.c b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c index 7a14e452ac..e1ade9f1df 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_bcast.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c @@ -42,7 +42,7 @@ int mca_coll_hierarch_bcast_intra(void *buff, struct ompi_communicator_t *llcomm=NULL; struct ompi_communicator_t *lcomm=NULL; int lroot, llroot; - int rank, ret; + int rank, ret=OMPI_SUCCESS; rank = ompi_comm_rank ( comm ); diff --git a/ompi/mca/coll/hierarch/coll_hierarch_component.c b/ompi/mca/coll/hierarch/coll_hierarch_component.c index 6809c3c4e4..8dd3c0bc2a 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_component.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_component.c @@ -91,27 +91,31 @@ const mca_coll_base_component_1_0_0_t mca_coll_hierarch_component = { static int hierarch_open(void) { - mca_base_component_t *c = &mca_coll_hierarch_component.collm_version; + /* Use a high priority, but allow other components to be higher */ - mca_base_param_reg_int(c, "priority", + mca_base_param_reg_int(&mca_coll_hierarch_component.collm_version, + "priority", "Priority of the hierarchical coll component", false, false, mca_coll_hierarch_priority_param, &mca_coll_hierarch_priority_param); - mca_base_param_reg_int(c, "verbose", + mca_base_param_reg_int(&mca_coll_hierarch_component.collm_version, + "verbose", "Turn verbose message of the hierarchical coll component on/off", false, false, mca_coll_hierarch_verbose_param, &mca_coll_hierarch_verbose_param); - mca_base_param_reg_int(c, "use_rdma", + mca_base_param_reg_int(&mca_coll_hierarch_component.collm_version, + "use_rdma", "Switch from the send btl list used to detect hierarchies to " "the rdma btl list", false, false, mca_coll_hierarch_use_rdma_param, &mca_coll_hierarch_use_rdma_param); - mca_base_param_reg_int(c, "ignore_sm", + mca_base_param_reg_int(&mca_coll_hierarch_component.collm_version, + "ignore_sm", "Ignore sm protocol when detecting hierarchies. " "Required to enable the usage of protocol" " specific collective operations", diff --git a/ompi/mca/coll/hierarch/coll_hierarch_reduce.c b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c index 0a4ed54ac3..ec59abfb62 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_reduce.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c @@ -42,11 +42,11 @@ int mca_coll_hierarch_reduce_intra(void *sbuf, void *rbuf, int count, struct mca_coll_base_comm_t *data=NULL; struct ompi_communicator_t *llcomm=NULL; struct ompi_communicator_t *lcomm=NULL; - int rank, lrank; + int rank; int lroot, llroot; long extent, true_extent, lb, true_lb; char *tmpbuf=NULL, *tbuf=NULL; - int ret; + int ret=OMPI_SUCCESS; rank = ompi_comm_rank ( comm ); data = comm->c_coll_selected_data;