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
Update copyright lines.
[simgrid.git]
/
src
/
smpi
/
colls
/
smpi_coll.cpp
diff --git
a/src/smpi/colls/smpi_coll.cpp
b/src/smpi/colls/smpi_coll.cpp
index
f5672c2
..
5d75930
100644
(file)
--- a/
src/smpi/colls/smpi_coll.cpp
+++ b/
src/smpi/colls/smpi_coll.cpp
@@
-1,6
+1,6
@@
/* smpi_coll.c -- various optimized routing for collectives */
/* smpi_coll.c -- various optimized routing for collectives */
-/* Copyright (c) 2009-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
1
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-20,7
+20,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI colle
namespace simgrid {
namespace smpi {
namespace simgrid {
namespace smpi {
-std::map<std::string, std::vector<s_mpi_coll_description_t>> smpi_coll_descriptions(
+std::map<std::string, std::vector<s_mpi_coll_description_t>
, std::less<>
> smpi_coll_descriptions(
{{std::string("gather"),
{{"default", "gather default collective", (void*)gather__default},
{"ompi", "gather ompi collective", (void*)gather__ompi},
{{std::string("gather"),
{{"default", "gather default collective", (void*)gather__default},
{"ompi", "gather ompi collective", (void*)gather__ompi},
@@
-360,8
+360,8
@@
int colls::scan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype data
Datatype::copy(sendbuf, count, datatype, recvbuf, count, datatype);
// Send/Recv buffers to/from others
Datatype::copy(sendbuf, count, datatype, recvbuf, count, datatype);
// Send/Recv buffers to/from others
-
MPI_Request
* requests = new MPI_Request[size - 1];
-
unsigned char
** tmpbufs = new unsigned char*[rank];
+
auto
* requests = new MPI_Request[size - 1];
+
auto
** tmpbufs = new unsigned char*[rank];
int index = 0;
for (int other = 0; other < rank; other++) {
tmpbufs[index] = smpi_get_tmp_sendbuffer(count * dataext);
int index = 0;
for (int other = 0; other < rank; other++) {
tmpbufs[index] = smpi_get_tmp_sendbuffer(count * dataext);
@@
-382,7
+382,7
@@
int colls::scan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype data
break;
}
if(index < rank) {
break;
}
if(index < rank) {
- // #Request is below rank: it's a irecv
+ // #Request is below rank: it's a
n
irecv
op->apply( tmpbufs[index], recvbuf, &count, datatype);
}
}
op->apply( tmpbufs[index], recvbuf, &count, datatype);
}
}
@@
-418,8
+418,8
@@
int colls::exscan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype da
datatype->extent(&lb, &dataext);
// Send/Recv buffers to/from others
datatype->extent(&lb, &dataext);
// Send/Recv buffers to/from others
-
MPI_Request
* requests = new MPI_Request[size - 1];
-
unsigned char
** tmpbufs = new unsigned char*[rank];
+
auto
* requests = new MPI_Request[size - 1];
+
auto
** tmpbufs = new unsigned char*[rank];
int index = 0;
for (int other = 0; other < rank; other++) {
tmpbufs[index] = smpi_get_tmp_sendbuffer(count * dataext);
int index = 0;
for (int other = 0; other < rank; other++) {
tmpbufs[index] = smpi_get_tmp_sendbuffer(count * dataext);
@@
-444,7
+444,7
@@
int colls::exscan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype da
Datatype::copy(tmpbufs[index], count, datatype, recvbuf, count, datatype);
recvbuf_is_empty=0;
} else
Datatype::copy(tmpbufs[index], count, datatype, recvbuf, count, datatype);
recvbuf_is_empty=0;
} else
- // #Request is below rank: it's a irecv
+ // #Request is below rank: it's a
n
irecv
op->apply( tmpbufs[index], recvbuf, &count, datatype);
}
}
op->apply( tmpbufs[index], recvbuf, &count, datatype);
}
}