Skip to content
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.

Sign up for GitHub

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

Restart DLA-Future and the pika runtime less frequently in C API tests #1268

Merged
merged 1 commit into from
Feb 11, 2025
Merged

Restart DLA-Future and the pika runtime less frequently in C API tests #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 30 additions & 12 deletions test/unit/c_api/eigensolver/test_eigensolver_c_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,12 @@ std::set<std::optional<SizeType>> num_evals(const SizeType m) {
}

template <class T, Backend B, Device D, API api>
void testEigensolver(const blas::Uplo uplo, const SizeType m, const SizeType mb, CommunicatorGrid& grid,
std::optional<SizeType> eigenvalues_index_end) {
void testEigensolver(int dlaf_context, const blas::Uplo uplo, const SizeType m, const SizeType mb,
CommunicatorGrid& grid, std::optional<SizeType> eigenvalues_index_end) {
// std::nullopt calls the API without specifying the number of eigenvalues to compute
// The final check needs to happen on all m eigenvalues/eigenvectors
const SizeType eval_idx_end = eigenvalues_index_end.value_or(m);

auto dlaf_context = c_api_test_initialize<api>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

// In normal use the runtime is resumed by the C API call
// The pika runtime is suspended by dlaf_initialize
// Here we need to resume it manually to build the matrices with DLA-Future
Expand Down Expand Up @@ -251,65 +249,85 @@ void testEigensolver(const blas::Uplo uplo, const SizeType m, const SizeType mb,

// Suspend pika to make sure dlaf_finalize resumes it
pika::suspend();

c_api_test_finalize<api>(dlaf_context);
}

TYPED_TEST(EigensolverTestMC, CorrectnessDistributedDLAF) {
for (comm::CommunicatorGrid& grid : this->commGrids()) {
auto dlaf_context =
c_api_test_initialize<API::dlaf>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

for (auto uplo : blas_uplos) {
for (auto [m, mb, b_min] : sizes) {
auto numevals = num_evals(m);
for (auto nevals : numevals) {
testEigensolver<TypeParam, Backend::MC, Device::CPU, API::dlaf>(uplo, m, mb, grid, nevals);
testEigensolver<TypeParam, Backend::MC, Device::CPU, API::dlaf>(dlaf_context, uplo, m, mb,
grid, nevals);
}
}
}

c_api_test_finalize<API::dlaf>(dlaf_context);
}
}

#ifdef DLAF_WITH_SCALAPACK
TYPED_TEST(EigensolverTestMC, CorrectnessDistributedScalapack) {
for (comm::CommunicatorGrid& grid : this->commGrids()) {
auto dlaf_context =
c_api_test_initialize<API::scalapack>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

for (auto uplo : blas_uplos) {
for (auto [m, mb, b_min] : sizes) {
auto numevals = num_evals(m);
for (auto nevals : numevals) {
testEigensolver<TypeParam, Backend::MC, Device::CPU, API::scalapack>(uplo, m, mb, grid,
nevals);
testEigensolver<TypeParam, Backend::MC, Device::CPU, API::scalapack>(dlaf_context, uplo, m, mb,
grid, nevals);
}
}
}

c_api_test_finalize<API::scalapack>(dlaf_context);
}
}
#endif

#ifdef DLAF_WITH_GPU
TYPED_TEST(EigensolverTestGPU, CorrectnessDistributedDLAF) {
for (comm::CommunicatorGrid& grid : this->commGrids()) {
auto dlaf_context =
c_api_test_initialize<API::dlaf>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

for (auto uplo : blas_uplos) {
for (auto [m, mb, b_min] : sizes) {
auto numevals = num_evals(m);
for (auto nevals : numevals) {
testEigensolver<TypeParam, Backend::GPU, Device::GPU, API::dlaf>(uplo, m, mb, grid, nevals);
testEigensolver<TypeParam, Backend::GPU, Device::GPU, API::dlaf>(dlaf_context, uplo, m, mb,
grid, nevals);
}
}
}

c_api_test_finalize<API::dlaf>(dlaf_context);
}
}

#ifdef DLAF_WITH_SCALAPACK
TYPED_TEST(EigensolverTestGPU, CorrectnessDistributedScalapack) {
for (comm::CommunicatorGrid& grid : this->commGrids()) {
auto dlaf_context =
c_api_test_initialize<API::scalapack>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

for (auto uplo : blas_uplos) {
for (auto [m, mb, b_min] : sizes) {
auto numevals = num_evals(m);
for (auto nevals : numevals) {
testEigensolver<TypeParam, Backend::GPU, Device::GPU, API::scalapack>(uplo, m, mb, grid,
nevals);
testEigensolver<TypeParam, Backend::GPU, Device::GPU, API::scalapack>(dlaf_context, uplo, m,
mb, grid, nevals);
}
}
}

c_api_test_finalize<API::scalapack>(dlaf_context);
}
}
#endif
Expand Down
42 changes: 29 additions & 13 deletions test/unit/c_api/eigensolver/test_gen_eigensolver_c_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,12 @@ std::set<std::optional<SizeType>> num_evals(const SizeType m) {
}

template <class T, Backend B, Device D, API api, Factorization factorization>
void testGenEigensolver(const blas::Uplo uplo, const SizeType m, const SizeType mb,
void testGenEigensolver(int dlaf_context, const blas::Uplo uplo, const SizeType m, const SizeType mb,
CommunicatorGrid& grid, std::optional<SizeType> eigenvalues_index_end) {
// std::nullopt calls the API without specifying the number of eigenvalues to compute
// The final check needs to happen on all m eigenvalues/eigenvectors
const SizeType eval_idx_end = eigenvalues_index_end.value_or(m);

auto dlaf_context = c_api_test_initialize<api>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

// In normal use the runtime is resumed by the C API call
// The pika runtime is suspended by dlaf_initialize
// Here we need to resume it manually to build the matrices with DLA-Future
Expand Down Expand Up @@ -420,40 +418,48 @@ void testGenEigensolver(const blas::Uplo uplo, const SizeType m, const SizeType

// Suspend pika to make sure dlaf_finalize resumes it
pika::suspend();

c_api_test_finalize<api>(dlaf_context);
}

TYPED_TEST(GenEigensolverTestMC, CorrectnessDistributedDLAF) {
for (comm::CommunicatorGrid& grid : this->commGrids()) {
auto dlaf_context =
c_api_test_initialize<API::dlaf>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

for (auto uplo : blas_uplos) {
for (auto [m, mb, b_min] : sizes) {
auto numevals = num_evals(m);
for (auto nevals : numevals) {
testGenEigensolver<TypeParam, Backend::MC, Device::CPU, API::dlaf,
Factorization::do_factorization>(uplo, m, mb, grid, nevals);
Factorization::do_factorization>(dlaf_context, uplo, m, mb, grid, nevals);
testGenEigensolver<TypeParam, Backend::MC, Device::CPU, API::dlaf,
Factorization::already_factorized>(uplo, m, mb, grid, nevals);
Factorization::already_factorized>(dlaf_context, uplo, m, mb, grid, nevals);
}
}
}

c_api_test_finalize<API::dlaf>(dlaf_context);
}
}

#ifdef DLAF_WITH_GPU
TYPED_TEST(GenEigensolverTestGPU, CorrectnessDistributedDLAF) {
for (comm::CommunicatorGrid& grid : this->commGrids()) {
auto dlaf_context =
c_api_test_initialize<API::dlaf>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

for (auto uplo : blas_uplos) {
for (auto [m, mb, b_min] : sizes) {
auto numevals = num_evals(m);
for (auto nevals : numevals) {
testGenEigensolver<TypeParam, Backend::GPU, Device::GPU, API::dlaf,
Factorization::do_factorization>(uplo, m, mb, grid, nevals);
Factorization::do_factorization>(dlaf_context, uplo, m, mb, grid, nevals);
testGenEigensolver<TypeParam, Backend::GPU, Device::GPU, API::dlaf,
Factorization::already_factorized>(uplo, m, mb, grid, nevals);
Factorization::already_factorized>(dlaf_context, uplo, m, mb, grid, nevals);
}
}
}

c_api_test_finalize<API::dlaf>(dlaf_context);
}
}
#endif
Expand All @@ -462,34 +468,44 @@ TYPED_TEST(GenEigensolverTestGPU, CorrectnessDistributedDLAF) {

TYPED_TEST(GenEigensolverTestMC, CorrectnessDistributedScaLAPACK) {
for (comm::CommunicatorGrid& grid : this->commGrids()) {
auto dlaf_context =
c_api_test_initialize<API::scalapack>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

for (auto uplo : blas_uplos) {
for (auto [m, mb, b_min] : sizes) {
auto numevals = num_evals(m);
for (auto nevals : numevals) {
testGenEigensolver<TypeParam, Backend::MC, Device::CPU, API::scalapack,
Factorization::do_factorization>(uplo, m, mb, grid, nevals);
Factorization::do_factorization>(dlaf_context, uplo, m, mb, grid, nevals);
testGenEigensolver<TypeParam, Backend::MC, Device::CPU, API::scalapack,
Factorization::already_factorized>(uplo, m, mb, grid, nevals);
Factorization::already_factorized>(dlaf_context, uplo, m, mb, grid, nevals);
}
}
}

c_api_test_finalize<API::scalapack>(dlaf_context);
}
}

#ifdef DLAF_WITH_GPU
TYPED_TEST(GenEigensolverTestGPU, CorrectnessDistributedScaLAPACK) {
for (comm::CommunicatorGrid& grid : this->commGrids()) {
auto dlaf_context =
c_api_test_initialize<API::scalapack>(pika_argc, pika_argv, dlaf_argc, dlaf_argv, grid);

for (auto uplo : blas_uplos) {
for (auto [m, mb, b_min] : sizes) {
auto numevals = num_evals(m);
for (auto nevals : numevals) {
testGenEigensolver<TypeParam, Backend::GPU, Device::GPU, API::scalapack,
Factorization::do_factorization>(uplo, m, mb, grid, nevals);
Factorization::do_factorization>(dlaf_context, uplo, m, mb, grid, nevals);
testGenEigensolver<TypeParam, Backend::GPU, Device::GPU, API::scalapack,
Factorization::already_factorized>(uplo, m, mb, grid, nevals);
Factorization::already_factorized>(dlaf_context, uplo, m, mb, grid, nevals);
}
}
}

c_api_test_finalize<API::scalapack>(dlaf_context);
}
}
#endif
Expand Down
Loading