Merge pull request #1788 from hjelmn/split_type

hjelmn · web-flow · commit 3a69b727a610 · 2016-06-16T21:12:25.000-06:00
comm/split_type: allow MPI_UNDEFINED for split_type
diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c
@@ -853,15 +853,15 @@ ompi_comm_split_type(ompi_communicator_t *comm,
 
     /* check that all processors have been called with the same value */
     for (int i = 0 ; i < size ; ++i) {
-        if ( results[2*i] != split_type ) {
+        if ( results[2*i] != split_type && MPI_UNDEFINED != results[2*i] && MPI_UNDEFINED != split_type) {
             rc = OMPI_ERR_BAD_PARAM;
             goto exit;
         }
     }
 
     /* how many are participating and on my node? */
     rc = ompi_comm_split_type_get_part (comm->c_local_group, results, &lranks, &my_size);
-    if (0 == my_size) {
+    if (0 == my_size && MPI_UNDEFINED != split_type) {
         /* should never happen */
         rc = OMPI_ERR_BAD_PARAM;
     }

Original file line number	Diff line number	Diff line change
`@@ -853,15 +853,15 @@ ompi_comm_split_type(ompi_communicator_t *comm,`
`853`	`853`
`854`	`854`	`/* check that all processors have been called with the same value */`
`855`	`855`	`for (int i = 0 ; i < size ; ++i) {`
`856`		`- if ( results[2*i] != split_type ) {`
	`856`	`+ if ( results[2i] != split_type && MPI_UNDEFINED != results[2i] && MPI_UNDEFINED != split_type) {`
`857`	`857`	`rc = OMPI_ERR_BAD_PARAM;`
`858`	`858`	`goto exit;`
`859`	`859`	`}`
`860`	`860`	`}`
`861`	`861`
`862`	`862`	`/* how many are participating and on my node? */`
`863`	`863`	`rc = ompi_comm_split_type_get_part (comm->c_local_group, results, &lranks, &my_size);`
`864`		`- if (0 == my_size) {`
	`864`	`+ if (0 == my_size && MPI_UNDEFINED != split_type) {`
`865`	`865`	`/* should never happen */`
`866`	`866`	`rc = OMPI_ERR_BAD_PARAM;`
`867`	`867`	`}`