use Executor:::get_description() in tests

ginkgo-project · May 18, 2024 · c456be3 · c456be3
1 parent d94378c
commit c456be3
Show file tree

Hide file tree

Showing 80 changed files with 163 additions and 141 deletions.
diff --git a/test/base/batch_multi_vector_kernels.cpp b/test/base/batch_multi_vector_kernels.cpp
@@ -20,7 +20,7 @@
 #include "core/test/utils.hpp"
 #include "core/test/utils/assertions.hpp"
 #include "core/test/utils/batch_helpers.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class MultiVector : public CommonTestFixture {

diff --git a/test/base/device_matrix_data_kernels.cpp b/test/base/device_matrix_data_kernels.cpp
@@ -20,7 +20,7 @@
 #include "core/base/device_matrix_data_kernels.hpp"
 #include "core/test/utils.hpp"
 #include "core/test/utils/assertions.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename ValueIndexType>

diff --git a/test/base/executor.cpp b/test/base/executor.cpp
@@ -12,7 +12,7 @@
 
 
 #include "core/test/utils/assertions.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 namespace reference {

diff --git a/test/base/index_range.cpp b/test/base/index_range.cpp
@@ -14,7 +14,7 @@
 #include "common/unified/base/kernel_launch.hpp"
 #include "core/base/index_range.hpp"
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class IndexRange : public CommonTestFixture {

diff --git a/test/base/kernel_launch_generic.cpp b/test/base/kernel_launch_generic.cpp
@@ -23,7 +23,7 @@
 #include "common/unified/base/kernel_launch_solver.hpp"
 #include "core/base/array_access.hpp"
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 using gko::dim;

diff --git a/test/base/timer.cpp b/test/base/timer.cpp
@@ -13,7 +13,7 @@
 
 
 #include "core/test/utils/assertions.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Timer : public CommonTestFixture {

diff --git a/test/components/absolute_array_kernels.cpp b/test/components/absolute_array_kernels.cpp
@@ -17,7 +17,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class AbsoluteArray : public CommonTestFixture {

diff --git a/test/components/fill_array_kernels.cpp b/test/components/fill_array_kernels.cpp
@@ -17,7 +17,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename T>

diff --git a/test/components/format_conversion_kernels.cpp b/test/components/format_conversion_kernels.cpp
@@ -14,7 +14,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename IndexType>

diff --git a/test/components/precision_conversion_kernels.cpp b/test/components/precision_conversion_kernels.cpp
@@ -16,7 +16,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 #if !(GINKGO_COMMON_SINGLE_MODE)

diff --git a/test/components/prefix_sum_kernels.cpp b/test/components/prefix_sum_kernels.cpp
@@ -19,7 +19,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename T>

diff --git a/test/components/reduce_array_kernels.cpp b/test/components/reduce_array_kernels.cpp
@@ -17,7 +17,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename T>

diff --git a/test/distributed/matrix_kernels.cpp b/test/distributed/matrix_kernels.cpp
@@ -20,7 +20,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 using comm_index_type = gko::experimental::distributed::comm_index_type;

diff --git a/test/distributed/partition_helper_kernels.cpp b/test/distributed/partition_helper_kernels.cpp
@@ -12,7 +12,7 @@
 #include "core/base/iterator_factory.hpp"
 #include "core/distributed/partition_helpers_kernels.hpp"
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 using gko::experimental::distributed::comm_index_type;

diff --git a/test/distributed/partition_kernels.cpp b/test/distributed/partition_kernels.cpp
@@ -19,7 +19,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 using comm_index_type = gko::experimental::distributed::comm_index_type;

diff --git a/test/distributed/vector_kernels.cpp b/test/distributed/vector_kernels.cpp
@@ -19,7 +19,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 using comm_index_type = gko::experimental::distributed::comm_index_type;

diff --git a/test/factorization/cholesky_kernels.cpp b/test/factorization/cholesky_kernels.cpp
@@ -28,7 +28,7 @@
 #include "core/test/utils/assertions.hpp"
 #include "core/utils/matrix_utils.hpp"
 #include "matrices/config.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 namespace {

diff --git a/test/factorization/ic_kernels.cpp b/test/factorization/ic_kernels.cpp
@@ -19,7 +19,7 @@
 #include "core/test/utils.hpp"
 #include "core/test/utils/unsort_matrix.hpp"
 #include "matrices/config.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Ic : public CommonTestFixture {

diff --git a/test/factorization/ilu_kernels.cpp b/test/factorization/ilu_kernels.cpp
@@ -19,7 +19,7 @@
 #include "core/test/utils.hpp"
 #include "core/test/utils/unsort_matrix.hpp"
 #include "matrices/config.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Ilu : public CommonTestFixture {

diff --git a/test/factorization/lu_kernels.cpp b/test/factorization/lu_kernels.cpp
@@ -31,7 +31,7 @@
 #include "core/test/utils.hpp"
 #include "core/test/utils/assertions.hpp"
 #include "matrices/config.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename ValueIndexType>

diff --git a/test/factorization/par_ic_kernels.cpp b/test/factorization/par_ic_kernels.cpp
@@ -27,7 +27,7 @@
 #include "core/matrix/csr_kernels.hpp"
 #include "core/test/utils.hpp"
 #include "matrices/config.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename ValueIndexType>

diff --git a/test/factorization/par_ict_kernels.cpp b/test/factorization/par_ict_kernels.cpp
@@ -27,7 +27,7 @@
 #include "core/matrix/csr_kernels.hpp"
 #include "core/test/utils.hpp"
 #include "matrices/config.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename ValueIndexType>

diff --git a/test/factorization/par_ilu_kernels.cpp b/test/factorization/par_ilu_kernels.cpp
@@ -26,7 +26,7 @@
 #include "core/factorization/factorization_kernels.hpp"
 #include "core/test/utils.hpp"
 #include "matrices/config.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename ValueIndexType>

diff --git a/test/factorization/par_ilut_kernels.cpp b/test/factorization/par_ilut_kernels.cpp
@@ -27,7 +27,7 @@
 #include "core/matrix/csr_kernels.hpp"
 #include "core/test/utils.hpp"
 #include "matrices/config.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename ValueIndexType>

diff --git a/test/log/profiler_hook.cpp b/test/log/profiler_hook.cpp
@@ -11,7 +11,7 @@
 #include <ginkgo/core/log/profiler_hook.hpp>
 
 
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class ProfilerHook : public CommonTestFixture {

diff --git a/test/matrix/batch_csr_kernels.cpp b/test/matrix/batch_csr_kernels.cpp
@@ -23,7 +23,7 @@
 #include "core/test/utils/array_generator.hpp"
 #include "core/test/utils/assertions.hpp"
 #include "core/test/utils/batch_helpers.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Csr : public CommonTestFixture {

diff --git a/test/matrix/batch_dense_kernels.cpp b/test/matrix/batch_dense_kernels.cpp
@@ -23,7 +23,7 @@
 #include "core/test/utils/array_generator.hpp"
 #include "core/test/utils/assertions.hpp"
 #include "core/test/utils/batch_helpers.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Dense : public CommonTestFixture {

diff --git a/test/matrix/batch_ell_kernels.cpp b/test/matrix/batch_ell_kernels.cpp
@@ -22,7 +22,7 @@
 #include "core/test/utils.hpp"
 #include "core/test/utils/assertions.hpp"
 #include "core/test/utils/batch_helpers.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Ell : public CommonTestFixture {

diff --git a/test/matrix/coo_kernels.cpp b/test/matrix/coo_kernels.cpp
@@ -22,7 +22,7 @@
 
 #include "core/test/utils.hpp"
 #include "core/test/utils/unsort_matrix.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Coo : public CommonTestFixture {

diff --git a/test/matrix/csr_kernels.cpp b/test/matrix/csr_kernels.cpp
@@ -22,7 +22,7 @@
 #include "core/base/array_access.hpp"
 #include "core/components/fill_array_kernels.hpp"
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Csr : public CommonTestFixture {

diff --git a/test/matrix/csr_kernels2.cpp b/test/matrix/csr_kernels2.cpp
@@ -32,7 +32,7 @@
 #include "core/test/utils/assertions.hpp"
 #include "core/test/utils/unsort_matrix.hpp"
 #include "core/utils/matrix_utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Csr : public CommonTestFixture {

diff --git a/test/matrix/dense_kernels.cpp b/test/matrix/dense_kernels.cpp
@@ -30,7 +30,7 @@
 
 #include "core/components/fill_array_kernels.hpp"
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Dense : public CommonTestFixture {

diff --git a/test/matrix/diagonal_kernels.cpp b/test/matrix/diagonal_kernels.cpp
@@ -19,7 +19,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Diagonal : public CommonTestFixture {

diff --git a/test/matrix/ell_kernels.cpp b/test/matrix/ell_kernels.cpp
@@ -21,7 +21,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Ell : public CommonTestFixture {

diff --git a/test/matrix/fbcsr_kernels.cpp b/test/matrix/fbcsr_kernels.cpp
@@ -18,7 +18,7 @@
 #include "core/test/matrix/fbcsr_sample.hpp"
 #include "core/test/utils.hpp"
 #include "core/test/utils/fb_matrix_generator.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename T>

diff --git a/test/matrix/fft_kernels.cpp b/test/matrix/fft_kernels.cpp
@@ -16,7 +16,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 template <typename ValueType>

diff --git a/test/matrix/hybrid_kernels.cpp b/test/matrix/hybrid_kernels.cpp
@@ -19,7 +19,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Hybrid : public CommonTestFixture {

diff --git a/test/matrix/matrix.cpp b/test/matrix/matrix.cpp
@@ -25,7 +25,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 #if GINKGO_COMMON_SINGLE_MODE

diff --git a/test/matrix/permutation_kernels.cpp b/test/matrix/permutation_kernels.cpp
@@ -14,7 +14,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Permutation : public CommonTestFixture {

diff --git a/test/matrix/scaled_permutation_kernels.cpp b/test/matrix/scaled_permutation_kernels.cpp
@@ -13,7 +13,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class ScaledPermutation : public CommonTestFixture {

diff --git a/test/matrix/sellp_kernels.cpp b/test/matrix/sellp_kernels.cpp
@@ -20,7 +20,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 class Sellp : public CommonTestFixture {

diff --git a/test/matrix/sparsity_csr_kernels.cpp b/test/matrix/sparsity_csr_kernels.cpp
@@ -23,7 +23,7 @@
 #include "core/test/utils/assertions.hpp"
 #include "core/test/utils/matrix_generator.hpp"
 #include "core/test/utils/unsort_matrix.hpp"
-#include "test/utils/executor.hpp"
+#include "test/utils/common_fixture.hpp"
 
 
 namespace {

diff --git a/test/mpi/matrix.cpp b/test/mpi/matrix.cpp
@@ -24,7 +24,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/mpi/executor.hpp"
+#include "test/utils/mpi/common_fixture.hpp"
 
 
 #ifndef GKO_COMPILING_DPCPP

diff --git a/test/mpi/multigrid/pgm.cpp b/test/mpi/multigrid/pgm.cpp
@@ -23,7 +23,7 @@
 
 
 #include "core/test/utils.hpp"
-#include "test/utils/mpi/executor.hpp"
+#include "test/utils/mpi/common_fixture.hpp"
 
 
 #if GINKGO_DPCPP_SINGLE_MODE