From 27d34b03a5a7d8c70793eac5d30d6dd4baa4fefb Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Fri, 5 May 2023 13:26:18 +0200 Subject: [PATCH 1/4] enable ensemble builds - remove SYCL-specific headers from general builds - disable failing tests for rocFFT - disable DPC++ distributed tests --- include/ginkgo/core/base/math.hpp | 7 ------- test/matrix/fft_kernels.cpp | 6 ++++++ test/mpi/distributed/CMakeLists.txt | 4 ++-- test/mpi/distributed/preconditioner/CMakeLists.txt | 2 +- test/mpi/solver/CMakeLists.txt | 2 +- test/solver/idr_kernels.cpp | 5 +++++ 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/ginkgo/core/base/math.hpp b/include/ginkgo/core/base/math.hpp index 3a6152c55d4..70e4db5bb2d 100644 --- a/include/ginkgo/core/base/math.hpp +++ b/include/ginkgo/core/base/math.hpp @@ -47,13 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -// Using SYCL_LANGUAGE_VERSION will lead the mismatch sycl namespace from 6.0.0 -// when using dpcpp compiler without dpcpp module -#if GINKGO_DPCPP_MAJOR_VERSION -#include -#endif - - namespace gko { diff --git a/test/matrix/fft_kernels.cpp b/test/matrix/fft_kernels.cpp index 59d2d2de68e..fd9dda821c0 100644 --- a/test/matrix/fft_kernels.cpp +++ b/test/matrix/fft_kernels.cpp @@ -138,6 +138,9 @@ TYPED_TEST(Fft, Apply1DIsEqualToReference) TYPED_TEST(Fft, ApplyStrided1DIsEqualToReference) { +#if defined(GKO_COMPILING_HIP) && GINKGO_HIP_PLATFORM_HCC + GTEST_SKIP() << "rocFFT has a bug related to strided 1D FFT"; +#endif using T = typename TestFixture::value_type; this->fft->apply(this->data_strided, this->out_strided); @@ -160,6 +163,9 @@ TYPED_TEST(Fft, Apply1DInverseIsEqualToReference) TYPED_TEST(Fft, ApplyStrided1DInverseIsEqualToReference) { +#if defined(GKO_COMPILING_HIP) && GINKGO_HIP_PLATFORM_HCC + GTEST_SKIP() << "rocFFT has a bug related to strided 1D FFT"; +#endif using T = typename TestFixture::value_type; this->ifft->apply(this->data_strided, this->out_strided); diff --git a/test/mpi/distributed/CMakeLists.txt b/test/mpi/distributed/CMakeLists.txt index a92e0ef4f70..b2368777589 100644 --- a/test/mpi/distributed/CMakeLists.txt +++ b/test/mpi/distributed/CMakeLists.txt @@ -1,4 +1,4 @@ -ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3) -ginkgo_create_common_and_reference_test(vector MPI_SIZE 3) +ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) +ginkgo_create_common_and_reference_test(vector MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) add_subdirectory(preconditioner) diff --git a/test/mpi/distributed/preconditioner/CMakeLists.txt b/test/mpi/distributed/preconditioner/CMakeLists.txt index 681bbec3bc9..4f734d21df8 100644 --- a/test/mpi/distributed/preconditioner/CMakeLists.txt +++ b/test/mpi/distributed/preconditioner/CMakeLists.txt @@ -1 +1 @@ -ginkgo_create_common_and_reference_test(schwarz MPI_SIZE 3) +ginkgo_create_common_and_reference_test(schwarz MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) diff --git a/test/mpi/solver/CMakeLists.txt b/test/mpi/solver/CMakeLists.txt index 43a2d870d3f..bffd7b5ab10 100644 --- a/test/mpi/solver/CMakeLists.txt +++ b/test/mpi/solver/CMakeLists.txt @@ -1 +1 @@ -ginkgo_create_common_and_reference_test(solver MPI_SIZE 3) +ginkgo_create_common_and_reference_test(solver MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) diff --git a/test/solver/idr_kernels.cpp b/test/solver/idr_kernels.cpp index f7191483615..959c857cb71 100644 --- a/test/solver/idr_kernels.cpp +++ b/test/solver/idr_kernels.cpp @@ -40,6 +40,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include +#ifdef GKO_COMPILING_DPCPP +#include +#endif + + #include #include #include From 60e7a38550e1cb77401a5e51a75449cbf9696b23 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Fri, 5 May 2023 13:26:50 +0200 Subject: [PATCH 2/4] uniform distributed test folder structure --- test/mpi/CMakeLists.txt | 1 - test/mpi/distributed/CMakeLists.txt | 1 + test/mpi/{ => distributed}/solver/CMakeLists.txt | 0 test/mpi/{ => distributed}/solver/solver.cpp | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename test/mpi/{ => distributed}/solver/CMakeLists.txt (100%) rename test/mpi/{ => distributed}/solver/solver.cpp (100%) diff --git a/test/mpi/CMakeLists.txt b/test/mpi/CMakeLists.txt index f715ea482ec..9066de66970 100644 --- a/test/mpi/CMakeLists.txt +++ b/test/mpi/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(distributed) -add_subdirectory(solver) diff --git a/test/mpi/distributed/CMakeLists.txt b/test/mpi/distributed/CMakeLists.txt index b2368777589..b02a57b9983 100644 --- a/test/mpi/distributed/CMakeLists.txt +++ b/test/mpi/distributed/CMakeLists.txt @@ -2,3 +2,4 @@ ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3 DISABLE_EXECUTORS dpcp ginkgo_create_common_and_reference_test(vector MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) add_subdirectory(preconditioner) +add_subdirectory(solver) diff --git a/test/mpi/solver/CMakeLists.txt b/test/mpi/distributed/solver/CMakeLists.txt similarity index 100% rename from test/mpi/solver/CMakeLists.txt rename to test/mpi/distributed/solver/CMakeLists.txt diff --git a/test/mpi/solver/solver.cpp b/test/mpi/distributed/solver/solver.cpp similarity index 100% rename from test/mpi/solver/solver.cpp rename to test/mpi/distributed/solver/solver.cpp From 7fcf2cb6c89c4cb6767fba598b86112cef79ccef Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Wed, 5 Jul 2023 11:05:01 +0200 Subject: [PATCH 3/4] reenable distributed vector test for dpcpp --- test/mpi/distributed/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/mpi/distributed/CMakeLists.txt b/test/mpi/distributed/CMakeLists.txt index b02a57b9983..3d5e3cadd58 100644 --- a/test/mpi/distributed/CMakeLists.txt +++ b/test/mpi/distributed/CMakeLists.txt @@ -1,5 +1,5 @@ ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) -ginkgo_create_common_and_reference_test(vector MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) +ginkgo_create_common_and_reference_test(vector MPI_SIZE 3) add_subdirectory(preconditioner) add_subdirectory(solver) From 4755c23b4b05bac0cb8562bbd69f3ccc6467a206 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Thu, 6 Jul 2023 15:12:54 +0200 Subject: [PATCH 4/4] move test/mpi/distributed to test/mpi --- test/mpi/CMakeLists.txt | 6 +++++- test/mpi/distributed/CMakeLists.txt | 5 ----- test/mpi/{distributed => }/matrix.cpp | 0 test/mpi/{distributed => }/preconditioner/CMakeLists.txt | 0 test/mpi/{distributed => }/preconditioner/schwarz.cpp | 0 test/mpi/{distributed => }/solver/CMakeLists.txt | 0 test/mpi/{distributed => }/solver/solver.cpp | 0 test/mpi/{distributed => }/vector.cpp | 0 8 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 test/mpi/distributed/CMakeLists.txt rename test/mpi/{distributed => }/matrix.cpp (100%) rename test/mpi/{distributed => }/preconditioner/CMakeLists.txt (100%) rename test/mpi/{distributed => }/preconditioner/schwarz.cpp (100%) rename test/mpi/{distributed => }/solver/CMakeLists.txt (100%) rename test/mpi/{distributed => }/solver/solver.cpp (100%) rename test/mpi/{distributed => }/vector.cpp (100%) diff --git a/test/mpi/CMakeLists.txt b/test/mpi/CMakeLists.txt index 9066de66970..3d5e3cadd58 100644 --- a/test/mpi/CMakeLists.txt +++ b/test/mpi/CMakeLists.txt @@ -1 +1,5 @@ -add_subdirectory(distributed) +ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) +ginkgo_create_common_and_reference_test(vector MPI_SIZE 3) + +add_subdirectory(preconditioner) +add_subdirectory(solver) diff --git a/test/mpi/distributed/CMakeLists.txt b/test/mpi/distributed/CMakeLists.txt deleted file mode 100644 index 3d5e3cadd58..00000000000 --- a/test/mpi/distributed/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -ginkgo_create_common_and_reference_test(matrix MPI_SIZE 3 DISABLE_EXECUTORS dpcpp) -ginkgo_create_common_and_reference_test(vector MPI_SIZE 3) - -add_subdirectory(preconditioner) -add_subdirectory(solver) diff --git a/test/mpi/distributed/matrix.cpp b/test/mpi/matrix.cpp similarity index 100% rename from test/mpi/distributed/matrix.cpp rename to test/mpi/matrix.cpp diff --git a/test/mpi/distributed/preconditioner/CMakeLists.txt b/test/mpi/preconditioner/CMakeLists.txt similarity index 100% rename from test/mpi/distributed/preconditioner/CMakeLists.txt rename to test/mpi/preconditioner/CMakeLists.txt diff --git a/test/mpi/distributed/preconditioner/schwarz.cpp b/test/mpi/preconditioner/schwarz.cpp similarity index 100% rename from test/mpi/distributed/preconditioner/schwarz.cpp rename to test/mpi/preconditioner/schwarz.cpp diff --git a/test/mpi/distributed/solver/CMakeLists.txt b/test/mpi/solver/CMakeLists.txt similarity index 100% rename from test/mpi/distributed/solver/CMakeLists.txt rename to test/mpi/solver/CMakeLists.txt diff --git a/test/mpi/distributed/solver/solver.cpp b/test/mpi/solver/solver.cpp similarity index 100% rename from test/mpi/distributed/solver/solver.cpp rename to test/mpi/solver/solver.cpp diff --git a/test/mpi/distributed/vector.cpp b/test/mpi/vector.cpp similarity index 100% rename from test/mpi/distributed/vector.cpp rename to test/mpi/vector.cpp