Merge pull request #12415 from wenduwan/main_fix_scatter

wenduwan · web-flow · commit 0353f7e30945 · 2024-03-22T11:49:40.000-07:00
coll/han: fix intra-node MPI_Scatter data count and type
diff --git a/ompi/mca/coll/han/coll_han_scatter.c b/ompi/mca/coll/han/coll_han_scatter.c
@@ -187,7 +187,7 @@ mca_coll_han_scatter_intra(const void *sbuf, int scount,
 
 }
 
-/* us: upper level (intra-node) scatter task */
+/* us: upper level (inter-node) scatter task */
 int mca_coll_han_scatter_us_task(void *task_args)
 {
     mca_coll_han_scatter_args_t *t = (mca_coll_han_scatter_args_t *) task_args;
@@ -218,6 +218,8 @@ int mca_coll_han_scatter_us_task(void *task_args)
                                          t->up_comm, t->up_comm->c_coll->coll_scatter_module);
         t->sbuf = tmp_rbuf;
         t->sbuf_inter_free = tmp_buf;
+        t->sdtype = dtype;
+        t->scount = count;
     }
 
     if (t->sbuf_reorder_free != NULL && t->root == t->w_rank) {

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ mca_coll_han_scatter_intra(const void *sbuf, int scount,`
`187`	`187`
`188`	`188`	`}`
`189`	`189`
`190`		`-/* us: upper level (intra-node) scatter task */`
	`190`	`+/* us: upper level (inter-node) scatter task */`
`191`	`191`	`int mca_coll_han_scatter_us_task(void *task_args)`
`192`	`192`	`{`
`193`	`193`	`mca_coll_han_scatter_args_t t = (mca_coll_han_scatter_args_t ) task_args;`
`@@ -218,6 +218,8 @@ int mca_coll_han_scatter_us_task(void *task_args)`
`218`	`218`	`t->up_comm, t->up_comm->c_coll->coll_scatter_module);`
`219`	`219`	`t->sbuf = tmp_rbuf;`
`220`	`220`	`t->sbuf_inter_free = tmp_buf;`
	`221`	`+ t->sdtype = dtype;`
	`222`	`+ t->scount = count;`
`221`	`223`	`}`
`222`	`224`
`223`	`225`	`if (t->sbuf_reorder_free != NULL && t->root == t->w_rank) {`