checkpoint

ggouaillardet · ggouaillardet · commit 0f5f5fcfb9e0 · 2016-06-23T11:00:02.000+09:00
diff --git a/ompi/mca/coll/base/coll_base_bcast.c b/ompi/mca/coll/base/coll_base_bcast.c
@@ -601,10 +601,11 @@ ompi_coll_base_bcast_intra_split_bintree ( void* buffer,
             offsets[0] += sizes[0];
         }
         opal_convertor_set_position(&recv_convertors[0], &offsets[0]);
+
         offsets[0] += sizes[lr] - remainings[lr];
         offsets[1] = offsets[0] + segsize;
-        if (offsets[1] > sizes[lr]) {
-            offsets[1] = sizes[lr];
+        if (offsets[1] > sizes[lr] + (lr?sizes[0]:0)) {
+            offsets[1] = sizes[lr] + (lr?sizes[0]:0);
         }
         opal_convertor_set_position(&recv_convertors[1], &offsets[1]);
         if (offsets[1] == offsets[0]) {

Original file line number	Diff line number	Diff line change
`@@ -601,10 +601,11 @@ ompi_coll_base_bcast_intra_split_bintree ( void* buffer,`
`601`	`601`	`offsets[0] += sizes[0];`
`602`	`602`	`}`
`603`	`603`	`opal_convertor_set_position(&recv_convertors[0], &offsets[0]);`
	`604`	`+`
`604`	`605`	`offsets[0] += sizes[lr] - remainings[lr];`
`605`	`606`	`offsets[1] = offsets[0] + segsize;`
`606`		`- if (offsets[1] > sizes[lr]) {`
`607`		`- offsets[1] = sizes[lr];`
	`607`	`+ if (offsets[1] > sizes[lr] + (lr?sizes[0]:0)) {`
	`608`	`+ offsets[1] = sizes[lr] + (lr?sizes[0]:0);`
`608`	`609`	`}`
`609`	`610`	`opal_convertor_set_position(&recv_convertors[1], &offsets[1]);`
`610`	`611`	`if (offsets[1] == offsets[0]) {`