From 22f64bb62bed9549561d9779ee4930e309afff90 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Tue, 18 Mar 2014 21:25:49 +0000 Subject: [PATCH] Addendum to r31096. Up basesmuma algorithm limits to 1M. After discussion with Manju we decided to update these the process count limits of the shared memory collectives to an arbitrarily large number. cmr=v1.7.5:ticket=trac:4405 This commit was SVN r31126. The following SVN revision numbers were found above: r31096 --> open-mpi/ompi@3f469d08e7f8930aab44e402c90618788e44d1f8 The following Trac tickets were found above: Ticket 4405 --> https://svn.open-mpi.org/trac/ompi/ticket/4405 --- ompi/mca/bcol/basesmuma/bcol_basesmuma_allreduce.c | 2 +- ompi/mca/bcol/basesmuma/bcol_basesmuma_bcast.c | 2 +- ompi/mca/bcol/basesmuma/bcol_basesmuma_gather.c | 2 +- ompi/mca/bcol/basesmuma/bcol_basesmuma_reduce.c | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ompi/mca/bcol/basesmuma/bcol_basesmuma_allreduce.c b/ompi/mca/bcol/basesmuma/bcol_basesmuma_allreduce.c index 78a4798788..dd23c8f5c6 100644 --- a/ompi/mca/bcol/basesmuma/bcol_basesmuma_allreduce.c +++ b/ompi/mca/bcol/basesmuma/bcol_basesmuma_allreduce.c @@ -32,7 +32,7 @@ int bcol_basesmuma_allreduce_init(mca_bcol_base_module_t *super) comm_attribs.bcoll_type = BCOL_ALLREDUCE; comm_attribs.comm_size_min = 0; - comm_attribs.comm_size_max = 64; + comm_attribs.comm_size_max = 1048576; comm_attribs.data_src = DATA_SRC_KNOWN; /* selection logic at the ml level specifies a diff --git a/ompi/mca/bcol/basesmuma/bcol_basesmuma_bcast.c b/ompi/mca/bcol/basesmuma/bcol_basesmuma_bcast.c index fd2ac71939..2ecf09b788 100644 --- a/ompi/mca/bcol/basesmuma/bcol_basesmuma_bcast.c +++ b/ompi/mca/bcol/basesmuma/bcol_basesmuma_bcast.c @@ -41,7 +41,7 @@ int bcol_basesmuma_bcast_init(mca_bcol_base_module_t *super) comm_attribs.bcoll_type = BCOL_BCAST; comm_attribs.comm_size_min = 0; - comm_attribs.comm_size_max = 64; + comm_attribs.comm_size_max = 1048576; comm_attribs.data_src = DATA_SRC_KNOWN; comm_attribs.waiting_semantics = NON_BLOCKING; diff --git a/ompi/mca/bcol/basesmuma/bcol_basesmuma_gather.c b/ompi/mca/bcol/basesmuma/bcol_basesmuma_gather.c index 35c71ddb0b..ef3d856b88 100644 --- a/ompi/mca/bcol/basesmuma/bcol_basesmuma_gather.c +++ b/ompi/mca/bcol/basesmuma/bcol_basesmuma_gather.c @@ -36,7 +36,7 @@ int bcol_basesmuma_gather_init(mca_bcol_base_module_t *super) comm_attribs.bcoll_type = BCOL_GATHER; comm_attribs.comm_size_min = 0; - comm_attribs.comm_size_max = 16; + comm_attribs.comm_size_max = 1048576; comm_attribs.data_src = DATA_SRC_KNOWN; comm_attribs.waiting_semantics = BLOCKING; diff --git a/ompi/mca/bcol/basesmuma/bcol_basesmuma_reduce.c b/ompi/mca/bcol/basesmuma/bcol_basesmuma_reduce.c index cdd43f2267..570280d084 100644 --- a/ompi/mca/bcol/basesmuma/bcol_basesmuma_reduce.c +++ b/ompi/mca/bcol/basesmuma/bcol_basesmuma_reduce.c @@ -38,8 +38,7 @@ int bcol_basesmuma_reduce_init(mca_bcol_base_module_t *super) comm_attribs.bcoll_type = BCOL_REDUCE; comm_attribs.comm_size_min = 0; - /* NTH: is there any reason for this restriction */ - comm_attribs.comm_size_max = 64; + comm_attribs.comm_size_max = 1048576; comm_attribs.data_src = DATA_SRC_KNOWN; comm_attribs.waiting_semantics = NON_BLOCKING;