Skip to content

Commit

Permalink
Reduce the memory footprint of the test compilation
Browse files Browse the repository at this point in the history 
- Remove the hosts test for the MultipleBatchDomain tests
- Remove the high dimension (3D, 4D) tests for the 1D MultipleBatchDomain
  tests
  • Loading branch information
@tretre91
tretre91 committed Mar 7, 2025
1 parent aeb3d3e commit 38259aa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 274 deletions.
55 changes: 4 additions & 51 deletions tests/splines/multiple_batch_domain_2d_spline_builder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -709,18 +709,7 @@ void MultipleBatchDomain2dSplineTest()
#define SUFFIX(name) name##Hermite##NonUniform
#endif

TEST(SUFFIX(MultipleBatchDomain2dSplineHost), 2DXY)
{
MultipleBatchDomain2dSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimY>,
DDimGPS<DimX>,
DDimGPS<DimY>>();
}

TEST(SUFFIX(MultipleBatchDomain2dSplineDevice), 2DXY)
TEST(SUFFIX(MultipleBatchDomain2dSpline), 2DXY)
{
MultipleBatchDomain2dSplineTest<
Kokkos::DefaultExecutionSpace,
Expand All @@ -731,43 +720,7 @@ TEST(SUFFIX(MultipleBatchDomain2dSplineDevice), 2DXY)
DDimGPS<DimY>>();
}

TEST(SUFFIX(MultipleBatchDomain2dSplineHost), 3DXY)
{
MultipleBatchDomain2dSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimY>,
DDimGPS<DimX>,
DDimGPS<DimY>,
DDimBatch>();
}

TEST(SUFFIX(MultipleBatchDomain2dSplineHost), 3DXZ)
{
MultipleBatchDomain2dSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimZ>,
DDimGPS<DimX>,
DDimBatch,
DDimGPS<DimZ>>();
}

TEST(SUFFIX(MultipleBatchDomain2dSplineHost), 3DYZ)
{
MultipleBatchDomain2dSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimY>,
DDimGPS<DimZ>,
DDimBatch,
DDimGPS<DimY>,
DDimGPS<DimZ>>();
}

TEST(SUFFIX(MultipleBatchDomain2dSplineDevice), 3DXY)
TEST(SUFFIX(MultipleBatchDomain2dSpline), 3DXY)
{
MultipleBatchDomain2dSplineTest<
Kokkos::DefaultExecutionSpace,
Expand All @@ -779,7 +732,7 @@ TEST(SUFFIX(MultipleBatchDomain2dSplineDevice), 3DXY)
DDimBatch>();
}

TEST(SUFFIX(MultipleBatchDomain2dSplineDevice), 3DXZ)
TEST(SUFFIX(MultipleBatchDomain2dSpline), 3DXZ)
{
MultipleBatchDomain2dSplineTest<
Kokkos::DefaultExecutionSpace,
Expand All @@ -791,7 +744,7 @@ TEST(SUFFIX(MultipleBatchDomain2dSplineDevice), 3DXZ)
DDimGPS<DimZ>>();
}

TEST(SUFFIX(MultipleBatchDomain2dSplineDevice), 3DYZ)
TEST(SUFFIX(MultipleBatchDomain2dSpline), 3DYZ)
{
MultipleBatchDomain2dSplineTest<
Kokkos::DefaultExecutionSpace,
Expand Down
226 changes: 3 additions & 223 deletions tests/splines/multiple_batch_domain_spline_builder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@ struct DimY
{
static constexpr bool PERIODIC = true;
};

struct DimZ
{
static constexpr bool PERIODIC = true;
};

struct DimT
{
static constexpr bool PERIODIC = true;
};
#else

struct DimX
Expand All @@ -56,30 +46,12 @@ struct DimY
{
static constexpr bool PERIODIC = false;
};

struct DimZ
{
static constexpr bool PERIODIC = false;
};

struct DimT
{
static constexpr bool PERIODIC = false;
};
#endif

struct DDimBatch1
{
};

struct DDimBatch2
{
};

struct DDimBatch3
{
};

struct DDimBatchExtra
{
};
Expand Down Expand Up @@ -483,16 +455,7 @@ void MultipleBatchDomainSplineTest()
#define SUFFIX(name) name##Ginkgo##Hermite##NonUniform
#endif

TEST(SUFFIX(MultipleBatchDomainSplineHost), 1DX)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimX>>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 1DX)
TEST(SUFFIX(MultipleBatchDomainSpline), 1DX)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Expand All @@ -501,27 +464,7 @@ TEST(SUFFIX(MultipleBatchDomainSplineDevice), 1DX)
DDimGPS<DimX>>();
}

TEST(SUFFIX(MultipleBatchDomainSplineHost), 2DX)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimX>,
DDimBatch1>();
}

TEST(SUFFIX(MultipleBatchDomainSplineHost), 2DY)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimY>,
DDimBatch1,
DDimGPS<DimY>>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 2DX)
TEST(SUFFIX(MultipleBatchDomainSpline), 2DX)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Expand All @@ -531,7 +474,7 @@ TEST(SUFFIX(MultipleBatchDomainSplineDevice), 2DX)
DDimBatch1>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 2DY)
TEST(SUFFIX(MultipleBatchDomainSpline), 2DY)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Expand All @@ -540,166 +483,3 @@ TEST(SUFFIX(MultipleBatchDomainSplineDevice), 2DY)
DDimBatch1,
DDimGPS<DimY>>();
}

TEST(SUFFIX(MultipleBatchDomainSplineHost), 3DX)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimX>,
DDimBatch1,
DDimBatch2>();
}

TEST(SUFFIX(MultipleBatchDomainSplineHost), 3DY)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimY>,
DDimBatch1,
DDimGPS<DimY>,
DDimBatch2>();
}

TEST(SUFFIX(MultipleBatchDomainSplineHost), 3DZ)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimZ>,
DDimBatch1,
DDimBatch2,
DDimGPS<DimZ>>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 3DX)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Kokkos::DefaultExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimX>,
DDimBatch1,
DDimBatch2>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 3DY)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Kokkos::DefaultExecutionSpace::memory_space,
DDimGPS<DimY>,
DDimBatch1,
DDimGPS<DimY>,
DDimBatch2>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 3DZ)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Kokkos::DefaultExecutionSpace::memory_space,
DDimGPS<DimZ>,
DDimBatch1,
DDimBatch2,
DDimGPS<DimZ>>();
}


TEST(SUFFIX(MultipleBatchDomainSplineHost), 4DX)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimX>,
DDimBatch1,
DDimBatch2,
DDimBatch3>();
}

TEST(SUFFIX(MultipleBatchDomainSplineHost), 4DY)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimY>,
DDimBatch1,
DDimGPS<DimY>,
DDimBatch2,
DDimBatch3>();
}

TEST(SUFFIX(MultipleBatchDomainSplineHost), 4DZ)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimZ>,
DDimBatch1,
DDimBatch2,
DDimGPS<DimZ>,
DDimBatch3>();
}

TEST(SUFFIX(MultipleBatchDomainSplineHost), 4DT)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultHostExecutionSpace,
Kokkos::DefaultHostExecutionSpace::memory_space,
DDimGPS<DimT>,
DDimBatch1,
DDimBatch2,
DDimBatch3,
DDimGPS<DimT>>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 4DX)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Kokkos::DefaultExecutionSpace::memory_space,
DDimGPS<DimX>,
DDimGPS<DimX>,
DDimBatch1,
DDimBatch2,
DDimBatch3>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 4DY)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Kokkos::DefaultExecutionSpace::memory_space,
DDimGPS<DimY>,
DDimBatch1,
DDimGPS<DimY>,
DDimBatch2,
DDimBatch3>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 4DZ)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Kokkos::DefaultExecutionSpace::memory_space,
DDimGPS<DimZ>,
DDimBatch1,
DDimBatch2,
DDimGPS<DimZ>,
DDimBatch3>();
}

TEST(SUFFIX(MultipleBatchDomainSplineDevice), 4DT)
{
MultipleBatchDomainSplineTest<
Kokkos::DefaultExecutionSpace,
Kokkos::DefaultExecutionSpace::memory_space,
DDimGPS<DimT>,
DDimBatch1,
DDimBatch2,
DDimBatch3,
DDimGPS<DimT>>();
}

0 comments on commit 38259aa

Please sign in to comment.