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
Merge if statements.
[simgrid.git]
/
teshsuite
/
smpi
/
coll-allreduce
/
coll-allreduce.c
diff --git
a/teshsuite/smpi/coll-allreduce/coll-allreduce.c
b/teshsuite/smpi/coll-allreduce/coll-allreduce.c
index
45eeb9c
..
c35732f
100644
(file)
--- a/
teshsuite/smpi/coll-allreduce/coll-allreduce.c
+++ b/
teshsuite/smpi/coll-allreduce/coll-allreduce.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-2010, 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2009-2010, 2013-201
7
. 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
@@
-29,7
+29,7
@@
int main(int argc, char *argv[])
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Comm_size(MPI_COMM_WORLD, &size);
if (maxlen > 1)
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Comm_size(MPI_COMM_WORLD, &size);
if (maxlen > 1)
- mult =
size
;
+ mult =
maxlen > size ? size : maxlen
;
int* sb = (int *) xbt_malloc(size *maxlen * sizeof(int));
int* rb = (int *) xbt_malloc(size *maxlen * sizeof(int));
int* sb = (int *) xbt_malloc(size *maxlen * sizeof(int));
int* rb = (int *) xbt_malloc(size *maxlen * sizeof(int));
@@
-50,11
+50,9
@@
int main(int argc, char *argv[])
printf("%d ", rb[i]);
printf("]\n");
printf("%d ", rb[i]);
printf("]\n");
- if (rank == 0) {
- if (status != MPI_SUCCESS) {
- printf("all_to_all returned %d\n", status);
- fflush(stdout);
- }
+ if (rank == 0 && status != MPI_SUCCESS) {
+ printf("all_to_all returned %d\n", status);
+ fflush(stdout);
}
xbt_free(sb);
xbt_free(rb);
}
xbt_free(sb);
xbt_free(rb);