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

Jump to bottom

Enable an ensemble build #1333

Merged
merged 4 commits into from
Jul 6, 2023
Merged

Enable an ensemble build #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27d34b0
enable ensemble builds
upsj May 5, 2023
60e7a38
uniform distributed test folder structure
upsj May 5, 2023
7fcf2cb
reenable distributed vector test for dpcpp
upsj Jul 5, 2023
4755c23
move test/mpi/distributed to test/mpi
upsj Jul 6, 2023
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
7 changes: 0 additions & 7 deletions include/ginkgo/core/base/math.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <ginkgo/core/base/utils.hpp>


// 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 <CL/sycl.hpp>
#endif


namespace gko {


Expand Down
6 changes: 6 additions & 0 deletions test/matrix/fft_kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Comment on lines +166 to +168
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is something related to this ROCm/rocFFT#353 ?
but it should pass all in the current CI setup

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is a different bug (causing incorrect results, not an error) I didn't bother creating a reproducer for yet.

using T = typename TestFixture::value_type;

this->ifft->apply(this->data_strided, this->out_strided);
Expand Down
5 changes: 4 additions & 1 deletion test/mpi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +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)
4 changes: 0 additions & 4 deletions test/mpi/distributed/CMakeLists.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/mpi/distributed/preconditioner/CMakeLists.txt
View file
Open in desktop

This file was deleted.

0 test/mpi/distributed/matrix.cpp → test/mpi/matrix.cpp
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions test/mpi/preconditioner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ginkgo_create_common_and_reference_test(schwarz MPI_SIZE 3 DISABLE_EXECUTORS dpcpp)
0 ...pi/distributed/preconditioner/schwarz.cpp → test/mpi/preconditioner/schwarz.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/mpi/solver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
0 test/mpi/distributed/vector.cpp → test/mpi/vector.cpp
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions test/solver/idr_kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <gtest/gtest.h>


#ifdef GKO_COMPILING_DPCPP
#include <CL/sycl.hpp>
#endif
Comment on lines +43 to +45
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is in this header?
It seems you are moving this include from include/ginkgo/core/base/math.hpp to this file.

Copy link
Member Author

@upsj upsj Jul 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The queue is an incomplete class in executor.hpp

if (exec->get_queue()->get_device().is_gpu()) {
    GTEST_SKIP() << "skip the test because oneMKL GEMM on gpu may give NaN "
                    "(under investigation)";
}



#include <ginkgo/core/base/array.hpp>
#include <ginkgo/core/base/exception.hpp>
#include <ginkgo/core/base/executor.hpp>
Expand Down