Merge pull request #1143 from ggouaillardet/topic/v2.x/libnbc_ireduce_scatter_block

hppritcha · hppritcha · commit b21e914eabe5 · 2016-05-06T08:25:56.000-06:00
coll/libnbc: fix MPI_Ireduce_scatter_block for one task communicator
diff --git a/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c b/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c
@@ -8,7 +8,7 @@
  * Copyright (c) 2012      Sandia National Laboratories. All rights reserved.
  * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  *
  * Author(s): Torsten Hoefler <htor@cs.indiana.edu>
@@ -90,9 +90,6 @@ int ompi_coll_libnbc_ireduce_scatter_block(const void* sendbuf, void* recvbuf, i
         OBJ_RELEASE(schedule);
         return res;
       }
-
-      *request = &ompi_request_empty;
-      return OMPI_SUCCESS;
     }
 
     for (int r = 1, firstred = 1 ; r <= maxr; ++r) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Copyright (c) 2012 Sandia National Laboratories. All rights reserved.`
`9`	`9`	`* Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights`
`10`	`10`	`* reserved.`
`11`		`- * Copyright (c) 2014-2015 Research Organization for Information Science`
	`11`	`+ * Copyright (c) 2014-2016 Research Organization for Information Science`
`12`	`12`	`* and Technology (RIST). All rights reserved.`
`13`	`13`	`*`
`14`	`14`	`* Author(s): Torsten Hoefler <[email protected]>`
`@@ -90,9 +90,6 @@ int ompi_coll_libnbc_ireduce_scatter_block(const void* sendbuf, void* recvbuf, i`
`90`	`90`	`OBJ_RELEASE(schedule);`
`91`	`91`	`return res;`
`92`	`92`	`}`
`93`		`-`
`94`		`- *request = &ompi_request_empty;`
`95`		`- return OMPI_SUCCESS;`
`96`	`93`	`}`
`97`	`94`
`98`	`95`	`for (int r = 1, firstred = 1 ; r <= maxr; ++r) {`