Skip to content

Add an assertion to the discrete_space function and a death test #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions include/ddc/discrete_space.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,17 @@ std::tuple<Arg0, Arg1, Args...> init_discrete_space(std::tuple<DDimImpl, Arg0, A
return detail::extract_after(std::move(a), std::index_sequence_for<Arg0, Arg1, Args...>());
}

/**
* @tparam DDim a discrete dimension
* @return a boolean indicating whether DDim is initialized.
* This function indicates whether a dimension is initialized.
*/
template <class DDim>
bool is_discrete_space_initialized() noexcept
{
return detail::g_discrete_space_dual<DDim>.has_value();
}

/**
* @tparam DDim a discrete dimension
* @return the discrete space instance associated with `DDim`.
Expand All @@ -221,7 +232,9 @@ std::tuple<Arg0, Arg1, Args...> init_discrete_space(std::tuple<DDimImpl, Arg0, A
template <class DDim, class MemorySpace = DDC_CURRENT_KOKKOS_SPACE>
KOKKOS_FUNCTION detail::ddim_impl_t<DDim, MemorySpace> const& discrete_space()
{
// This function requires that `ddc::init_discrete_space<DDim>(...);` be called first
if constexpr (std::is_same_v<MemorySpace, Kokkos::HostSpace>) {
assert(is_discrete_space_initialized<DDim>());
return detail::g_discrete_space_dual<DDim>->get_host();
}
#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
Expand All @@ -238,15 +251,11 @@ KOKKOS_FUNCTION detail::ddim_impl_t<DDim, MemorySpace> const& discrete_space()
}
}

template <class DDim>
bool is_discrete_space_initialized() noexcept
{
return detail::g_discrete_space_dual<DDim>.has_value();
}

template <class DDim>
detail::ddim_impl_t<DDim, Kokkos::HostSpace> const& host_discrete_space()
{
// This function requires that `ddc::init_discrete_space<DDim>(...);` be called first
assert(is_discrete_space_initialized<DDim>());
return detail::g_discrete_space_dual<DDim>->get_host();
}

Expand Down
22 changes: 22 additions & 0 deletions tests/discrete_space.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,25 @@ TEST(DiscreteSpace, IsDiscreteSpaceInitialized)
ddc::DiscreteVector<DDimX>(2)));
EXPECT_TRUE(ddc::is_discrete_space_initialized<DDimX>());
}

TEST(DiscreteSpace, HostDiscreteSpace)
{
#if !defined(NDEBUG) // The assertion is only checked if NDEBUG isn't defined
EXPECT_DEATH(
ddc::host_discrete_space<DDimX>(),
R"rgx([Aa]ssert.*is_discrete_space_initialized<DDim>\(\))rgx");
#else
GTEST_SKIP();
#endif
}

TEST(DiscreteSpace, DiscreteSpace)
{
#if !defined(NDEBUG) // The assertion is only checked if NDEBUG isn't defined
EXPECT_DEATH(
ddc::discrete_space<DDimX>(),
R"rgx([Aa]ssert.*is_discrete_space_initialized<DDim>\(\))rgx");
#else
GTEST_SKIP();
#endif
}