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
Finish pulling changes from mpich trunk testsuite
[simgrid.git]
/
teshsuite
/
smpi
/
mpich3-test
/
rma
/
rmazero.c
diff --git
a/teshsuite/smpi/mpich3-test/rma/rmazero.c
b/teshsuite/smpi/mpich3-test/rma/rmazero.c
index
0ea28d7
..
9e27b77
100644
(file)
--- a/
teshsuite/smpi/mpich3-test/rma/rmazero.c
+++ b/
teshsuite/smpi/mpich3-test/rma/rmazero.c
@@
-1,7
+1,7
@@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
/*
*
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
/*
*
- * (C) 201
3
by Argonne National Laboratory.
+ * (C) 201
0
by Argonne National Laboratory.
* See COPYRIGHT in top-level directory.
*/
#include "mpi.h"
* See COPYRIGHT in top-level directory.
*/
#include "mpi.h"
@@
-105,6
+105,7
@@
int main( int argc, char *argv[] )
MPI_Comm comm;
MPI_Win win;
MPI_Request req;
MPI_Comm comm;
MPI_Win win;
MPI_Request req;
+ MPI_Datatype derived_dtp;
MTest_Init( &argc, &argv );
MTest_Init( &argc, &argv );
@@
-127,6
+128,9
@@
int main( int argc, char *argv[] )
MPI_Abort( MPI_COMM_WORLD, 1 );
}
MPI_Abort( MPI_COMM_WORLD, 1 );
}
+ MPI_Type_contiguous(2, MPI_INT, &derived_dtp);
+ MPI_Type_commit(&derived_dtp);
+
/* The following loop is used to run through a series of communicators
* that are subsets of MPI_COMM_WORLD, of size 1 or greater. */
while (MTestGetIntracommGeneral( &comm, 1, 1 )) {
/* The following loop is used to run through a series of communicators
* that are subsets of MPI_COMM_WORLD, of size 1 or greater. */
while (MTestGetIntracommGeneral( &comm, 1, 1 )) {
@@
-137,7
+141,7
@@
int main( int argc, char *argv[] )
MPI_Comm_rank( comm, &rank );
MPI_Comm_size( comm, &size );
MPI_Comm_rank( comm, &rank );
MPI_Comm_size( comm, &size );
- MPI_Win_create( buf, bufsize, sizeof(int), MPI_INFO_NULL, comm, &win );
+ MPI_Win_create( buf, bufsize,
2*
sizeof(int), MPI_INFO_NULL, comm, &win );
/* To improve reporting of problems about operations, we
change the error handler to errors return */
MPI_Win_set_errhandler( win, MPI_ERRORS_RETURN );
/* To improve reporting of problems about operations, we
change the error handler to errors return */
MPI_Win_set_errhandler( win, MPI_ERRORS_RETURN );
@@
-158,6
+162,10
@@
int main( int argc, char *argv[] )
MPI_Accumulate( rmabuf, count, MPI_INT, TARGET,
0, count, MPI_INT, MPI_SUM, win );
);
MPI_Accumulate( rmabuf, count, MPI_INT, TARGET,
0, count, MPI_INT, MPI_SUM, win );
);
+ TEST_FENCE_OP("Accumulate_derived",
+ MPI_Accumulate( rmabuf, count, derived_dtp, TARGET,
+ 0, count, derived_dtp, MPI_SUM, win );
+ );
TEST_FENCE_OP("Get accumulate",
MPI_Get_accumulate( rmabuf, count, MPI_INT, result,
count, MPI_INT, TARGET, 0,
TEST_FENCE_OP("Get accumulate",
MPI_Get_accumulate( rmabuf, count, MPI_INT, result,
count, MPI_INT, TARGET, 0,
@@
-179,6
+187,10
@@
int main( int argc, char *argv[] )
MPI_Accumulate( rmabuf, count, MPI_INT, TARGET, 0,
count, MPI_INT, MPI_SUM, win );
);
MPI_Accumulate( rmabuf, count, MPI_INT, TARGET, 0,
count, MPI_INT, MPI_SUM, win );
);
+ TEST_PT_OP("Accumulate_derived",
+ MPI_Accumulate( rmabuf, count, derived_dtp, TARGET, 0,
+ count, derived_dtp, MPI_SUM, win );
+ );
TEST_PT_OP("Get accumulate",
MPI_Get_accumulate( rmabuf, count, MPI_INT, result, count,
MPI_INT, TARGET, 0, count,
TEST_PT_OP("Get accumulate",
MPI_Get_accumulate( rmabuf, count, MPI_INT, result, count,
MPI_INT, TARGET, 0, count,
@@
-201,6
+213,10
@@
int main( int argc, char *argv[] )
MPI_Raccumulate( rmabuf, count, MPI_INT, TARGET, 0,
count, MPI_INT, MPI_SUM, win, &req );
);
MPI_Raccumulate( rmabuf, count, MPI_INT, TARGET, 0,
count, MPI_INT, MPI_SUM, win, &req );
);
+ TEST_REQ_OP("Raccumulate_derived", req,
+ MPI_Raccumulate( rmabuf, count, derived_dtp, TARGET, 0,
+ count, derived_dtp, MPI_SUM, win, &req );
+ );
TEST_REQ_OP("Rget_accumulate", req,
MPI_Rget_accumulate( rmabuf, count, MPI_INT, result,
count, MPI_INT, TARGET, 0,
TEST_REQ_OP("Rget_accumulate", req,
MPI_Rget_accumulate( rmabuf, count, MPI_INT, result,
count, MPI_INT, TARGET, 0,
@@
-211,6
+227,8
@@
int main( int argc, char *argv[] )
MTestFreeComm(&comm);
}
MTestFreeComm(&comm);
}
+ MPI_Type_free(&derived_dtp);
+
free( result );
free( buf );
free( rmabuf );
free( result );
free( buf );
free( rmabuf );