jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "In irregular.cpp use simpler and slightly faster MPI_Reduce_scatter_block()" 

This reverts commit 8e75616c14.
This commit is contained in:
Axel Kohlmeyer 2017-03-17 11:35:59 -04:00
parent 8e75616c14
commit 7fb741d53d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/irregular.cpp
View File

@ -297,9 +297,11 @@ int Irregular::create_atom(int n, int *sizes, int *proclist, int sortflag)
// setup for collective comm // setup for collective comm
// work1 = 1 for procs I send a message to, not including self // work1 = 1 for procs I send a message to, not including self
// work2 = 1 for all procs, used for ReduceScatter
for (i = 0; i < nprocs; i++) { for (i = 0; i < nprocs; i++) {
work1[i] = 0; work1[i] = 0;
work2[i] = 1;
} }
for (i = 0; i < n; i++) work1[proclist[i]] = 1; for (i = 0; i < n; i++) work1[proclist[i]] = 1;
work1[me] = 0; work1[me] = 0;
@ -316,7 +318,7 @@ int Irregular::create_atom(int n, int *sizes, int *proclist, int sortflag)
MPI_Allreduce(work1,work2,nprocs,MPI_INT,MPI_SUM,world); MPI_Allreduce(work1,work2,nprocs,MPI_INT,MPI_SUM,world);
nrecv_proc = work2[me]; nrecv_proc = work2[me];
#else #else
MPI_Reduce_scatter_block(work1,&nrecv_proc,1,MPI_INT,MPI_SUM,world); MPI_Reduce_scatter(work1,&nrecv_proc,work2,MPI_INT,MPI_SUM,world);
#endif #endif
#endif #endif
@ -543,9 +545,11 @@ int Irregular::create_data(int n, int *proclist, int sortflag)
// setup for collective comm // setup for collective comm
// work1 = 1 for procs I send a message to, not including self // work1 = 1 for procs I send a message to, not including self
// work2 = 1 for all procs, used for ReduceScatter
for (i = 0; i < nprocs; i++) { for (i = 0; i < nprocs; i++) {
work1[i] = 0; work1[i] = 0;
work2[i] = 1;
} }
for (i = 0; i < n; i++) work1[proclist[i]] = 1; for (i = 0; i < n; i++) work1[proclist[i]] = 1;
work1[me] = 0; work1[me] = 0;
@ -562,7 +566,7 @@ int Irregular::create_data(int n, int *proclist, int sortflag)
MPI_Allreduce(work1,work2,nprocs,MPI_INT,MPI_SUM,world); MPI_Allreduce(work1,work2,nprocs,MPI_INT,MPI_SUM,world);
nrecv_proc = work2[me]; nrecv_proc = work2[me];
#else #else
MPI_Reduce_scatter_block(work1,&nrecv_proc,1,MPI_INT,MPI_SUM,world); MPI_Reduce_scatter(work1,&nrecv_proc,work2,MPI_INT,MPI_SUM,world);
#endif #endif
#endif #endif