A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
appease clang
[simgrid.git]
/
src
/
smpi
/
colls
/
scatter
/
scatter-mvapich-two-level.cpp
diff --git
a/src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
b/src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
index
ec056fa
..
02bb56d
100644
(file)
--- a/
src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
+++ b/
src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
19
. The SimGrid Team.
+/* Copyright (c) 2013-20
22
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-65,7
+65,7
@@
int scatter__mvapich2_two_level_direct(const void *sendbuf,
int leader_root, leader_of_root = -1;
MPI_Comm shmem_comm, leader_comm;
//if not set (use of the algo directly, without mvapich2 selector)
int leader_root, leader_of_root = -1;
MPI_Comm shmem_comm, leader_comm;
//if not set (use of the algo directly, without mvapich2 selector)
- if
(MV2_Scatter_intra_function==NULL
)
+ if
(MV2_Scatter_intra_function == nullptr
)
MV2_Scatter_intra_function = scatter__mpich;
if(comm->get_leaders_comm()==MPI_COMM_NULL){
MV2_Scatter_intra_function = scatter__mpich;
if(comm->get_leaders_comm()==MPI_COMM_NULL){
@@
-142,8
+142,8
@@
int scatter__mvapich2_two_level_direct(const void *sendbuf,
if (leader_comm_size > 1 && local_rank == 0) {
if (not comm->is_uniform()) {
if (leader_comm_size > 1 && local_rank == 0) {
if (not comm->is_uniform()) {
- int* displs =
NULL
;
- int* sendcnts =
NULL
;
+ int* displs =
nullptr
;
+ int* sendcnts =
nullptr
;
int* node_sizes;
int i = 0;
node_sizes = comm->get_non_uniform_map();
int* node_sizes;
int i = 0;
node_sizes = comm->get_non_uniform_map();
@@
-160,7
+160,7
@@
int scatter__mvapich2_two_level_direct(const void *sendbuf,
sendcnts[i] = node_sizes[i] * nbytes;
}
}
sendcnts[i] = node_sizes[i] * nbytes;
}
}
-
C
olls::scatterv(leader_scatter_buf, sendcnts, displs, MPI_BYTE, tmp_buf, nbytes * local_size, MPI_BYTE,
+
c
olls::scatterv(leader_scatter_buf, sendcnts, displs, MPI_BYTE, tmp_buf, nbytes * local_size, MPI_BYTE,
leader_root, leader_comm);
} else {
if (leader_comm_rank == leader_root) {
leader_root, leader_comm);
} else {
if (leader_comm_rank == leader_root) {
@@
-174,7
+174,7
@@
int scatter__mvapich2_two_level_direct(const void *sendbuf,
sendcnts[i] = node_sizes[i] * sendcnt;
}
}
sendcnts[i] = node_sizes[i] * sendcnt;
}
}
-
C
olls::scatterv(sendbuf, sendcnts, displs, sendtype, tmp_buf, nbytes * local_size, MPI_BYTE, leader_root,
+
c
olls::scatterv(sendbuf, sendcnts, displs, sendtype, tmp_buf, nbytes * local_size, MPI_BYTE, leader_root,
leader_comm);
}
if (leader_comm_rank == leader_root) {
leader_comm);
}
if (leader_comm_rank == leader_root) {
@@
-244,7
+244,7
@@
int scatter__mvapich2_two_level_binomial(const void *sendbuf,
//if not set (use of the algo directly, without mvapich2 selector)
//if not set (use of the algo directly, without mvapich2 selector)
- if
(MV2_Scatter_intra_function==NULL
)
+ if
(MV2_Scatter_intra_function == nullptr
)
MV2_Scatter_intra_function = scatter__mpich;
if(comm->get_leaders_comm()==MPI_COMM_NULL){
MV2_Scatter_intra_function = scatter__mpich;
if(comm->get_leaders_comm()==MPI_COMM_NULL){
@@
-318,8
+318,8
@@
int scatter__mvapich2_two_level_binomial(const void *sendbuf,
if (leader_comm_size > 1 && local_rank == 0) {
if (not comm->is_uniform()) {
if (leader_comm_size > 1 && local_rank == 0) {
if (not comm->is_uniform()) {
- int* displs =
NULL
;
- int* sendcnts =
NULL
;
+ int* displs =
nullptr
;
+ int* sendcnts =
nullptr
;
int* node_sizes;
int i = 0;
node_sizes = comm->get_non_uniform_map();
int* node_sizes;
int i = 0;
node_sizes = comm->get_non_uniform_map();
@@
-336,7
+336,7
@@
int scatter__mvapich2_two_level_binomial(const void *sendbuf,
sendcnts[i] = node_sizes[i] * nbytes;
}
}
sendcnts[i] = node_sizes[i] * nbytes;
}
}
-
C
olls::scatterv(leader_scatter_buf, sendcnts, displs, MPI_BYTE, tmp_buf, nbytes * local_size, MPI_BYTE,
+
c
olls::scatterv(leader_scatter_buf, sendcnts, displs, MPI_BYTE, tmp_buf, nbytes * local_size, MPI_BYTE,
leader_root, leader_comm);
} else {
if (leader_comm_rank == leader_root) {
leader_root, leader_comm);
} else {
if (leader_comm_rank == leader_root) {
@@
-350,7
+350,7
@@
int scatter__mvapich2_two_level_binomial(const void *sendbuf,
sendcnts[i] = node_sizes[i] * sendcnt;
}
}
sendcnts[i] = node_sizes[i] * sendcnt;
}
}
-
C
olls::scatterv(sendbuf, sendcnts, displs, sendtype, tmp_buf, nbytes * local_size, MPI_BYTE, leader_root,
+
c
olls::scatterv(sendbuf, sendcnts, displs, sendtype, tmp_buf, nbytes * local_size, MPI_BYTE, leader_root,
leader_comm);
}
if (leader_comm_rank == leader_root) {
leader_comm);
}
if (leader_comm_rank == leader_root) {