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
actually we need GCC > v4.8.5 for LTO
[simgrid.git]
/
src
/
smpi
/
colls
/
reduce-arrival-pattern-aware.c
diff --git
a/src/smpi/colls/reduce-arrival-pattern-aware.c
b/src/smpi/colls/reduce-arrival-pattern-aware.c
index
1e25250
..
e528e9a
100644
(file)
--- a/
src/smpi/colls/reduce-arrival-pattern-aware.c
+++ b/
src/smpi/colls/reduce-arrival-pattern-aware.c
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. 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. */
+
#include "colls_private.h"
//#include <star-reduction.c>
#include "colls_private.h"
//#include <star-reduction.c>
@@
-18,10
+24,8
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
MPI_Op op, int root,
MPI_Comm comm)
{
MPI_Op op, int root,
MPI_Comm comm)
{
- int rank;
- rank = smpi_comm_rank(comm);
-
- int tag = 50;
+ int rank = smpi_comm_rank(comm);
+ int tag = -COLL_TAG_REDUCE;
MPI_Status status;
MPI_Request request;
MPI_Request *send_request_array;
MPI_Status status;
MPI_Request request;
MPI_Request *send_request_array;
@@
-31,7
+35,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
MPI_Status temp_status_array[MAX_NODE];
MPI_Status temp_status_array[MAX_NODE];
- int size;
+ int size
= smpi_comm_size(comm)
;
int i;
int sent_count;
int i;
int sent_count;
@@
-48,10
+52,6
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
/* source and destination */
int to, from;
/* source and destination */
int to, from;
- size=smpi_comm_size(comm);
- rank=smpi_comm_rank(comm);
-
-
/* segment is segment size in number of elements (not bytes) */
int segment = reduce_arrival_pattern_aware_segment_size_in_byte / extent;
/* segment is segment size in number of elements (not bytes) */
int segment = reduce_arrival_pattern_aware_segment_size_in_byte / extent;
@@
-72,7
+72,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
}
char *tmp_buf;
}
char *tmp_buf;
- tmp_buf = (char *)
xbt_malloc
(count * extent);
+ tmp_buf = (char *)
smpi_get_tmp_sendbuffer
(count * extent);
smpi_mpi_sendrecv(buf, count, datatype, rank, tag, rbuf, count, datatype, rank,
tag, comm, &status);
smpi_mpi_sendrecv(buf, count, datatype, rank, tag, rbuf, count, datatype, rank,
tag, comm, &status);
@@
-89,7
+89,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
for (i = 1; i < size; i++) {
if (already_received[i] == 0) {
for (i = 1; i < size; i++) {
if (already_received[i] == 0) {
- smpi_mpi_iprobe(i, MPI_ANY_TAG,
MPI_COMM_WORLD
, &flag_array[i],
+ smpi_mpi_iprobe(i, MPI_ANY_TAG,
comm
, &flag_array[i],
MPI_STATUSES_IGNORE);
simcall_process_sleep(0.0001);
}
MPI_STATUSES_IGNORE);
simcall_process_sleep(0.0001);
}
@@
-103,7
+103,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
/* 1-byte message arrive */
if ((flag_array[i] == 1) && (already_received[i] == 0)) {
/* 1-byte message arrive */
if ((flag_array[i] == 1) && (already_received[i] == 0)) {
- smpi_mpi_recv(temp_buf, 1, MPI_CHAR, i, tag,
MPI_COMM_WORLD
, &status);
+ smpi_mpi_recv(temp_buf, 1, MPI_CHAR, i, tag,
comm
, &status);
header_buf[header_index] = i;
header_index++;
sent_count++;
header_buf[header_index] = i;
header_index++;
sent_count++;
@@
-179,8
+179,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
to = header_buf[myordering + 1];
}
from = header_buf[myordering - 1];
to = header_buf[myordering + 1];
}
from = header_buf[myordering - 1];
- smpi_mpi_recv(tmp_buf, count, datatype, header_buf[myordering - 1], tag,
- comm, &status);
+ smpi_mpi_recv(tmp_buf, count, datatype, from, tag, comm, &status);
smpi_op_apply(op, tmp_buf, rbuf, &count, &datatype);
smpi_mpi_send(rbuf, count, datatype, to, tag, comm);
}
smpi_op_apply(op, tmp_buf, rbuf, &count, &datatype);
smpi_mpi_send(rbuf, count, datatype, to, tag, comm);
}
@@
-214,11
+213,11
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
//if (i == rank)
//continue;
if ((already_received[i] == 0) && (will_send[i] == 0)) {
//if (i == rank)
//continue;
if ((already_received[i] == 0) && (will_send[i] == 0)) {
- smpi_mpi_iprobe(i, MPI_ANY_TAG,
MPI_COMM_WORLD
, &flag_array[i],
+ smpi_mpi_iprobe(i, MPI_ANY_TAG,
comm
, &flag_array[i],
&temp_status_array[i]);
if (flag_array[i] == 1) {
will_send[i] = 1;
&temp_status_array[i]);
if (flag_array[i] == 1) {
will_send[i] = 1;
- smpi_mpi_recv(&temp_buf[i], 1, MPI_CHAR, i, tag,
MPI_COMM_WORLD
,
+ smpi_mpi_recv(&temp_buf[i], 1, MPI_CHAR, i, tag,
comm
,
&status);
//printf("recv from %d\n",i);
i = 1;
&status);
//printf("recv from %d\n",i);
i = 1;
@@
-350,7
+349,7
@@
int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf,
comm);
}
comm);
}
-
free
(tmp_buf);
+
smpi_free_tmp_buffer
(tmp_buf);
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}