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
more verbose output following a weird crash on my laptop
[simgrid.git]
/
src
/
smpi
/
colls
/
bcast-arrival-pattern-aware.c
diff --git
a/src/smpi/colls/bcast-arrival-pattern-aware.c
b/src/smpi/colls/bcast-arrival-pattern-aware.c
index
1e8f95a
..
09fbbcd
100644
(file)
--- a/
src/smpi/colls/bcast-arrival-pattern-aware.c
+++ b/
src/smpi/colls/bcast-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"
static int bcast_NTSL_segment_size_in_byte = 8192;
#include "colls_private.h"
static int bcast_NTSL_segment_size_in_byte = 8192;
@@
-10,7
+16,7
@@
int smpi_coll_tuned_bcast_arrival_pattern_aware(void *buf, int count,
MPI_Datatype datatype, int root,
MPI_Comm comm)
{
MPI_Datatype datatype, int root,
MPI_Comm comm)
{
- int tag = COLL_TAG_BCAST;
+ int tag =
-
COLL_TAG_BCAST;
MPI_Status status;
MPI_Request request;
MPI_Request *send_request_array;
MPI_Status status;
MPI_Request request;
MPI_Request *send_request_array;
@@
-39,13
+45,13
@@
int smpi_coll_tuned_bcast_arrival_pattern_aware(void *buf, int count,
- rank = smpi_comm_rank(
MPI_COMM_WORLD
);
- size = smpi_comm_size(
MPI_COMM_WORLD
);
+ rank = smpi_comm_rank(
comm
);
+ size = smpi_comm_size(
comm
);
/* segment is segment size in number of elements (not bytes) */
int segment = bcast_NTSL_segment_size_in_byte / extent;
/* segment is segment size in number of elements (not bytes) */
int segment = bcast_NTSL_segment_size_in_byte / extent;
-
+ segment = segment == 0 ? 1 :segment;
/* pipeline length */
int pipe_length = count / segment;
/* pipeline length */
int pipe_length = count / segment;
@@
-80,7
+86,7
@@
int smpi_coll_tuned_bcast_arrival_pattern_aware(void *buf, int count,
while (sent_count < (size - 1)) {
for (i = 1; i < size; i++) {
while (sent_count < (size - 1)) {
for (i = 1; i < size; i++) {
- 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);
}
MPI_STATUSES_IGNORE);
}
@@
-90,7
+96,7
@@
int smpi_coll_tuned_bcast_arrival_pattern_aware(void *buf, int count,
/* message arrive */
if ((flag_array[i] == 1) && (already_sent[i] == 0)) {
/* message arrive */
if ((flag_array[i] == 1) && (already_sent[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++;
@@
-172,7
+178,7
@@
int smpi_coll_tuned_bcast_arrival_pattern_aware(void *buf, int count,
//iteration++;
//start = MPI_Wtime();
for (i = 1; i < size; i++) {
//iteration++;
//start = MPI_Wtime();
for (i = 1; i < size; i++) {
- 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]);
}
//total = MPI_Wtime() - start;
&temp_status_array[i]);
}
//total = MPI_Wtime() - start;
@@
-185,7
+191,7
@@
int smpi_coll_tuned_bcast_arrival_pattern_aware(void *buf, int count,
for (i = 1; i < size; i++) {
/* message arrive */
if ((flag_array[i] == 1) && (already_sent[i] == 0)) {
for (i = 1; i < size; i++) {
/* message arrive */
if ((flag_array[i] == 1) && (already_sent[i] == 0)) {
- 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);
header_buf[header_index] = i;
header_index++;
&status);
header_buf[header_index] = i;
header_index++;
@@
-285,7
+291,7
@@
int smpi_coll_tuned_bcast_arrival_pattern_aware(void *buf, int count,
} /* while loop */
for(i=0; i<size; i++)
} /* while loop */
for(i=0; i<size; i++)
- if(to_clean[i]!=0)smpi_mpi_recv(&temp_buf[i], 1, MPI_CHAR, i, tag,
MPI_COMM_WORLD
,
+ if(to_clean[i]!=0)smpi_mpi_recv(&temp_buf[i], 1, MPI_CHAR, i, tag,
comm
,
&status);
//total = MPI_Wtime() - start2;
//total *= 1000;
&status);
//total = MPI_Wtime() - start2;
//total *= 1000;