tpetra: enable SYCL matrix-matrix tests

trilinos · Jul 2, 2024 · cd82d2d · cd82d2d
1 parent 9d8eac7
commit cd82d2d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/packages/tpetra/core/test/MatrixMatrix/FECrs_MatrixMatrix_UnitTests.cpp b/packages/tpetra/core/test/MatrixMatrix/FECrs_MatrixMatrix_UnitTests.cpp
@@ -393,9 +393,6 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL (Tpetra_MatMat, FECrsMatrix, SC, LO, GO, NT)
 
   TPETRA_ETI_MANGLING_TYPEDEFS()
 
-// FIXME_SYCL
-#ifndef KOKKOS_ENABLE_SYCL
   TPETRA_INSTANTIATE_SLGN_NO_ORDINAL_SCALAR( UNIT_TEST_GROUP_SC_LO_GO_NO )
-#endif
 
 } // anonymous namespace
diff --git a/packages/tpetra/core/test/MatrixMatrix/MatrixMatrix_UnitTests.cpp b/packages/tpetra/core/test/MatrixMatrix/MatrixMatrix_UnitTests.cpp
@@ -2846,17 +2846,9 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Tpetra_MatMatAdd, locally_unsorted, SC, LO, GO
   TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(Tpetra_MatMatAdd, different_index_base, SC, LO, GO, NT) \
   TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(Tpetra_MatMatMult, BlockCrsMult, SC, LO, GO, NT)
 
-// FIXME_SYCL requires querying free device memory in KokkosKernels, see
-// https://github.com/kokkos/kokkos-kernels/issues/1062.
-// The SYCL specifications don't allow asking for that.
-#ifdef HAVE_TPETRA_SYCL
-  #define UNIT_TEST_GROUP_SC_LO_GO_NO( SC, LO, GO, NT )  \
-    UNIT_TEST_GROUP_SC_LO_GO_NO_COMMON( SC, LO, GO, NT )
-#else
-  #define UNIT_TEST_GROUP_SC_LO_GO_NO( SC, LO, GO, NT )                                 \
+#define UNIT_TEST_GROUP_SC_LO_GO_NO( SC, LO, GO, NT )                                 \
     TEUCHOS_UNIT_TEST_TEMPLATE_4_INSTANT(Tpetra_MatMat, operations_test,SC, LO, GO, NT) \
     UNIT_TEST_GROUP_SC_LO_GO_NO_COMMON( SC, LO, GO, NT )
-#endif
 
   TPETRA_ETI_MANGLING_TYPEDEFS()