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
all actors are unified, no need to virtualize between APIs
[simgrid.git]
/
src
/
smpi
/
smpi_coll.cpp
diff --git
a/src/smpi/smpi_coll.cpp
b/src/smpi/smpi_coll.cpp
index
9bee615
..
a26b1f7
100644
(file)
--- a/
src/smpi/smpi_coll.cpp
+++ b/
src/smpi/smpi_coll.cpp
@@
-1,17
+1,16
@@
-/* smpi_coll.c -- various optimized routing for collectives
*/
+/* smpi_coll.c -- various optimized routing for collectives */
-/* Copyright (c) 2009-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-2017. 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. */
-#include
<stdio.h>
-#include
<string.h>
-#include
<assert.h>
-
-#include "
private.h
"
-#include "s
imgrid/sg_config.h
"
+#include
"src/smpi/private.h"
+#include
"src/smpi/smpi_coll.hpp"
+#include
"src/smpi/smpi_comm.hpp"
+#include "src/smpi/smpi_datatype.hpp"
+#include "
src/smpi/smpi_op.hpp
"
+#include "s
rc/smpi/smpi_request.hpp
"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll)");
@@
-73,13
+72,13
@@
int Colls::find_coll_description(s_mpi_coll_description_t * table, const char *n
{
char *name_list = nullptr;
for (int i = 0; table[i].name; i++)
{
char *name_list = nullptr;
for (int i = 0; table[i].name; i++)
- if (
!
strcmp(name, table[i].name)) {
+ if (
not
strcmp(name, table[i].name)) {
if (strcmp(table[i].name,"default"))
XBT_INFO("Switch to algorithm %s for collective %s",table[i].name,desc);
return i;
}
if (strcmp(table[i].name,"default"))
XBT_INFO("Switch to algorithm %s for collective %s",table[i].name,desc);
return i;
}
- if (
!
table[0].name)
+ if (
not
table[0].name)
xbt_die("No collective is valid for '%s'! This is a bug.",name);
name_list = xbt_strdup(table[0].name);
for (int i = 1; table[i].name; i++) {
xbt_die("No collective is valid for '%s'! This is a bug.",name);
name_list = xbt_strdup(table[0].name);
for (int i = 1; table[i].name; i++) {
@@
-321,7
+320,7
@@
int Colls::exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype
Datatype::copy(tmpbufs[other], count, datatype, recvbuf, count, datatype);
recvbuf_is_empty = 0;
} else
Datatype::copy(tmpbufs[other], count, datatype, recvbuf, count, datatype);
recvbuf_is_empty = 0;
} else
- if(op!=MPI_OP_NULL)
+ if(op!=MPI_OP_NULL)
op->apply( tmpbufs[other], recvbuf, &count, datatype);
}
}
op->apply( tmpbufs[other], recvbuf, &count, datatype);
}
}
@@
-339,8
+338,3
@@
int Colls::exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype
}
}
}
}
-
-
-
-
-