biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generalize constraints on MPI rank counts for tests
[alexxy/gromacs.git]
/
src
/
gromacs
/
domdec
/
tests
/
haloexchange_mpi.cpp
diff --git
a/src/gromacs/domdec/tests/haloexchange_mpi.cpp
b/src/gromacs/domdec/tests/haloexchange_mpi.cpp
index 45b8364f8087a5a81373f9748ceb95d53baa446e..fac6cc09abc64ab40da09c11e394436caf7ac87f 100644
(file)
--- a/
src/gromacs/domdec/tests/haloexchange_mpi.cpp
+++ b/
src/gromacs/domdec/tests/haloexchange_mpi.cpp
@@
-192,8
+192,9
@@
void define1dRankTopology(gmx_domdec_t* dd)
int rank;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
int rank;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
- dd->neighbor[0][0] = (rank + 1) % 4;
- dd->neighbor[0][1] = (rank == 0) ? 3 : rank - 1;
+ const int numRanks = getNumberOfTestMpiRanks();
+ dd->neighbor[0][0] = (rank + 1) % numRanks;
+ dd->neighbor[0][1] = (rank == 0) ? (numRanks - 1) : rank - 1;
}
/*! \brief Define 2D rank topology with 4 MPI tasks
}
/*! \brief Define 2D rank topology with 4 MPI tasks
@@
-510,7
+511,7
@@
void checkResults2dHaloWith2PulsesInDim1(const RVec* x, const gmx_domdec_t* dd,
TEST(HaloExchangeTest, Coordinates1dHaloWith1Pulse)
{
TEST(HaloExchangeTest, Coordinates1dHaloWith1Pulse)
{
- GMX_MPI_TEST(
4
);
+ GMX_MPI_TEST(
RequireRankCount<4>
);
// Set up atom data
const int numHomeAtoms = 10;
// Set up atom data
const int numHomeAtoms = 10;
@@
-566,7
+567,7
@@
TEST(HaloExchangeTest, Coordinates1dHaloWith1Pulse)
TEST(HaloExchangeTest, Coordinates1dHaloWith2Pulses)
{
TEST(HaloExchangeTest, Coordinates1dHaloWith2Pulses)
{
- GMX_MPI_TEST(
4
);
+ GMX_MPI_TEST(
RequireRankCount<4>
);
// Set up atom data
const int numHomeAtoms = 10;
// Set up atom data
const int numHomeAtoms = 10;
@@
-623,7
+624,7
@@
TEST(HaloExchangeTest, Coordinates1dHaloWith2Pulses)
TEST(HaloExchangeTest, Coordinates2dHaloWith1PulseInEachDim)
{
TEST(HaloExchangeTest, Coordinates2dHaloWith1PulseInEachDim)
{
- GMX_MPI_TEST(
4
);
+ GMX_MPI_TEST(
RequireRankCount<4>
);
// Set up atom data
const int numHomeAtoms = 10;
// Set up atom data
const int numHomeAtoms = 10;
@@
-679,7
+680,7
@@
TEST(HaloExchangeTest, Coordinates2dHaloWith1PulseInEachDim)
TEST(HaloExchangeTest, Coordinates2dHaloWith2PulsesInDim1)
{
TEST(HaloExchangeTest, Coordinates2dHaloWith2PulsesInDim1)
{
- GMX_MPI_TEST(
4
);
+ GMX_MPI_TEST(
RequireRankCount<4>
);
// Set up atom data
const int numHomeAtoms = 10;
// Set up atom data
const int numHomeAtoms = 10;