From f9a88fcf9f4b3b5434c93f4e41ba4eb0f1343a7b Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Mon, 18 Sep 2023 13:02:53 -0600 Subject: [PATCH] Rename TestExecSpace to TestDevice --- .../Test_Batched_BatchedGemm_Complex.hpp | 48 +-- .../Test_Batched_BatchedGemm_Real.hpp | 80 ++--- .../Test_Batched_SerialAxpy_Complex.hpp | 4 +- .../Test_Batched_SerialAxpy_Real.hpp | 4 +- ..._Batched_SerialEigendecomposition_Real.hpp | 4 +- .../Test_Batched_SerialGemm_Complex.hpp | 32 +- .../Test_Batched_SerialGemm_Real.hpp | 76 ++-- .../Test_Batched_SerialGesv_Real.hpp | 10 +- .../Test_Batched_SerialInverseLU_Complex.hpp | 4 +- .../Test_Batched_SerialInverseLU_Real.hpp | 8 +- .../Test_Batched_SerialLU_Complex.hpp | 2 +- .../unit_test/Test_Batched_SerialLU_Real.hpp | 4 +- .../unit_test/Test_Batched_SerialSVD.hpp | 16 +- .../Test_Batched_SerialSolveLU_Complex.hpp | 4 +- .../Test_Batched_SerialSolveLU_Real.hpp | 8 +- .../Test_Batched_SerialTrmm_Complex.hpp | 108 +++--- .../Test_Batched_SerialTrmm_Real.hpp | 90 ++--- .../Test_Batched_SerialTrsm_Complex.hpp | 56 +-- .../Test_Batched_SerialTrsm_Real.hpp | 50 ++- .../Test_Batched_SerialTrsv_Complex.hpp | 24 +- .../Test_Batched_SerialTrsv_Real.hpp | 20 +- .../Test_Batched_SerialTrtri_Complex.hpp | 28 +- .../Test_Batched_SerialTrtri_Real.hpp | 20 +- .../Test_Batched_TeamAxpy_Complex.hpp | 4 +- .../unit_test/Test_Batched_TeamAxpy_Real.hpp | 4 +- .../Test_Batched_TeamGemm_Complex.hpp | 24 +- .../unit_test/Test_Batched_TeamGemm_Real.hpp | 48 +-- .../unit_test/Test_Batched_TeamGesv_Real.hpp | 10 +- .../Test_Batched_TeamInverseLU_Complex.hpp | 4 +- .../Test_Batched_TeamInverseLU_Real.hpp | 8 +- .../unit_test/Test_Batched_TeamLU_Complex.hpp | 2 +- .../unit_test/Test_Batched_TeamLU_Real.hpp | 4 +- .../Test_Batched_TeamSolveLU_Complex.hpp | 4 +- .../Test_Batched_TeamSolveLU_Real.hpp | 8 +- .../Test_Batched_TeamTrsm_Complex.hpp | 40 +-- .../unit_test/Test_Batched_TeamTrsm_Real.hpp | 40 +-- .../Test_Batched_TeamTrsv_Complex.hpp | 16 +- .../unit_test/Test_Batched_TeamTrsv_Real.hpp | 16 +- .../Test_Batched_TeamVectorAxpy_Complex.hpp | 5 +- .../Test_Batched_TeamVectorAxpy_Real.hpp | 4 +- ...ched_TeamVectorEigendecomposition_Real.hpp | 4 +- .../Test_Batched_TeamVectorGemm_Complex.hpp | 32 +- .../Test_Batched_TeamVectorGemm_Real.hpp | 64 ++-- .../Test_Batched_TeamVectorGesv_Real.hpp | 8 +- .../Test_Batched_TeamVectorQR_Real.hpp | 4 +- ...d_TeamVectorQR_WithColumnPivoting_Real.hpp | 6 +- .../Test_Batched_TeamVectorSolveUTV2_Real.hpp | 4 +- .../Test_Batched_TeamVectorSolveUTV_Real.hpp | 4 +- .../Test_Batched_TeamVectorUTV_Real.hpp | 4 +- .../Test_Batched_VectorArithmatic.hpp | 38 +- .../unit_test/Test_Batched_VectorLogical.hpp | 16 +- .../unit_test/Test_Batched_VectorMath.hpp | 16 +- .../unit_test/Test_Batched_VectorMisc.hpp | 16 +- .../unit_test/Test_Batched_VectorRelation.hpp | 12 +- .../unit_test/Test_Batched_VectorView.hpp | 14 +- .../Test_Batched_SerialGMRES_Real.hpp | 4 +- .../Test_Batched_SerialSpmv_Real.hpp | 4 +- .../unit_test/Test_Batched_TeamCG_Real.hpp | 4 +- .../unit_test/Test_Batched_TeamGMRES_Real.hpp | 4 +- .../unit_test/Test_Batched_TeamSpmv_Real.hpp | 4 +- .../Test_Batched_TeamVectorCG_Real.hpp | 4 +- .../Test_Batched_TeamVectorGMRES_Real.hpp | 4 +- .../Test_Batched_TeamVectorSpmv_Real.hpp | 4 +- blas/unit_test/Test_Blas1_abs.hpp | 21 +- blas/unit_test/Test_Blas1_asum.hpp | 8 +- blas/unit_test/Test_Blas1_axpby.hpp | 21 +- blas/unit_test/Test_Blas1_axpy.hpp | 21 +- blas/unit_test/Test_Blas1_dot.hpp | 21 +- blas/unit_test/Test_Blas1_iamax.hpp | 16 +- blas/unit_test/Test_Blas1_mult.hpp | 20 +- blas/unit_test/Test_Blas1_nrm1.hpp | 16 +- blas/unit_test/Test_Blas1_nrm2.hpp | 16 +- blas/unit_test/Test_Blas1_nrm2_squared.hpp | 16 +- blas/unit_test/Test_Blas1_nrm2w.hpp | 16 +- blas/unit_test/Test_Blas1_nrm2w_squared.hpp | 16 +- blas/unit_test/Test_Blas1_nrminf.hpp | 16 +- blas/unit_test/Test_Blas1_reciprocal.hpp | 20 +- blas/unit_test/Test_Blas1_rot.hpp | 8 +- blas/unit_test/Test_Blas1_rotg.hpp | 8 +- blas/unit_test/Test_Blas1_rotm.hpp | 4 +- blas/unit_test/Test_Blas1_scal.hpp | 21 +- blas/unit_test/Test_Blas1_serial_setscal.hpp | 16 +- blas/unit_test/Test_Blas1_sum.hpp | 16 +- blas/unit_test/Test_Blas1_swap.hpp | 8 +- blas/unit_test/Test_Blas1_team_abs.hpp | 21 +- blas/unit_test/Test_Blas1_team_axpby.hpp | 20 +- blas/unit_test/Test_Blas1_team_axpy.hpp | 22 +- blas/unit_test/Test_Blas1_team_dot.hpp | 21 +- blas/unit_test/Test_Blas1_team_mult.hpp | 20 +- blas/unit_test/Test_Blas1_team_nrm2.hpp | 12 +- blas/unit_test/Test_Blas1_team_scal.hpp | 22 +- blas/unit_test/Test_Blas1_team_setscal.hpp | 16 +- blas/unit_test/Test_Blas1_team_update.hpp | 20 +- blas/unit_test/Test_Blas1_update.hpp | 20 +- blas/unit_test/Test_Blas2_gemv.hpp | 22 +- blas/unit_test/Test_Blas2_gemv_util.hpp | 7 +- blas/unit_test/Test_Blas2_ger.hpp | 14 +- blas/unit_test/Test_Blas2_syr.hpp | 12 +- blas/unit_test/Test_Blas3_gemm.hpp | 53 ++- blas/unit_test/Test_Blas3_trmm.hpp | 296 ++++++++-------- blas/unit_test/Test_Blas3_trsm.hpp | 332 +++++++++--------- blas/unit_test/Test_Blas_Newton.hpp | 4 +- blas/unit_test/Test_Blas_gesv.hpp | 34 +- blas/unit_test/Test_Blas_serial_axpy.hpp | 12 +- blas/unit_test/Test_Blas_serial_nrm2.hpp | 8 +- blas/unit_test/Test_Blas_trtri.hpp | 32 +- common/unit_test/Test_Common_ArithTraits.hpp | 2 +- common/unit_test/Test_Common_IOUtils.hpp | 2 +- common/unit_test/Test_Common_LowerBound.hpp | 10 +- .../Test_Common_PrintConfiguration.hpp | 2 +- common/unit_test/Test_Common_Sorting.hpp | 44 +-- common/unit_test/Test_Common_UpperBound.hpp | 10 +- .../unit_test/Test_Common_set_bit_count.hpp | 56 +-- graph/unit_test/Test_Graph_coarsen.hpp | 8 +- graph/unit_test/Test_Graph_graph_color.hpp | 8 +- .../Test_Graph_graph_color_deterministic.hpp | 8 +- .../Test_Graph_graph_color_distance2.hpp | 8 +- graph/unit_test/Test_Graph_mis2.hpp | 8 +- graph/unit_test/Test_Graph_rcm.hpp | 8 +- ode/unit_test/Test_ODE_Newton.hpp | 16 +- ode/unit_test/Test_ODE_RK.hpp | 6 +- ode/unit_test/Test_ODE_RK_chem.hpp | 2 +- sparse/unit_test/Test_Sparse_MergeMatrix.hpp | 42 +-- sparse/unit_test/Test_Sparse_SortCrs.hpp | 44 +-- .../Test_Sparse_TestUtils_RandCsMat.hpp | 6 +- sparse/unit_test/Test_Sparse_Transpose.hpp | 38 +- sparse/unit_test/Test_Sparse_ccs2crs.hpp | 24 +- sparse/unit_test/Test_Sparse_coo2crs.hpp | 22 +- sparse/unit_test/Test_Sparse_crs2ccs.hpp | 24 +- sparse/unit_test/Test_Sparse_crs2coo.hpp | 4 +- sparse/unit_test/Test_Sparse_csc2csr.hpp | 20 +- .../unit_test/Test_Sparse_findRelOffset.hpp | 4 +- .../Test_Sparse_removeCrsMatrixZeros.hpp | 13 +- sparse/unit_test/Test_Sparse_spmv.hpp | 20 +- sparse/unit_test/Test_Sparse_spmv_bsr.hpp | 6 +- sparse/unit_test/Test_Sparse_trsv.hpp | 4 +- .../Test_Common_Test_All_Type_Combos.hpp | 66 ++-- test_common/Test_Cuda.hpp | 4 +- test_common/Test_HIP.hpp | 2 +- test_common/Test_OpenMP.hpp | 2 +- test_common/Test_OpenMPTarget.hpp | 2 +- test_common/Test_SYCL.hpp | 2 +- test_common/Test_Serial.hpp | 2 +- test_common/Test_Threads.hpp | 2 +- 144 files changed, 1512 insertions(+), 1599 deletions(-) diff --git a/batched/dense/unit_test/Test_Batched_BatchedGemm_Complex.hpp b/batched/dense/unit_test/Test_Batched_BatchedGemm_Complex.hpp index a2b9edf1e6..3c58f432ec 100644 --- a/batched/dense/unit_test/Test_Batched_BatchedGemm_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_BatchedGemm_Complex.hpp @@ -20,32 +20,32 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_scomplex_scomplex_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm, - Kokkos::complex, param_tag_type>(); + test_batched_gemm, Kokkos::complex, + param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_scomplex_scomplex_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm, - Kokkos::complex, param_tag_type>(); + test_batched_gemm, Kokkos::complex, + param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_scomplex_scomplex_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm, - Kokkos::complex, param_tag_type>(); + test_batched_gemm, Kokkos::complex, + param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_scomplex_scomplex_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm, - Kokkos::complex, param_tag_type>(); + test_batched_gemm, Kokkos::complex, + param_tag_type>(); } /********************* BatchLayout::Right *********************/ TEST_F(TestCategory, @@ -54,32 +54,32 @@ TEST_F(TestCategory, BatchLayout::Right> param_tag_type; - test_batched_gemm, - Kokkos::complex, param_tag_type>(); + test_batched_gemm, Kokkos::complex, + param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_scomplex_scomplex_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm, - Kokkos::complex, param_tag_type>(); + test_batched_gemm, Kokkos::complex, + param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_scomplex_scomplex_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm, - Kokkos::complex, param_tag_type>(); + test_batched_gemm, Kokkos::complex, + param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_scomplex_scomplex_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm, - Kokkos::complex, param_tag_type>(); + test_batched_gemm, Kokkos::complex, + param_tag_type>(); } #endif @@ -90,7 +90,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_dcomplex_dcomplex_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_dcomplex_dcomplex_left) { @@ -98,7 +98,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_dcomplex_dcomplex_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_dcomplex_dcomplex_left) { @@ -106,7 +106,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_dcomplex_dcomplex_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_dcomplex_dcomplex_left) { @@ -114,7 +114,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_dcomplex_dcomplex_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type>(); } /********************* BatchLayout::Right *********************/ @@ -124,7 +124,7 @@ TEST_F(TestCategory, BatchLayout::Right> param_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_dcomplex_dcomplex_right) { @@ -132,7 +132,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_dcomplex_dcomplex_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_dcomplex_dcomplex_right) { @@ -140,7 +140,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_dcomplex_dcomplex_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type>(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_dcomplex_dcomplex_right) { @@ -148,7 +148,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_dcomplex_dcomplex_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_BatchedGemm_Real.hpp b/batched/dense/unit_test/Test_Batched_BatchedGemm_Real.hpp index 00561e0317..62a4a291a8 100644 --- a/batched/dense/unit_test/Test_Batched_BatchedGemm_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_BatchedGemm_Real.hpp @@ -25,7 +25,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_bhalf_bhalf_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_bhalf_bhalf_left) { @@ -33,7 +33,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_bhalf_bhalf_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_bhalf_bhalf_left) { @@ -41,7 +41,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_bhalf_bhalf_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_bhalf_bhalf_left) { @@ -49,7 +49,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_bhalf_bhalf_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm(); } /********************* BatchLayout::Right *********************/ @@ -58,7 +58,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_bhalf_bhalf_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_bhalf_bhalf_right) { @@ -66,7 +66,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_bhalf_bhalf_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_bhalf_bhalf_right) { @@ -74,7 +74,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_bhalf_bhalf_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_bhalf_bhalf_right) { @@ -82,7 +82,7 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_bhalf_bhalf_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm(); } #endif // KOKKOS_BHALF_T_IS_FLOAT @@ -98,32 +98,32 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_half_half_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_half_half_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_half_half_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_half_half_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } /********************* BatchLayout::Right *********************/ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_half_half_right) { @@ -131,32 +131,32 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_half_half_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_half_half_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_half_half_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_half_half_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } #endif // KOKKOS_HALF_T_IS_FLOAT @@ -167,28 +167,28 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_float_float_left) { BatchLayout::Left> param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_float_float_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_float_float_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_float_float_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } /********************* BatchLayout::Right *********************/ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_float_float_right) { @@ -196,28 +196,28 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_float_float_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_float_float_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_float_float_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_float_float_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } #endif @@ -228,28 +228,28 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_double_double_left) { ::Test::SharedParamTag; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_double_double_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_double_double_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_double_double_left) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } /********************* BatchLayout::Right *********************/ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_double_double_right) { @@ -257,27 +257,27 @@ TEST_F(TestCategory, batched_scalar_batched_gemm_nt_nt_double_double_right) { BatchLayout::Right> param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_nt_double_double_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_nt_t_double_double_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_batched_gemm_t_t_double_double_right) { typedef ::Test::SharedParamTag param_tag_type; - test_batched_gemm(); + test_batched_gemm(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialAxpy_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialAxpy_Complex.hpp index de677b1045..ed647f1e3b 100644 --- a/batched/dense/unit_test/Test_Batched_SerialAxpy_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialAxpy_Complex.hpp @@ -16,11 +16,11 @@ #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_axpy_nt_dcomplex_dcomplex) { - test_batched_axpy, + test_batched_axpy, Kokkos::complex>(); } TEST_F(TestCategory, batched_scalar_serial_axpy_nt_dcomplex_double) { - test_batched_axpy, double>(); + test_batched_axpy, double>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialAxpy_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialAxpy_Real.hpp index 078e4bfa8f..3f1f6af2fd 100644 --- a/batched/dense/unit_test/Test_Batched_SerialAxpy_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialAxpy_Real.hpp @@ -16,12 +16,12 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_serial_axpy_nt_float_float) { - test_batched_axpy(); + test_batched_axpy(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_axpy_nt_double_double) { - test_batched_axpy(); + test_batched_axpy(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialEigendecomposition_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialEigendecomposition_Real.hpp index 2e82468f8b..ad4b790717 100644 --- a/batched/dense/unit_test/Test_Batched_SerialEigendecomposition_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialEigendecomposition_Real.hpp @@ -16,13 +16,13 @@ /* #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F( TestCategory, batched_scalar_serial_eigendecomposition_float ) { - test_batched_serial_eigendecomposition(); + test_batched_serial_eigendecomposition(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F( TestCategory, batched_scalar_serial_eigendecomposition_double ) { - test_batched_serial_eigendecomposition(); + test_batched_serial_eigendecomposition(); } #endif */ diff --git a/batched/dense/unit_test/Test_Batched_SerialGemm_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialGemm_Complex.hpp index 01988c9e51..f671292c98 100644 --- a/batched/dense/unit_test/Test_Batched_SerialGemm_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialGemm_Complex.hpp @@ -21,39 +21,39 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_dcomplex_dcomplex) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_dcomplex_dcomplex) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_dcomplex_dcomplex) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_dcomplex_dcomplex) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm, + test_batched_gemm, Kokkos::complex, param_tag_type, algo_tag_type>(); } // TEST_F( TestCategory, batched_scalar_serial_gemm_ct_nt_dcomplex_dcomplex ) { // typedef ::Test::Gemm::ParamTag // param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; -// test_batched_gemm,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_gemm,Kokkos::complex,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_serial_gemm_nt_ct_dcomplex_dcomplex ) { // typedef ::Test::Gemm::ParamTag // param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; -// test_batched_gemm,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_gemm,Kokkos::complex,param_tag_type,algo_tag_type>(); // } /// dcomplex, double @@ -62,39 +62,39 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_dcomplex_double) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm, double, - param_tag_type, algo_tag_type>(); + test_batched_gemm, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_dcomplex_double) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm, double, - param_tag_type, algo_tag_type>(); + test_batched_gemm, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_dcomplex_double) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm, double, - param_tag_type, algo_tag_type>(); + test_batched_gemm, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_dcomplex_double) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm, double, - param_tag_type, algo_tag_type>(); + test_batched_gemm, double, param_tag_type, + algo_tag_type>(); } // TEST_F( TestCategory, batched_scalar_serial_gemm_ct_nt_dcomplex_double ) { // typedef ::Test::Gemm::ParamTag // param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; -// test_batched_gemm,double,param_tag_type,algo_tag_type>(); +// test_batched_gemm,double,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_serial_gemm_nt_ct_dcomplex_double ) { // typedef ::Test::Gemm::ParamTag // param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; -// test_batched_gemm,double,param_tag_type,algo_tag_type>(); +// test_batched_gemm,double,param_tag_type,algo_tag_type>(); // } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialGemm_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialGemm_Real.hpp index c32556c229..6f074867d9 100644 --- a/batched/dense/unit_test/Test_Batched_SerialGemm_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialGemm_Real.hpp @@ -18,10 +18,10 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_bhalf_bhalf) { typedef ::Test::Gemm::ParamTag param_tag_type; - test_batched_gemm(); - test_batched_gemm(); } @@ -29,10 +29,10 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_bhalf_bhalf) { typedef ::Test::Gemm::ParamTag param_tag_type; - test_batched_gemm(); - test_batched_gemm(); } @@ -40,10 +40,10 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_bhalf_bhalf) { typedef ::Test::Gemm::ParamTag param_tag_type; - test_batched_gemm(); - test_batched_gemm(); } @@ -51,10 +51,10 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_bhalf_bhalf) { typedef ::Test::Gemm::ParamTag param_tag_type; - test_batched_gemm(); - test_batched_gemm(); } @@ -65,45 +65,37 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_half_half) { typedef ::Test::Gemm::ParamTag param_tag_type; - test_batched_gemm(); - test_batched_gemm(); + test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_half_half) { typedef ::Test::Gemm::ParamTag param_tag_type; - test_batched_gemm(); - test_batched_gemm(); + test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_half_half) { typedef ::Test::Gemm::ParamTag param_tag_type; - test_batched_gemm(); - test_batched_gemm(); + test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_half_half) { typedef ::Test::Gemm::ParamTag param_tag_type; - test_batched_gemm(); - test_batched_gemm(); + test_batched_gemm(); + test_batched_gemm(); } #endif // KOKKOS_HALF_T_IS_FLOAT @@ -112,29 +104,25 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_float_float) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_float_float) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_float_float) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm(); + test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_float_float) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm(); + test_batched_gemm(); } #endif @@ -143,28 +131,28 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_double_double) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_double_double) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_double_double) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm(); } TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_double_double) { typedef ::Test::Gemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_gemm(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialGesv_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialGesv_Real.hpp index 2b2493506e..00161ecb70 100644 --- a/batched/dense/unit_test/Test_Batched_SerialGesv_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialGesv_Real.hpp @@ -15,20 +15,18 @@ //@HEADER #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_serial_gesv_static_pivoting_float) { - test_batched_gesv(); + test_batched_gesv(); } TEST_F(TestCategory, batched_scalar_serial_gesv_no_pivoting_float) { - test_batched_gesv(); + test_batched_gesv(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_gesv_static_pivoting_double) { - test_batched_gesv(); + test_batched_gesv(); } TEST_F(TestCategory, batched_scalar_serial_gesv_no_pivoting_double) { - test_batched_gesv(); + test_batched_gesv(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialInverseLU_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialInverseLU_Complex.hpp index 0be3375715..243ed21908 100644 --- a/batched/dense/unit_test/Test_Batched_SerialInverseLU_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialInverseLU_Complex.hpp @@ -18,11 +18,11 @@ TEST_F(TestCategory, batched_scalar_serial_inverselu_dcomplex) { // printf("Batched serial inverse LU - double complex - algorithm type: // Unblocked\n"); - test_batched_inverselu, + test_batched_inverselu, Algo::InverseLU::Unblocked>(); // printf("Batched serial inverse LU - double complex - algorithm type: // Blocked\n"); - test_batched_inverselu, + test_batched_inverselu, Algo::InverseLU::Blocked>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialInverseLU_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialInverseLU_Real.hpp index 7eea2c9627..143db37b0c 100644 --- a/batched/dense/unit_test/Test_Batched_SerialInverseLU_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialInverseLU_Real.hpp @@ -17,17 +17,17 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_serial_inverselu_float) { // printf("Batched serial inverse LU - float - algorithm type: Unblocked\n"); - test_batched_inverselu(); + test_batched_inverselu(); // printf("Batched serial inverse LU - float - algorithm type: Blocked\n"); - test_batched_inverselu(); + test_batched_inverselu(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_inverselu_double) { // printf("Batched serial inverse LU - double - algorithm type: Unblocked\n"); - test_batched_inverselu(); + test_batched_inverselu(); // printf("Batched serial inverse LU - double - algorithm type: Blocked\n"); - test_batched_inverselu(); + test_batched_inverselu(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialLU_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialLU_Complex.hpp index 29936b7825..b07bece091 100644 --- a/batched/dense/unit_test/Test_Batched_SerialLU_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialLU_Complex.hpp @@ -17,6 +17,6 @@ #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_lu_dcomplex) { typedef Algo::LU::Blocked algo_tag_type; - test_batched_lu, algo_tag_type>(); + test_batched_lu, algo_tag_type>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialLU_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialLU_Real.hpp index a185e3b520..ace508fab2 100644 --- a/batched/dense/unit_test/Test_Batched_SerialLU_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialLU_Real.hpp @@ -17,13 +17,13 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_serial_lu_float) { typedef Algo::LU::Blocked algo_tag_type; - test_batched_lu(); + test_batched_lu(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_lu_double) { typedef Algo::LU::Blocked algo_tag_type; - test_batched_lu(); + test_batched_lu(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialSVD.hpp b/batched/dense/unit_test/Test_Batched_SerialSVD.hpp index fb56e25894..099fa9219f 100644 --- a/batched/dense/unit_test/Test_Batched_SerialSVD.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialSVD.hpp @@ -456,19 +456,19 @@ void testIssue1786() { #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_svd_double) { // Test general SVD on a few different input sizes (full rank randomized) - testSVD(); - testSVD(); - testIssue1786(); - testIssue1786(); + testSVD(); + testSVD(); + testIssue1786(); + testIssue1786(); } #endif #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_serial_svd_float) { // Test general SVD on a few different input sizes (full rank randomized) - testSVD(); - testSVD(); - testIssue1786(); - testIssue1786(); + testSVD(); + testSVD(); + testIssue1786(); + testIssue1786(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialSolveLU_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialSolveLU_Complex.hpp index b0977189a4..6eaf9ca5aa 100644 --- a/batched/dense/unit_test/Test_Batched_SerialSolveLU_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialSolveLU_Complex.hpp @@ -18,11 +18,11 @@ TEST_F(TestCategory, batched_scalar_serial_solvelu_dcomplex) { // printf("Batched serial solveLU - double complex - algorithm type: // Unblocked\n"); - test_batched_solvelu, + test_batched_solvelu, Algo::SolveLU::Unblocked>(); // printf("Batched serial solveLU - double complex - algorithm type: // Blocked\n"); - test_batched_solvelu, + test_batched_solvelu, Algo::SolveLU::Blocked>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialSolveLU_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialSolveLU_Real.hpp index f586e3b62c..37d768df98 100644 --- a/batched/dense/unit_test/Test_Batched_SerialSolveLU_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialSolveLU_Real.hpp @@ -17,17 +17,17 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_serial_solvelu_float) { // printf("Batched serial solveLU - float - algorithm type: Unblocked\n"); - test_batched_solvelu(); + test_batched_solvelu(); // printf("Batched serial solveLU - float - algorithm type: Blocked\n"); - test_batched_solvelu(); + test_batched_solvelu(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_solvelu_double) { // printf("Batched serial solveLU - double - algorithm type: Unblocked\n"); - test_batched_solvelu(); + test_batched_solvelu(); // printf("Batched serial solveLU - double - algorithm type: Blocked\n"); - test_batched_solvelu(); + test_batched_solvelu(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialTrmm_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialTrmm_Complex.hpp index 5718a81694..8ab6e2810c 100644 --- a/batched/dense/unit_test/Test_Batched_SerialTrmm_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialTrmm_Complex.hpp @@ -22,8 +22,8 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_u_scomplex_scomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_u_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_u_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } // TRANSPOSE TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_u_scomplex_scomplex) { @@ -77,8 +77,8 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_u_scomplex_scomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_u_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_u_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } // CONJUGATE TRANSPOSE TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_u_scomplex_scomplex) { @@ -132,8 +132,8 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_u_scomplex_scomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_u_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_u_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_n_scomplex_scomplex) { typedef ::Test::Trmm::ParamTag, - Kokkos::complex, param_tag_type, algo_tag_type>(128); + test_batched_trmm, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } #endif @@ -190,7 +190,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -200,7 +200,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -210,7 +210,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -220,7 +220,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -230,7 +230,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -240,7 +240,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -251,7 +251,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -261,7 +261,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -271,7 +271,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -281,7 +281,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -291,7 +291,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -301,7 +301,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -312,7 +312,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -322,7 +322,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -332,7 +332,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -342,7 +342,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -352,7 +352,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_u_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -362,7 +362,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_n_dcomplex_dcomplex) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm, + test_batched_trmm, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } diff --git a/batched/dense/unit_test/Test_Batched_SerialTrmm_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialTrmm_Real.hpp index c01ae8dbea..1cfc259dd3 100644 --- a/batched/dense/unit_test/Test_Batched_SerialTrmm_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialTrmm_Real.hpp @@ -22,8 +22,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_u_float_float) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_u_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_u_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } // TRANSPOSE TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_u_float_float) { @@ -77,8 +71,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_u_float_float) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_u_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_u_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } // CONJUGATE TRANSPOSE TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_u_float_float) { @@ -132,8 +120,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_u_float_float) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_u_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_u_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_n_float_float) { typedef ::Test::Trmm::ParamTag(); + test_batched_trmm(); } #endif @@ -190,7 +172,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_n_double_double) { @@ -199,7 +181,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_nt_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_u_double_double) { @@ -208,7 +190,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_n_double_double) { @@ -217,7 +199,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_nt_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_u_double_double) { @@ -226,7 +208,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_n_double_double) { @@ -235,7 +217,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_nt_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } // TRANSPOSE @@ -245,7 +227,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_n_double_double) { @@ -254,7 +236,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_t_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_u_double_double) { @@ -263,7 +245,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_n_double_double) { @@ -272,7 +254,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_t_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_u_double_double) { @@ -281,7 +263,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_n_double_double) { @@ -290,7 +272,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_t_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } // CONJUGATE TRANSPOSE @@ -300,7 +282,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_n_double_double) { @@ -309,7 +291,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_l_ct_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_u_double_double) { @@ -318,7 +300,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_n_double_double) { @@ -327,7 +309,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_l_u_ct_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_u_double_double) { @@ -336,7 +318,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_u_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_n_double_double) { @@ -345,7 +327,7 @@ TEST_F(TestCategory, batched_scalar_serial_trmm_r_u_ct_n_double_double) { param_tag_type; typedef Algo::Trmm::Unblocked algo_tag_type; - test_batched_trmm(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialTrsm_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialTrsm_Complex.hpp index d7c52ccd77..be0005a74c 100644 --- a/batched/dense/unit_test/Test_Batched_SerialTrsm_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialTrsm_Complex.hpp @@ -20,7 +20,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_u_dcomplex_dcomplex) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, + test_batched_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_n_dcomplex_dcomplex) { @@ -28,7 +28,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_n_dcomplex_dcomplex) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, + test_batched_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_u_dcomplex_dcomplex) { @@ -36,7 +36,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_u_dcomplex_dcomplex) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, + test_batched_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } // TEST_F( TestCategory, batched_scalar_serial_trsm_l_u_nt_n_dcomplex_dcomplex ) @@ -44,14 +44,14 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_u_dcomplex_dcomplex) { // typedef // ::Test::Trmm::ParamTag // param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; -// test_batched_trsm,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_trsm,Kokkos::complex,param_tag_type,algo_tag_type>(); // } TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_u_dcomplex_dcomplex) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, + test_batched_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_n_dcomplex_dcomplex) { @@ -59,7 +59,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_n_dcomplex_dcomplex) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, + test_batched_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } // @@ -68,7 +68,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_u_dcomplex_dcomplex) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, + test_batched_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_n_dcomplex_dcomplex) { @@ -76,7 +76,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_n_dcomplex_dcomplex) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, + test_batched_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_u_dcomplex_dcomplex) { @@ -84,7 +84,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_u_dcomplex_dcomplex) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, + test_batched_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } // TEST_F( TestCategory, batched_scalar_serial_trsm_l_u_t_n_dcomplex_dcomplex ) @@ -92,7 +92,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_u_dcomplex_dcomplex) { // typedef // ::Test::Trmm::ParamTag // param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; -// test_batched_trsm,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_trsm,Kokkos::complex,param_tag_type,algo_tag_type>(); // } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_u_dcomplex_double) { @@ -100,46 +100,46 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_u_dcomplex_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, double, - param_tag_type, algo_tag_type>(); + test_batched_trsm, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_n_dcomplex_double) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, double, - param_tag_type, algo_tag_type>(); + test_batched_trsm, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_u_dcomplex_double) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, double, - param_tag_type, algo_tag_type>(); + test_batched_trsm, double, param_tag_type, + algo_tag_type>(); } // TEST_F( TestCategory, batched_scalar_serial_trsm_l_u_nt_n_dcomplex_double ) { // typedef // ::Test::Trmm::ParamTag // param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; -// test_batched_trsm,double,param_tag_type,algo_tag_type>(); +// test_batched_trsm,double,param_tag_type,algo_tag_type>(); // } TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_u_dcomplex_double) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, double, - param_tag_type, algo_tag_type>(); + test_batched_trsm, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_n_dcomplex_double) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, double, - param_tag_type, algo_tag_type>(); + test_batched_trsm, double, param_tag_type, + algo_tag_type>(); } // TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_u_dcomplex_double) { @@ -147,29 +147,29 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_u_dcomplex_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, double, - param_tag_type, algo_tag_type>(); + test_batched_trsm, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_n_dcomplex_double) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, double, - param_tag_type, algo_tag_type>(); + test_batched_trsm, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_u_dcomplex_double) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm, double, - param_tag_type, algo_tag_type>(); + test_batched_trsm, double, param_tag_type, + algo_tag_type>(); } // TEST_F( TestCategory, batched_scalar_serial_trsm_l_u_t_n_dcomplex_double ) { // typedef // ::Test::Trmm::ParamTag // param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; -// test_batched_trsm,double,param_tag_type,algo_tag_type>(); +// test_batched_trsm,double,param_tag_type,algo_tag_type>(); // } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialTrsm_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialTrsm_Real.hpp index c308071145..18b10a81e6 100644 --- a/batched/dense/unit_test/Test_Batched_SerialTrsm_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialTrsm_Real.hpp @@ -20,48 +20,42 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_u_float_float) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_n_float_float) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_u_float_float) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_n_float_float) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_u_float_float) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_n_float_float) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } // TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_u_float_float) { @@ -69,32 +63,28 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_u_float_float) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_n_float_float) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_u_float_float) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_n_float_float) { typedef ::Test::Trmm::ParamTag param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); + test_batched_trsm(); } #endif @@ -104,7 +94,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_u_double_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_n_double_double) { @@ -112,7 +102,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_nt_n_double_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_u_double_double) { @@ -120,7 +110,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_u_double_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_n_double_double) { @@ -128,7 +118,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_nt_n_double_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_u_double_double) { @@ -136,7 +126,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_u_double_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_n_double_double) { @@ -144,7 +134,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_r_u_nt_n_double_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } // @@ -153,7 +143,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_u_double_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_n_double_double) { @@ -161,7 +151,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_l_t_n_double_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_u_double_double) { @@ -169,7 +159,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_u_double_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_n_double_double) { @@ -177,7 +167,7 @@ TEST_F(TestCategory, batched_scalar_serial_trsm_l_u_t_n_double_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_trsm(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialTrsv_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialTrsv_Complex.hpp index 1af71e7104..a524b9f97e 100644 --- a/batched/dense/unit_test/Test_Batched_SerialTrsv_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialTrsv_Complex.hpp @@ -19,28 +19,28 @@ TEST_F(TestCategory, batched_scalar_serial_trsv_l_nt_u_dcomplex_dcomplex) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv, + test_batched_trsv, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsv_l_nt_n_dcomplex_dcomplex) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv, + test_batched_trsv, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsv_u_nt_u_dcomplex_dcomplex) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv, + test_batched_trsv, Kokkos::complex, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsv_u_nt_n_dcomplex_dcomplex) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv, + test_batched_trsv, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -48,28 +48,28 @@ TEST_F(TestCategory, batched_scalar_serial_trsv_l_nt_u_dcomplex_double) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv, double, - param_tag_type, algo_tag_type>(); + test_batched_trsv, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsv_l_nt_n_dcomplex_double) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv, double, - param_tag_type, algo_tag_type>(); + test_batched_trsv, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsv_u_nt_u_dcomplex_double) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv, double, - param_tag_type, algo_tag_type>(); + test_batched_trsv, double, param_tag_type, + algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_serial_trsv_u_nt_n_dcomplex_double) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv, double, - param_tag_type, algo_tag_type>(); + test_batched_trsv, double, param_tag_type, + algo_tag_type>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialTrsv_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialTrsv_Real.hpp index 71eb62b559..be1bf77b9e 100644 --- a/batched/dense/unit_test/Test_Batched_SerialTrsv_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialTrsv_Real.hpp @@ -19,29 +19,25 @@ TEST_F(TestCategory, batched_scalar_serial_trsv_l_nt_u_float_float) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv(); + test_batched_trsv(); } TEST_F(TestCategory, batched_scalar_serial_trsv_l_nt_n_float_float) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv(); + test_batched_trsv(); } TEST_F(TestCategory, batched_scalar_serial_trsv_u_nt_u_float_float) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv(); + test_batched_trsv(); } TEST_F(TestCategory, batched_scalar_serial_trsv_u_nt_n_float_float) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv(); + test_batched_trsv(); } #endif @@ -50,28 +46,28 @@ TEST_F(TestCategory, batched_scalar_serial_trsv_l_nt_u_double_double) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv(); } TEST_F(TestCategory, batched_scalar_serial_trsv_l_nt_n_double_double) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv(); } TEST_F(TestCategory, batched_scalar_serial_trsv_u_nt_u_double_double) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv(); } TEST_F(TestCategory, batched_scalar_serial_trsv_u_nt_n_double_double) { typedef ::Test::Trsv::ParamTag param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; - test_batched_trsv(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_SerialTrtri_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialTrtri_Complex.hpp index db9d06ec06..0d8f2c72a6 100644 --- a/batched/dense/unit_test/Test_Batched_SerialTrtri_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialTrtri_Complex.hpp @@ -20,33 +20,29 @@ TEST_F(TestCategory, batched_scalar_serial_trtri_u_n_scomplex_scomplex) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri, - Kokkos::complex, param_tag_type, algo_tag_type>( - 128); + test_batched_trtri, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trtri_u_u_scomplex_scomplex) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri, - Kokkos::complex, param_tag_type, algo_tag_type>( - 128); + test_batched_trtri, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trtri_l_n_scomplex_scomplex) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri, - Kokkos::complex, param_tag_type, algo_tag_type>( - 128); + test_batched_trtri, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } TEST_F(TestCategory, batched_scalar_serial_trtri_l_u_scomplex_scomplex) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri, - Kokkos::complex, param_tag_type, algo_tag_type>( - 128); + test_batched_trtri, Kokkos::complex, + param_tag_type, algo_tag_type>(128); } #endif @@ -56,7 +52,7 @@ TEST_F(TestCategory, batched_scalar_serial_trtri_u_n_dcomplex_dcomplex) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri, + test_batched_trtri, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -64,7 +60,7 @@ TEST_F(TestCategory, batched_scalar_serial_trtri_u_u_dcomplex_dcomplex) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri, + test_batched_trtri, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -72,7 +68,7 @@ TEST_F(TestCategory, batched_scalar_serial_trtri_l_n_dcomplex_dcomplex) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri, + test_batched_trtri, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } @@ -80,7 +76,7 @@ TEST_F(TestCategory, batched_scalar_serial_trtri_l_u_dcomplex_dcomplex) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri, + test_batched_trtri, Kokkos::complex, param_tag_type, algo_tag_type>( 128); } diff --git a/batched/dense/unit_test/Test_Batched_SerialTrtri_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialTrtri_Real.hpp index 48617506de..952994d207 100644 --- a/batched/dense/unit_test/Test_Batched_SerialTrtri_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_SerialTrtri_Real.hpp @@ -20,29 +20,25 @@ TEST_F(TestCategory, batched_scalar_serial_trtri_u_n_float_float) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri(); + test_batched_trtri(); } TEST_F(TestCategory, batched_scalar_serial_trtri_u_u_float_float) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri(); + test_batched_trtri(); } TEST_F(TestCategory, batched_scalar_serial_trtri_l_n_float_float) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri(); + test_batched_trtri(); } TEST_F(TestCategory, batched_scalar_serial_trtri_l_u_float_float) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri(); + test_batched_trtri(); } #endif @@ -52,28 +48,28 @@ TEST_F(TestCategory, batched_scalar_serial_trtri_u_n_double_double) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri(); } TEST_F(TestCategory, batched_scalar_serial_trtri_u_u_double_double) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri(); } TEST_F(TestCategory, batched_scalar_serial_trtri_l_n_double_double) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri(); } TEST_F(TestCategory, batched_scalar_serial_trtri_l_u_double_double) { typedef ::Test::Trtri::ParamTag param_tag_type; typedef Algo::Trtri::Unblocked algo_tag_type; - test_batched_trtri(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamAxpy_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamAxpy_Complex.hpp index 79c25ba9dc..b95b769fcc 100644 --- a/batched/dense/unit_test/Test_Batched_TeamAxpy_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamAxpy_Complex.hpp @@ -16,11 +16,11 @@ #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, batched_scalar_team_axpy_nt_dcomplex_dcomplex) { - test_batched_team_axpy, + test_batched_team_axpy, Kokkos::complex>(); } TEST_F(TestCategory, batched_scalar_team_axpy_nt_dcomplex_double) { - test_batched_team_axpy, double>(); + test_batched_team_axpy, double>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamAxpy_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamAxpy_Real.hpp index 967bfa8e46..ac458d4a55 100644 --- a/batched/dense/unit_test/Test_Batched_TeamAxpy_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamAxpy_Real.hpp @@ -16,12 +16,12 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_team_axpy_nt_float_float) { - test_batched_team_axpy(); + test_batched_team_axpy(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_team_axpy_nt_double_double) { - test_batched_team_axpy(); + test_batched_team_axpy(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamGemm_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamGemm_Complex.hpp index ebe22e6e1d..09c7f3f2cc 100644 --- a/batched/dense/unit_test/Test_Batched_TeamGemm_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamGemm_Complex.hpp @@ -22,7 +22,7 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_nt_dcomplex_dcomplex) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm, + test_batched_teamgemm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -30,7 +30,7 @@ TEST_F(TestCategory, batched_scalar_team_gemm_t_nt_dcomplex_dcomplex) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm, + test_batched_teamgemm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -38,7 +38,7 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_t_dcomplex_dcomplex) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm, + test_batched_teamgemm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -46,19 +46,19 @@ TEST_F(TestCategory, batched_scalar_team_gemm_t_t_dcomplex_dcomplex) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm, + test_batched_teamgemm, Kokkos::complex, param_tag_type, algo_tag_type>(); } // TEST_F( TestCategory, batched_scalar_team_gemm_ct_nt_dcomplex_dcomplex ) { // typedef ::Test::TeamGemm::ParamTag // param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; -// test_batched_teamgemm,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_teamgemm,Kokkos::complex,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_gemm_nt_ct_dcomplex_dcomplex ) { // typedef ::Test::TeamGemm::ParamTag // param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; -// test_batched_teamgemm,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_teamgemm,Kokkos::complex,param_tag_type,algo_tag_type>(); // } /// dcomplex, double @@ -67,39 +67,39 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_nt_dcomplex_double) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm, double, + test_batched_teamgemm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_gemm_t_nt_dcomplex_double) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm, double, + test_batched_teamgemm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_gemm_nt_t_dcomplex_double) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm, double, + test_batched_teamgemm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_gemm_t_t_dcomplex_double) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm, double, + test_batched_teamgemm, double, param_tag_type, algo_tag_type>(); } // TEST_F( TestCategory, batched_scalar_team_gemm_ct_nt_dcomplex_double ) { // typedef ::Test::TeamGemm::ParamTag // param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; -// test_batched_teamgemm,double,param_tag_type,algo_tag_type>(); +// test_batched_teamgemm,double,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_gemm_nt_ct_dcomplex_double ) { // typedef ::Test::TeamGemm::ParamTag // param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; -// test_batched_teamgemm,double,param_tag_type,algo_tag_type>(); +// test_batched_teamgemm,double,param_tag_type,algo_tag_type>(); // } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamGemm_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamGemm_Real.hpp index f109fa4bf9..b1a5135018 100644 --- a/batched/dense/unit_test/Test_Batched_TeamGemm_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamGemm_Real.hpp @@ -18,10 +18,10 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_nt_bhalf_bhalf) { typedef ::Test::TeamGemm::ParamTag param_tag_type; - test_batched_teamgemm(); - test_batched_teamgemm(); } @@ -29,10 +29,10 @@ TEST_F(TestCategory, batched_scalar_team_gemm_t_nt_bhalf_bhalf) { typedef ::Test::TeamGemm::ParamTag param_tag_type; - test_batched_teamgemm(); - test_batched_teamgemm(); } @@ -40,10 +40,10 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_t_bhalf_bhalf) { typedef ::Test::TeamGemm::ParamTag param_tag_type; - test_batched_teamgemm(); - test_batched_teamgemm(); } @@ -51,10 +51,10 @@ TEST_F(TestCategory, batched_scalar_team_gemm_t_t_bhalf_bhalf) { typedef ::Test::TeamGemm::ParamTag param_tag_type; - test_batched_teamgemm(); - test_batched_teamgemm(); } @@ -65,10 +65,10 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_nt_half_half) { typedef ::Test::TeamGemm::ParamTag param_tag_type; - test_batched_teamgemm(); - test_batched_teamgemm(); } @@ -76,10 +76,10 @@ TEST_F(TestCategory, batched_scalar_team_gemm_t_nt_half_half) { typedef ::Test::TeamGemm::ParamTag param_tag_type; - test_batched_teamgemm(); - test_batched_teamgemm(); } @@ -87,10 +87,10 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_t_half_half) { typedef ::Test::TeamGemm::ParamTag param_tag_type; - test_batched_teamgemm(); - test_batched_teamgemm(); } @@ -98,10 +98,10 @@ TEST_F(TestCategory, batched_scalar_team_gemm_t_t_half_half) { typedef ::Test::TeamGemm::ParamTag param_tag_type; - test_batched_teamgemm(); - test_batched_teamgemm(); } @@ -112,28 +112,28 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_nt_float_float) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm(); } TEST_F(TestCategory, batched_scalar_team_gemm_t_nt_float_float) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm(); } TEST_F(TestCategory, batched_scalar_team_gemm_nt_t_float_float) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm(); } TEST_F(TestCategory, batched_scalar_team_gemm_t_t_float_float) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm(); } #endif @@ -143,28 +143,28 @@ TEST_F(TestCategory, batched_scalar_team_gemm_nt_nt_double_double) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm(); } TEST_F(TestCategory, batched_scalar_team_gemm_t_nt_double_double) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm(); } TEST_F(TestCategory, batched_scalar_team_gemm_nt_t_double_double) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm(); } TEST_F(TestCategory, batched_scalar_team_gemm_t_t_double_double) { typedef ::Test::TeamGemm::ParamTag param_tag_type; typedef Algo::Gemm::Blocked algo_tag_type; - test_batched_teamgemm(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamGesv_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamGesv_Real.hpp index 10d1be9c38..d0b04ea57c 100644 --- a/batched/dense/unit_test/Test_Batched_TeamGesv_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamGesv_Real.hpp @@ -15,22 +15,20 @@ //@HEADER #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_team_gesv_static_pivoting_float) { - test_batched_team_gesv(); } TEST_F(TestCategory, batched_scalar_team_gesv_no_pivoting_float) { - test_batched_team_gesv(); + test_batched_team_gesv(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_team_gesv_static_pivoting_double) { - test_batched_team_gesv(); } TEST_F(TestCategory, batched_scalar_team_gesv_no_pivoting_double) { - test_batched_team_gesv(); + test_batched_team_gesv(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamInverseLU_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamInverseLU_Complex.hpp index 97afe2c1ad..7eb918beef 100644 --- a/batched/dense/unit_test/Test_Batched_TeamInverseLU_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamInverseLU_Complex.hpp @@ -18,11 +18,11 @@ TEST_F(TestCategory, batched_scalar_team_inverselu_dcomplex) { // printf("Batched team inverse LU - double complex - algorithm type: // Unblocked\n"); - test_batched_inverselu, + test_batched_inverselu, Algo::InverseLU::Unblocked>(); // printf("Batched team inverse LU - double complex - algorithm type: // Blocked\n"); - test_batched_inverselu, + test_batched_inverselu, Algo::InverseLU::Blocked>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamInverseLU_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamInverseLU_Real.hpp index 74c7efd25b..3939fdd13a 100644 --- a/batched/dense/unit_test/Test_Batched_TeamInverseLU_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamInverseLU_Real.hpp @@ -17,17 +17,17 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_team_inverselu_float) { // printf("Batched team inverse LU - float - algorithm type: Unblocked\n"); - test_batched_inverselu(); + test_batched_inverselu(); // printf("Batched team inverse LU - float - algorithm type: Blocked\n"); - test_batched_inverselu(); + test_batched_inverselu(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_team_inverselu_double) { // printf("Batched team inverse LU - double - algorithm type: Unblocked\n"); - test_batched_inverselu(); + test_batched_inverselu(); // printf("Batched team inverse LU - double - algorithm type: Blocked\n"); - test_batched_inverselu(); + test_batched_inverselu(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamLU_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamLU_Complex.hpp index e05b521f8c..2c422397e7 100644 --- a/batched/dense/unit_test/Test_Batched_TeamLU_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamLU_Complex.hpp @@ -17,6 +17,6 @@ #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, batched_scalar_team_lu_dcomplex) { typedef Algo::LU::Blocked algo_tag_type; - test_batched_lu, algo_tag_type>(); + test_batched_lu, algo_tag_type>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamLU_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamLU_Real.hpp index 5e7f05277e..5babaf996c 100644 --- a/batched/dense/unit_test/Test_Batched_TeamLU_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamLU_Real.hpp @@ -17,13 +17,13 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_team_lu_float) { typedef Algo::LU::Blocked algo_tag_type; - test_batched_lu(); + test_batched_lu(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_team_lu_double) { typedef Algo::LU::Blocked algo_tag_type; - test_batched_lu(); + test_batched_lu(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamSolveLU_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamSolveLU_Complex.hpp index 4076fd5c31..865f58ef43 100644 --- a/batched/dense/unit_test/Test_Batched_TeamSolveLU_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamSolveLU_Complex.hpp @@ -18,11 +18,11 @@ TEST_F(TestCategory, batched_scalar_team_solvelu_dcomplex) { // printf("Batched team solveLU - double complex - algorithm type: // Unblocked\n"); - test_batched_team_solvelu, + test_batched_team_solvelu, Algo::SolveLU::Unblocked>(); // printf("Batched team solveLU - double complex - algorithm type: // Blocked\n"); - test_batched_team_solvelu, + test_batched_team_solvelu, Algo::SolveLU::Blocked>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamSolveLU_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamSolveLU_Real.hpp index 4882caabe8..73c55e8a93 100644 --- a/batched/dense/unit_test/Test_Batched_TeamSolveLU_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamSolveLU_Real.hpp @@ -17,17 +17,17 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_team_solvelu_float) { // printf("Batched team solveLU - float - algorithm type: Unblocked\n"); - test_batched_team_solvelu(); + test_batched_team_solvelu(); // printf("Batched team solveLU - float - algorithm type: Blocked\n"); - test_batched_team_solvelu(); + test_batched_team_solvelu(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_team_solvelu_double) { // printf("Batched team solveLU - double - algorithm type: Unblocked\n"); - test_batched_team_solvelu(); + test_batched_team_solvelu(); // printf("Batched team solveLU - double - algorithm type: Blocked\n"); - test_batched_team_solvelu(); + test_batched_team_solvelu(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamTrsm_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamTrsm_Complex.hpp index 7648017287..0cf2761922 100644 --- a/batched/dense/unit_test/Test_Batched_TeamTrsm_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamTrsm_Complex.hpp @@ -20,7 +20,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_u_dcomplex_dcomplex) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -29,7 +29,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_n_dcomplex_dcomplex) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -38,7 +38,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_u_dcomplex_dcomplex) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -47,7 +47,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_n_dcomplex_dcomplex) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -56,7 +56,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_u_dcomplex_dcomplex) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -65,7 +65,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_n_dcomplex_dcomplex) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -75,7 +75,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_u_dcomplex_dcomplex) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -84,7 +84,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_n_dcomplex_dcomplex) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -93,7 +93,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_u_dcomplex_dcomplex) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -102,7 +102,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_n_dcomplex_dcomplex) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, + test_batched_team_trsm, Kokkos::complex, param_tag_type, algo_tag_type>(); } @@ -112,7 +112,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_u_dcomplex_double) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_n_dcomplex_double) { @@ -120,7 +120,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_n_dcomplex_double) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_u_dcomplex_double) { @@ -128,7 +128,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_u_dcomplex_double) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_n_dcomplex_double) { @@ -136,7 +136,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_n_dcomplex_double) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_u_dcomplex_double) { @@ -144,7 +144,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_u_dcomplex_double) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_n_dcomplex_double) { @@ -152,7 +152,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_n_dcomplex_double) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } // @@ -161,7 +161,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_u_dcomplex_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_n_dcomplex_double) { @@ -169,7 +169,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_n_dcomplex_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_u_dcomplex_double) { @@ -177,7 +177,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_u_dcomplex_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_n_dcomplex_double) { @@ -185,7 +185,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_n_dcomplex_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm, double, + test_batched_team_trsm, double, param_tag_type, algo_tag_type>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamTrsm_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamTrsm_Real.hpp index d705b42a50..6757617ddd 100644 --- a/batched/dense/unit_test/Test_Batched_TeamTrsm_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamTrsm_Real.hpp @@ -20,7 +20,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_u_float_float) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_n_float_float) { @@ -28,7 +28,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_n_float_float) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_u_float_float) { @@ -36,7 +36,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_u_float_float) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_n_float_float) { @@ -44,7 +44,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_n_float_float) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_u_float_float) { @@ -52,7 +52,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_u_float_float) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_n_float_float) { @@ -60,7 +60,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_n_float_float) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } // @@ -69,7 +69,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_u_float_float) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_n_float_float) { @@ -77,7 +77,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_n_float_float) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_u_float_float) { @@ -85,7 +85,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_u_float_float) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_n_float_float) { @@ -93,7 +93,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_n_float_float) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } #endif @@ -104,7 +104,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_u_double_double) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_n_double_double) { @@ -112,7 +112,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_nt_n_double_double) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_u_double_double) { @@ -120,7 +120,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_u_double_double) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_n_double_double) { @@ -128,7 +128,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_nt_n_double_double) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_u_double_double) { @@ -136,7 +136,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_u_double_double) { Trans::NoTranspose, Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_n_double_double) { @@ -144,7 +144,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_r_u_nt_n_double_double) { Trans::NoTranspose, Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } // @@ -153,7 +153,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_u_double_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_n_double_double) { @@ -161,7 +161,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_l_t_n_double_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_u_double_double) { @@ -169,7 +169,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_u_double_double) { Diag::Unit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_n_double_double) { @@ -177,7 +177,7 @@ TEST_F(TestCategory, batched_scalar_team_trsm_l_u_t_n_double_double) { Diag::NonUnit> param_tag_type; typedef Algo::Trsm::Blocked algo_tag_type; - test_batched_team_trsm(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamTrsv_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamTrsv_Complex.hpp index d01e4b7f94..304e929462 100644 --- a/batched/dense/unit_test/Test_Batched_TeamTrsv_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamTrsv_Complex.hpp @@ -19,49 +19,49 @@ // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_team_trsv,Kokkos::complex,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_l_nt_n_dcomplex_dcomplex ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_team_trsv,Kokkos::complex,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_u_nt_u_dcomplex_dcomplex ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_team_trsv,Kokkos::complex,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_u_nt_n_dcomplex_dcomplex ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv,Kokkos::complex,param_tag_type,algo_tag_type>(); +// test_batched_team_trsv,Kokkos::complex,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_l_nt_u_dcomplex_double ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv,double,param_tag_type,algo_tag_type>(); +// test_batched_team_trsv,double,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_l_nt_n_dcomplex_double ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv,double,param_tag_type,algo_tag_type>(); +// test_batched_team_trsv,double,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_u_nt_u_dcomplex_double ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv,double,param_tag_type,algo_tag_type>(); +// test_batched_team_trsv,double,param_tag_type,algo_tag_type>(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_u_nt_n_dcomplex_double ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv,double,param_tag_type,algo_tag_type>(); +// test_batched_team_trsv,double,param_tag_type,algo_tag_type>(); // } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamTrsv_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamTrsv_Real.hpp index d270a5f4f9..532ed87f4f 100644 --- a/batched/dense/unit_test/Test_Batched_TeamTrsv_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamTrsv_Real.hpp @@ -19,25 +19,25 @@ // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv(); +// test_batched_team_trsv(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_l_nt_n_float_float ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv(); +// test_batched_team_trsv(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_u_nt_u_float_float ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv(); +// test_batched_team_trsv(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_u_nt_n_float_float ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv(); +// test_batched_team_trsv(); // } #endif @@ -46,24 +46,24 @@ // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv(); +// test_batched_team_trsv(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_l_nt_n_double_double ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv(); +// test_batched_team_trsv(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_u_nt_u_double_double ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv(); +// test_batched_team_trsv(); // } // TEST_F( TestCategory, batched_scalar_team_trsv_u_nt_n_double_double ) { // typedef // ::Test::TeamTrsv::ParamTag // param_tag_type; typedef Algo::Trsv::Blocked algo_tag_type; -// test_batched_team_trsv(); +// test_batched_team_trsv(); // } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorAxpy_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorAxpy_Complex.hpp index 161db2d3f5..b1f70a723e 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorAxpy_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorAxpy_Complex.hpp @@ -16,12 +16,11 @@ #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, batched_scalar_teamvector_axpy_nt_dcomplex_dcomplex) { - test_batched_teamvector_axpy, + test_batched_teamvector_axpy, Kokkos::complex>(); } TEST_F(TestCategory, batched_scalar_teamvector_axpy_nt_dcomplex_double) { - test_batched_teamvector_axpy, - double>(); + test_batched_teamvector_axpy, double>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorAxpy_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorAxpy_Real.hpp index f81f17046f..15570bc094 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorAxpy_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorAxpy_Real.hpp @@ -16,12 +16,12 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_axpy_nt_float_float) { - test_batched_teamvector_axpy(); + test_batched_teamvector_axpy(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_teamvector_axpy_nt_double_double) { - test_batched_teamvector_axpy(); + test_batched_teamvector_axpy(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorEigendecomposition_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorEigendecomposition_Real.hpp index 98ae616bbc..0a71de6bb7 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorEigendecomposition_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorEigendecomposition_Real.hpp @@ -16,13 +16,13 @@ /* #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F( TestCategory, batched_scalar_teamvector_eigendecomposition_float ) { - test_batched_teamvector_eigendecomposition(); + test_batched_teamvector_eigendecomposition(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F( TestCategory, batched_scalar_teamvector_eigendecomposition_double ) { - test_batched_teamvector_eigendecomposition(); + test_batched_teamvector_eigendecomposition(); } #endif */ diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorGemm_Complex.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorGemm_Complex.hpp index 9250896194..cc6cbdd511 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorGemm_Complex.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorGemm_Complex.hpp @@ -19,8 +19,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_nt_scomplex_scomplex) { Trans::NoTranspose> param_tag_type; - // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); - test_batched_teamvectorgemm, + // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); + test_batched_teamvectorgemm, Kokkos::complex, param_tag_type, Algo::Gemm::Unblocked>(); } @@ -28,8 +28,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_nt_scomplex_scomplex) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); - test_batched_teamvectorgemm, + // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); + test_batched_teamvectorgemm, Kokkos::complex, param_tag_type, Algo::Gemm::Unblocked>(); } @@ -37,8 +37,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_t_scomplex_scomplex) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); - test_batched_teamvectorgemm, + // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); + test_batched_teamvectorgemm, Kokkos::complex, param_tag_type, Algo::Gemm::Unblocked>(); } @@ -46,8 +46,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_t_scomplex_scomplex) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); - test_batched_teamvectorgemm, + // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); + test_batched_teamvectorgemm, Kokkos::complex, param_tag_type, Algo::Gemm::Unblocked>(); } @@ -59,8 +59,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_nt_dcomplex_dcomplex) { Trans::NoTranspose> param_tag_type; - // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); - test_batched_teamvectorgemm, + // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); + test_batched_teamvectorgemm, Kokkos::complex, param_tag_type, Algo::Gemm::Unblocked>(); } @@ -68,8 +68,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_nt_dcomplex_dcomplex) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); - test_batched_teamvectorgemm, + // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); + test_batched_teamvectorgemm, Kokkos::complex, param_tag_type, Algo::Gemm::Unblocked>(); } @@ -77,8 +77,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_t_dcomplex_dcomplex) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); - test_batched_teamvectorgemm, + // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); + test_batched_teamvectorgemm, Kokkos::complex, param_tag_type, Algo::Gemm::Unblocked>(); } @@ -86,8 +86,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_t_dcomplex_dcomplex) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); - test_batched_teamvectorgemm, + // test_batched_teamvectorgemm,Kokkos::complex,param_tag_type,Algo::Gemm::Blocked>(); + test_batched_teamvectorgemm, Kokkos::complex, param_tag_type, Algo::Gemm::Unblocked>(); } diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorGemm_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorGemm_Real.hpp index b8ad094f8e..e96bc1ac5c 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorGemm_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorGemm_Real.hpp @@ -19,8 +19,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_nt_bhalf_bhalf) { Trans::NoTranspose> param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } @@ -28,8 +28,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_nt_bhalf_bhalf) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } @@ -37,8 +37,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_t_bhalf_bhalf) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } @@ -46,8 +46,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_t_bhalf_bhalf) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } @@ -59,8 +59,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_nt_half_half) { Trans::NoTranspose> param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } @@ -68,8 +68,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_nt_half_half) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } @@ -77,8 +77,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_t_half_half) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } @@ -86,8 +86,8 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_t_half_half) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } @@ -99,32 +99,32 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_nt_float_float) { Trans::NoTranspose> param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_nt_float_float) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_t_float_float) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_t_float_float) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } #endif @@ -135,32 +135,32 @@ TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_nt_double_double) { Trans::NoTranspose> param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_nt_double_double) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } TEST_F(TestCategory, batched_scalar_team_vector_gemm_nt_t_double_double) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } TEST_F(TestCategory, batched_scalar_team_vector_gemm_t_t_double_double) { typedef ::Test::TeamVectorGemm::ParamTag param_tag_type; - // test_batched_teamvectorgemm(); - test_batched_teamvectorgemm(); + test_batched_teamvectorgemm(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorGesv_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorGesv_Real.hpp index 24d71d2b89..66c6fb3691 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorGesv_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorGesv_Real.hpp @@ -15,22 +15,22 @@ //@HEADER #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_gesv_static_pivoting_float) { - test_batched_teamvector_gesv(); } TEST_F(TestCategory, batched_scalar_teamvector_gesv_no_pivoting_float) { - test_batched_teamvector_gesv(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_teamvector_gesv_static_pivoting_double) { - test_batched_teamvector_gesv(); } TEST_F(TestCategory, batched_scalar_teamvector_gesv_no_pivoting_double) { - test_batched_teamvector_gesv(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorQR_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorQR_Real.hpp index 54c0388d17..d79d868bc1 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorQR_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorQR_Real.hpp @@ -17,7 +17,7 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_qr_float) { typedef Algo::QR::Unblocked algo_tag_type; - test_batched_qr(); + test_batched_qr(); } #endif @@ -26,7 +26,7 @@ TEST_F(TestCategory, batched_scalar_teamvector_qr_float) { #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_teamvector_qr_double) { typedef Algo::QR::Unblocked algo_tag_type; - test_batched_qr(); + test_batched_qr(); } #endif #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorQR_WithColumnPivoting_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorQR_WithColumnPivoting_Real.hpp index 81e010a895..35713ac7f1 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorQR_WithColumnPivoting_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorQR_WithColumnPivoting_Real.hpp @@ -17,8 +17,7 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_qr_with_columnpivoting_float) { typedef Algo::QR::Unblocked algo_tag_type; - test_batched_qr_with_columnpivoting(); + test_batched_qr_with_columnpivoting(); } #endif @@ -27,8 +26,7 @@ TEST_F(TestCategory, batched_scalar_teamvector_qr_with_columnpivoting_float) { #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_teamvector_qr_with_columnpivoting_double) { typedef Algo::QR::Unblocked algo_tag_type; - test_batched_qr_with_columnpivoting(); + test_batched_qr_with_columnpivoting(); } #endif #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorSolveUTV2_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorSolveUTV2_Real.hpp index 52b8f263c3..c8e547d1d0 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorSolveUTV2_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorSolveUTV2_Real.hpp @@ -17,7 +17,7 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_solve_utv2_float) { typedef Algo::UTV::Unblocked algo_tag_type; - test_batched_solve_utv2(); + test_batched_solve_utv2(); } #endif @@ -26,7 +26,7 @@ TEST_F(TestCategory, batched_scalar_teamvector_solve_utv2_float) { #ifndef KOKKOS_ENABLE_SYCL TEST_F(TestCategory, batched_scalar_teamvector_solve_utv2_double) { typedef Algo::UTV::Unblocked algo_tag_type; - test_batched_solve_utv2(); + test_batched_solve_utv2(); } #endif #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorSolveUTV_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorSolveUTV_Real.hpp index b2bc52dafb..a3b5bcec29 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorSolveUTV_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorSolveUTV_Real.hpp @@ -17,7 +17,7 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_solve_utv_float) { typedef Algo::UTV::Unblocked algo_tag_type; - test_batched_solve_utv(); + test_batched_solve_utv(); } #endif @@ -26,7 +26,7 @@ TEST_F(TestCategory, batched_scalar_teamvector_solve_utv_float) { #ifndef KOKKOS_ENABLE_SYCL TEST_F(TestCategory, batched_scalar_teamvector_solve_utv_double) { typedef Algo::UTV::Unblocked algo_tag_type; - test_batched_solve_utv(); + test_batched_solve_utv(); } #endif #endif diff --git a/batched/dense/unit_test/Test_Batched_TeamVectorUTV_Real.hpp b/batched/dense/unit_test/Test_Batched_TeamVectorUTV_Real.hpp index 980f0ebf75..7e9a8feafe 100644 --- a/batched/dense/unit_test/Test_Batched_TeamVectorUTV_Real.hpp +++ b/batched/dense/unit_test/Test_Batched_TeamVectorUTV_Real.hpp @@ -17,7 +17,7 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_utv_float) { typedef Algo::UTV::Unblocked algo_tag_type; - test_batched_utv(); + test_batched_utv(); } #endif @@ -26,7 +26,7 @@ TEST_F(TestCategory, batched_scalar_teamvector_utv_float) { #ifndef KOKKOS_ENABLE_SYCL TEST_F(TestCategory, batched_scalar_teamvector_utv_double) { typedef Algo::UTV::Unblocked algo_tag_type; - test_batched_utv(); + test_batched_utv(); } #endif #endif diff --git a/batched/dense/unit_test/Test_Batched_VectorArithmatic.hpp b/batched/dense/unit_test/Test_Batched_VectorArithmatic.hpp index 1006325f94..9d1205717f 100644 --- a/batched/dense/unit_test/Test_Batched_VectorArithmatic.hpp +++ b/batched/dense/unit_test/Test_Batched_VectorArithmatic.hpp @@ -265,96 +265,96 @@ int test_batched_complex_real_imag_value() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_vector_arithmatic_simd_float3) { - test_batched_vector_arithmatic, 3>(); + test_batched_vector_arithmatic, 3>(); } TEST_F(TestCategory, batched_vector_arithmatic_simd_float4) { - test_batched_vector_arithmatic, 4>(); + test_batched_vector_arithmatic, 4>(); } // avx TEST_F(TestCategory, batched_vector_arithmatic_simd_float8) { - test_batched_vector_arithmatic, 8>(); + test_batched_vector_arithmatic, 8>(); } // avx 512 TEST_F(TestCategory, batched_vector_arithmatic_simd_float16) { - test_batched_vector_arithmatic, 16>(); + test_batched_vector_arithmatic, 16>(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_vector_arithmatic_simd_double3) { - test_batched_vector_arithmatic, 3>(); + test_batched_vector_arithmatic, 3>(); } // avx TEST_F(TestCategory, batched_vector_arithmatic_simd_double4) { - test_batched_vector_arithmatic, 4>(); + test_batched_vector_arithmatic, 4>(); } // avx 512 TEST_F(TestCategory, batched_vector_arithmatic_simd_double8) { - test_batched_vector_arithmatic, 8>(); + test_batched_vector_arithmatic, 8>(); } #endif #define __DO_NOT_TEST__ #if defined(KOKKOSKERNELS_INST_COMPLEX_FLOAT) TEST_F(TestCategory, batched_vector_arithmatic_simd_scomplex3) { - test_batched_vector_arithmatic >, + test_batched_vector_arithmatic >, 3>(); } // avx TEST_F(TestCategory, batched_vector_arithmatic_simd_scomplex4) { - test_batched_vector_arithmatic >, + test_batched_vector_arithmatic >, 4>(); } // avx 512 TEST_F(TestCategory, batched_vector_arithmatic_simd_scomplex8) { - test_batched_vector_arithmatic >, + test_batched_vector_arithmatic >, 8>(); } TEST_F(TestCategory, batched_vector_scomplex_real_imag_value3) { - test_batched_complex_real_imag_value >, 3>(); } // avx TEST_F(TestCategory, batched_vector_scomplex_real_imag_value2) { - test_batched_complex_real_imag_value >, 2>(); } // avx 512 TEST_F(TestCategory, batched_vector_scomplex_real_imag_value4) { - test_batched_complex_real_imag_value >, 4>(); } #endif #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, batched_vector_arithmatic_simd_dcomplex3) { - test_batched_vector_arithmatic >, + test_batched_vector_arithmatic >, 3>(); } // avx TEST_F(TestCategory, batched_vector_arithmatic_simd_dcomplex2) { - test_batched_vector_arithmatic >, + test_batched_vector_arithmatic >, 2>(); } // avx 512 TEST_F(TestCategory, batched_vector_arithmatic_simd_dcomplex4) { - test_batched_vector_arithmatic >, + test_batched_vector_arithmatic >, 4>(); } TEST_F(TestCategory, batched_vector_dcomplex_real_imag_value3) { - test_batched_complex_real_imag_value >, 3>(); } // avx TEST_F(TestCategory, batched_vector_dcomplex_real_imag_value2) { - test_batched_complex_real_imag_value >, 2>(); } // avx 512 TEST_F(TestCategory, batched_vector_dcomplex_real_imag_value4) { - test_batched_complex_real_imag_value >, 4>(); } #endif diff --git a/batched/dense/unit_test/Test_Batched_VectorLogical.hpp b/batched/dense/unit_test/Test_Batched_VectorLogical.hpp index 9393afd77b..5ab10bb5bd 100644 --- a/batched/dense/unit_test/Test_Batched_VectorLogical.hpp +++ b/batched/dense/unit_test/Test_Batched_VectorLogical.hpp @@ -114,37 +114,37 @@ int test_batched_vector_logical() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_vector_logical_simd_float3) { - test_batched_vector_logical(); + test_batched_vector_logical(); } TEST_F(TestCategory, batched_vector_logical_simd_float8) { - test_batched_vector_logical(); + test_batched_vector_logical(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_vector_logical_simd_double3) { - test_batched_vector_logical(); + test_batched_vector_logical(); } TEST_F(TestCategory, batched_vector_logical_simd_double4) { - test_batched_vector_logical(); + test_batched_vector_logical(); } #endif // #if defined(KOKKOSKERNELS_INST_COMPLEX_FLOAT) // TEST_F( TestCategory, batched_vector_logical_simd_scomplex3 ) { -// test_batched_vector_logical,3>(); +// test_batched_vector_logical,3>(); // } // TEST_F( TestCategory, batched_vector_logical_simd_scomplex4 ) { -// test_batched_vector_logical,4>(); +// test_batched_vector_logical,4>(); // } // #endif // #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) // TEST_F( TestCategory, batched_vector_logical_simd_dcomplex3 ) { -// test_batched_vector_logical,3>(); +// test_batched_vector_logical,3>(); // } // TEST_F( TestCategory, batched_vector_logical_simd_dcomplex2 ) { -// test_batched_vector_logical,2>(); +// test_batched_vector_logical,2>(); // } // #endif diff --git a/batched/dense/unit_test/Test_Batched_VectorMath.hpp b/batched/dense/unit_test/Test_Batched_VectorMath.hpp index d2aa9eb7bc..02c943d587 100644 --- a/batched/dense/unit_test/Test_Batched_VectorMath.hpp +++ b/batched/dense/unit_test/Test_Batched_VectorMath.hpp @@ -157,19 +157,19 @@ int test_batched_vector_math() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_vector_math_simd_float3) { - test_batched_vector_math, 3>(); + test_batched_vector_math, 3>(); } TEST_F(TestCategory, batched_vector_math_simd_float8) { - test_batched_vector_math, 8>(); + test_batched_vector_math, 8>(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_vector_math_simd_double3) { - test_batched_vector_math, 3>(); + test_batched_vector_math, 3>(); } TEST_F(TestCategory, batched_vector_math_simd_double4) { - test_batched_vector_math, 4>(); + test_batched_vector_math, 4>(); } #endif @@ -178,20 +178,20 @@ TEST_F(TestCategory, batched_vector_math_simd_double4) { // #if defined(KOKKOSKERNELS_INST_COMPLEX_FLOAT) // TEST_F( TestCategory, batched_vector_math_simd_scomplex3 ) { // test_complex_pow(); -// test_batched_vector_math >,3>(); +// test_batched_vector_math >,3>(); // } // TEST_F( TestCategory, batched_vector_math_simd_scomplex4 ) { -// test_batched_vector_math >,4>(); +// test_batched_vector_math >,4>(); // } // #endif // #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) // TEST_F( TestCategory, batched_vector_math_simd_dcomplex3 ) { // test_complex_pow(); -// test_batched_vector_math >,3>(); +// test_batched_vector_math >,3>(); // } // TEST_F( TestCategory, batched_vector_math_simd_dcomplex2 ) { -// test_batched_vector_math >,2>(); +// test_batched_vector_math >,2>(); // } // #endif diff --git a/batched/dense/unit_test/Test_Batched_VectorMisc.hpp b/batched/dense/unit_test/Test_Batched_VectorMisc.hpp index 70d0e10cd2..5f176ccba8 100644 --- a/batched/dense/unit_test/Test_Batched_VectorMisc.hpp +++ b/batched/dense/unit_test/Test_Batched_VectorMisc.hpp @@ -173,37 +173,37 @@ int test_batched_vector_misc() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_vector_misc_simd_float3) { - test_batched_vector_misc, 3>(); + test_batched_vector_misc, 3>(); } TEST_F(TestCategory, batched_vector_misc_simd_float8) { - test_batched_vector_misc, 8>(); + test_batched_vector_misc, 8>(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_vector_misc_simd_double3) { - test_batched_vector_misc, 3>(); + test_batched_vector_misc, 3>(); } TEST_F(TestCategory, batched_vector_misc_simd_double4) { - test_batched_vector_misc, 4>(); + test_batched_vector_misc, 4>(); } #endif // #if defined(KOKKOSKERNELS_INST_COMPLEX_FLOAT) // TEST_F( TestCategory, batched_vector_misc_simd_scomplex3 ) { -// test_batched_vector_misc >,3>(); +// test_batched_vector_misc >,3>(); // } // TEST_F( TestCategory, batched_vector_misc_simd_scomplex4 ) { -// test_batched_vector_misc >,4>(); +// test_batched_vector_misc >,4>(); // } // #endif // #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) // TEST_F( TestCategory, batched_vector_misc_simd_dcomplex3 ) { -// test_batched_vector_misc >,3>(); +// test_batched_vector_misc >,3>(); // } // TEST_F( TestCategory, batched_vector_misc_simd_dcomplex2 ) { -// test_batched_vector_misc >,2>(); +// test_batched_vector_misc >,2>(); // } // #endif diff --git a/batched/dense/unit_test/Test_Batched_VectorRelation.hpp b/batched/dense/unit_test/Test_Batched_VectorRelation.hpp index 54eb2938e5..1aff1b2d0f 100644 --- a/batched/dense/unit_test/Test_Batched_VectorRelation.hpp +++ b/batched/dense/unit_test/Test_Batched_VectorRelation.hpp @@ -127,19 +127,19 @@ int test_batched_vector_relation() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_vector_relation_simd_float3) { - test_batched_vector_relation, 3>(); + test_batched_vector_relation, 3>(); } TEST_F(TestCategory, batched_vector_relation_simd_float8) { - test_batched_vector_relation, 8>(); + test_batched_vector_relation, 8>(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_vector_relation_simd_double3) { - test_batched_vector_relation, 3>(); + test_batched_vector_relation, 3>(); } TEST_F(TestCategory, batched_vector_relation_simd_double4) { - test_batched_vector_relation, 4>(); + test_batched_vector_relation, 4>(); } #endif @@ -147,14 +147,14 @@ TEST_F(TestCategory, batched_vector_relation_simd_double4) { // #if defined(KOKKOSKERNELS_INST_COMPLEX_FLOAT) // TEST_F( TestCategory, batched_vector_relation_simd_scomplex4 ) { -// test_batched_vector_relation +// test_batched_vector_relation // >,4>(); // } // #endif // #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) // TEST_F( TestCategory, batched_vector_relation_simd_dcomplex2 ) { -// test_batched_vector_relation +// test_batched_vector_relation // >,2>(); // } // #endif diff --git a/batched/dense/unit_test/Test_Batched_VectorView.hpp b/batched/dense/unit_test/Test_Batched_VectorView.hpp index 793c4ac3f3..74c7748cba 100644 --- a/batched/dense/unit_test/Test_Batched_VectorView.hpp +++ b/batched/dense/unit_test/Test_Batched_VectorView.hpp @@ -356,31 +356,31 @@ int test_batched_vector_view() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_vector_view_simd_float8) { - test_batched_vector_view, 8>(); + test_batched_vector_view, 8>(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_vector_view_simd_double4) { - test_batched_vector_view, 4>(); + test_batched_vector_view, 4>(); } TEST_F(TestCategory, batched_vector_view_simd_double8) { - test_batched_vector_view, 8>(); + test_batched_vector_view, 8>(); } #endif #if defined(KOKKOSKERNELS_INST_COMPLEX_FLOAT) TEST_F(TestCategory, batched_vector_view_simd_scomplex4) { - test_batched_vector_view >, 4>(); + test_batched_vector_view >, 4>(); } TEST_F(TestCategory, batched_vector_view_simd_scomplex8) { - test_batched_vector_view >, 8>(); + test_batched_vector_view >, 8>(); } #endif #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, batched_vector_view_simd_dcomplex2) { - test_batched_vector_view >, 2>(); + test_batched_vector_view >, 2>(); } #if defined(KOKKOS_COMPILER_INTEL) && \ @@ -392,7 +392,7 @@ TEST_F(TestCategory, batched_vector_view_simd_dcomplex4) { } #else TEST_F(TestCategory, batched_vector_view_simd_dcomplex4) { - test_batched_vector_view >, 4>(); + test_batched_vector_view >, 4>(); } #endif // KOKKOS_COMPILER_INTEL #endif // KOKKOSKERNELS_INST_COMPLEX_DOUBLE diff --git a/batched/sparse/unit_test/Test_Batched_SerialGMRES_Real.hpp b/batched/sparse/unit_test/Test_Batched_SerialGMRES_Real.hpp index 6201e29ebc..ccfe3c37d5 100644 --- a/batched/sparse/unit_test/Test_Batched_SerialGMRES_Real.hpp +++ b/batched/sparse/unit_test/Test_Batched_SerialGMRES_Real.hpp @@ -16,12 +16,12 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_serial_GMRES_float) { - test_batched_serial_GMRES(); + test_batched_serial_GMRES(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_GMRES_double) { - test_batched_serial_GMRES(); + test_batched_serial_GMRES(); } #endif diff --git a/batched/sparse/unit_test/Test_Batched_SerialSpmv_Real.hpp b/batched/sparse/unit_test/Test_Batched_SerialSpmv_Real.hpp index bba455fef7..06c8c2695d 100644 --- a/batched/sparse/unit_test/Test_Batched_SerialSpmv_Real.hpp +++ b/batched/sparse/unit_test/Test_Batched_SerialSpmv_Real.hpp @@ -17,13 +17,13 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_serial_spmv_nt_float_float) { typedef ::Test::Spmv::ParamTag param_tag_type; - test_batched_spmv(); + test_batched_spmv(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_serial_spmv_nt_double_double) { typedef ::Test::Spmv::ParamTag param_tag_type; - test_batched_spmv(); + test_batched_spmv(); } #endif diff --git a/batched/sparse/unit_test/Test_Batched_TeamCG_Real.hpp b/batched/sparse/unit_test/Test_Batched_TeamCG_Real.hpp index beb2a078e7..1bdb6bc95a 100644 --- a/batched/sparse/unit_test/Test_Batched_TeamCG_Real.hpp +++ b/batched/sparse/unit_test/Test_Batched_TeamCG_Real.hpp @@ -16,12 +16,12 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_team_CG_float) { - test_batched_team_CG(); + test_batched_team_CG(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_team_CG_double) { - test_batched_team_CG(); + test_batched_team_CG(); } #endif diff --git a/batched/sparse/unit_test/Test_Batched_TeamGMRES_Real.hpp b/batched/sparse/unit_test/Test_Batched_TeamGMRES_Real.hpp index f40452b952..f8aab13eec 100644 --- a/batched/sparse/unit_test/Test_Batched_TeamGMRES_Real.hpp +++ b/batched/sparse/unit_test/Test_Batched_TeamGMRES_Real.hpp @@ -16,12 +16,12 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_team_GMRES_float) { - test_batched_team_GMRES(); + test_batched_team_GMRES(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_team_GMRES_double) { - test_batched_team_GMRES(); + test_batched_team_GMRES(); } #endif diff --git a/batched/sparse/unit_test/Test_Batched_TeamSpmv_Real.hpp b/batched/sparse/unit_test/Test_Batched_TeamSpmv_Real.hpp index de3f6168a9..d815ee7b12 100644 --- a/batched/sparse/unit_test/Test_Batched_TeamSpmv_Real.hpp +++ b/batched/sparse/unit_test/Test_Batched_TeamSpmv_Real.hpp @@ -17,13 +17,13 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_team_spmv_nt_float_float) { typedef ::Test::Spmv::ParamTag param_tag_type; - test_batched_team_spmv(); + test_batched_team_spmv(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_team_spmv_nt_double_double) { typedef ::Test::Spmv::ParamTag param_tag_type; - test_batched_team_spmv(); + test_batched_team_spmv(); } #endif diff --git a/batched/sparse/unit_test/Test_Batched_TeamVectorCG_Real.hpp b/batched/sparse/unit_test/Test_Batched_TeamVectorCG_Real.hpp index e3b34ca594..859a1a885c 100644 --- a/batched/sparse/unit_test/Test_Batched_TeamVectorCG_Real.hpp +++ b/batched/sparse/unit_test/Test_Batched_TeamVectorCG_Real.hpp @@ -16,12 +16,12 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_CG_float) { - test_batched_teamvector_CG(); + test_batched_teamvector_CG(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_teamvector_CG_double) { - test_batched_teamvector_CG(); + test_batched_teamvector_CG(); } #endif diff --git a/batched/sparse/unit_test/Test_Batched_TeamVectorGMRES_Real.hpp b/batched/sparse/unit_test/Test_Batched_TeamVectorGMRES_Real.hpp index e36ee2b67c..53b740deaa 100644 --- a/batched/sparse/unit_test/Test_Batched_TeamVectorGMRES_Real.hpp +++ b/batched/sparse/unit_test/Test_Batched_TeamVectorGMRES_Real.hpp @@ -16,12 +16,12 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_GMRES_float) { - test_batched_teamvector_GMRES(); + test_batched_teamvector_GMRES(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_teamvector_GMRES_double) { - test_batched_teamvector_GMRES(); + test_batched_teamvector_GMRES(); } #endif diff --git a/batched/sparse/unit_test/Test_Batched_TeamVectorSpmv_Real.hpp b/batched/sparse/unit_test/Test_Batched_TeamVectorSpmv_Real.hpp index 709dea5df1..05d6dcd316 100644 --- a/batched/sparse/unit_test/Test_Batched_TeamVectorSpmv_Real.hpp +++ b/batched/sparse/unit_test/Test_Batched_TeamVectorSpmv_Real.hpp @@ -17,13 +17,13 @@ #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, batched_scalar_teamvector_spmv_nt_float_float) { typedef ::Test::Spmv::ParamTag param_tag_type; - test_batched_teamvector_spmv(); + test_batched_teamvector_spmv(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, batched_scalar_teamvector_spmv_nt_double_double) { typedef ::Test::Spmv::ParamTag param_tag_type; - test_batched_teamvector_spmv(); + test_batched_teamvector_spmv(); } #endif diff --git a/blas/unit_test/Test_Blas1_abs.hpp b/blas/unit_test/Test_Blas1_abs.hpp index 8a2c7e3374..5bf3f55388 100644 --- a/blas/unit_test/Test_Blas1_abs.hpp +++ b/blas/unit_test/Test_Blas1_abs.hpp @@ -213,12 +213,12 @@ int test_abs_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, abs_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::abs_float"); - test_abs(); + test_abs(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, abs_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::abs_mv_float"); - test_abs_mv(); + test_abs_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -228,12 +228,12 @@ TEST_F(TestCategory, abs_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, abs_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::abs_double"); - test_abs(); + test_abs(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, abs_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::abs_mv_double"); - test_abs_mv(); + test_abs_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -243,13 +243,12 @@ TEST_F(TestCategory, abs_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, abs_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::abs_double"); - test_abs, Kokkos::complex, TestExecSpace>(); + test_abs, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, abs_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::abs_mv_double"); - test_abs_mv, Kokkos::complex, - TestExecSpace>(); + test_abs_mv, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -259,21 +258,21 @@ TEST_F(TestCategory, abs_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, abs_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::abs_int"); - test_abs(); + test_abs(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, abs_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::abs_mv_int"); - test_abs_mv(); + test_abs_mv(); Kokkos::Profiling::popRegion(); } #endif /*#if !defined(KOKKOSKERNELS_ETI_ONLY) && !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F( TestCategory, -abs_double_int ) { test_abs (); +abs_double_int ) { test_abs (); } TEST_F( TestCategory, abs_double_mv_int ) { - test_abs_mv (); + test_abs_mv (); } #endif*/ diff --git a/blas/unit_test/Test_Blas1_asum.hpp b/blas/unit_test/Test_Blas1_asum.hpp index e914c9a19a..65b5b2c063 100644 --- a/blas/unit_test/Test_Blas1_asum.hpp +++ b/blas/unit_test/Test_Blas1_asum.hpp @@ -98,7 +98,7 @@ int test_asum() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, asum_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::asum_float"); - test_asum(); + test_asum(); Kokkos::Profiling::popRegion(); } #endif @@ -108,7 +108,7 @@ TEST_F(TestCategory, asum_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, asum_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::asum_double"); - test_asum(); + test_asum(); Kokkos::Profiling::popRegion(); } #endif @@ -118,7 +118,7 @@ TEST_F(TestCategory, asum_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, asum_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::asum_complex_double"); - test_asum, TestExecSpace>(); + test_asum, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -128,7 +128,7 @@ TEST_F(TestCategory, asum_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, asum_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::asum_int"); - test_asum(); + test_asum(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_axpby.hpp b/blas/unit_test/Test_Blas1_axpby.hpp index 0d34464a84..8d5afb5f0b 100644 --- a/blas/unit_test/Test_Blas1_axpby.hpp +++ b/blas/unit_test/Test_Blas1_axpby.hpp @@ -227,12 +227,12 @@ int test_axpby_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, axpby_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_float"); - test_axpby(); + test_axpby(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpby_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_mv_float"); - test_axpby_mv(); + test_axpby_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -242,11 +242,11 @@ TEST_F(TestCategory, axpby_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, axpby_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_double"); - test_axpby(); + test_axpby(); } TEST_F(TestCategory, axpby_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_mv_double"); - test_axpby_mv(); + test_axpby_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -256,13 +256,12 @@ TEST_F(TestCategory, axpby_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, axpby_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_complex_double"); - test_axpby, Kokkos::complex, TestExecSpace>(); + test_axpby, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpby_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_mv_complex_double"); - test_axpby_mv, Kokkos::complex, - TestExecSpace>(); + test_axpby_mv, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -272,12 +271,12 @@ TEST_F(TestCategory, axpby_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, axpby_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_int"); - test_axpby(); + test_axpby(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpby_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_mv_int"); - test_axpby_mv(); + test_axpby_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -286,12 +285,12 @@ TEST_F(TestCategory, axpby_mv_int) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, axpby_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_double_int"); - test_axpby(); + test_axpby(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpby_double_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpby_mv_double_int"); - test_axpby_mv(); + test_axpby_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_axpy.hpp b/blas/unit_test/Test_Blas1_axpy.hpp index 8b21ff6dc5..76528f4a52 100644 --- a/blas/unit_test/Test_Blas1_axpy.hpp +++ b/blas/unit_test/Test_Blas1_axpy.hpp @@ -224,12 +224,12 @@ int test_axpy_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, axpy_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_float"); - test_axpy(); + test_axpy(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpy_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_mv_float"); - test_axpy_mv(); + test_axpy_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -239,12 +239,12 @@ TEST_F(TestCategory, axpy_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, axpy_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_double"); - test_axpy(); + test_axpy(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpy_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_mv_double"); - test_axpy_mv(); + test_axpy_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -254,13 +254,12 @@ TEST_F(TestCategory, axpy_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, axpy_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_complex_double"); - test_axpy, Kokkos::complex, TestExecSpace>(); + test_axpy, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpy_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_mv_complex_double"); - test_axpy_mv, Kokkos::complex, - TestExecSpace>(); + test_axpy_mv, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -270,12 +269,12 @@ TEST_F(TestCategory, axpy_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, axpy_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_int"); - test_axpy(); + test_axpy(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpy_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_mv_int"); - test_axpy_mv(); + test_axpy_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -284,12 +283,12 @@ TEST_F(TestCategory, axpy_mv_int) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, axpy_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_double_int"); - test_axpy(); + test_axpy(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, axpy_double_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::axpy_mv_double_int"); - test_axpy_mv(); + test_axpy_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_dot.hpp b/blas/unit_test/Test_Blas1_dot.hpp index d978cbafaa..911925476a 100644 --- a/blas/unit_test/Test_Blas1_dot.hpp +++ b/blas/unit_test/Test_Blas1_dot.hpp @@ -235,12 +235,12 @@ int test_dot_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, dot_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::dot_float"); - test_dot(); + test_dot(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, dot_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::dot_mv_float"); - test_dot_mv(); + test_dot_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -250,12 +250,12 @@ TEST_F(TestCategory, dot_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, dot_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::dot_double"); - test_dot(); + test_dot(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, dot_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::dot_mv_double"); - test_dot_mv(); + test_dot_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -265,13 +265,12 @@ TEST_F(TestCategory, dot_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, dot_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::dot_complex_double"); - test_dot, Kokkos::complex, TestExecSpace>(); + test_dot, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, dot_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::dot_mv_complex_double"); - test_dot_mv, Kokkos::complex, - TestExecSpace>(); + test_dot_mv, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -281,21 +280,21 @@ TEST_F(TestCategory, dot_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, dot_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::dot_int"); - test_dot(); + test_dot(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, dot_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::dot_mv_int"); - test_dot_mv(); + test_dot_mv(); Kokkos::Profiling::popRegion(); } #endif /*#if !defined(KOKKOSKERNELS_ETI_ONLY) && !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F( TestCategory, -dot_double_int ) { test_dot (); +dot_double_int ) { test_dot (); } TEST_F( TestCategory, dot_mv_double_int ) { - test_dot_mv (); + test_dot_mv (); } #endif*/ diff --git a/blas/unit_test/Test_Blas1_iamax.hpp b/blas/unit_test/Test_Blas1_iamax.hpp index fcd896e22a..49f759958a 100644 --- a/blas/unit_test/Test_Blas1_iamax.hpp +++ b/blas/unit_test/Test_Blas1_iamax.hpp @@ -280,12 +280,12 @@ int test_iamax_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, iamax_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::iamax_float"); - test_iamax(); + test_iamax(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, iamax_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::iamax_mvfloat"); - test_iamax_mv(); + test_iamax_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -295,12 +295,12 @@ TEST_F(TestCategory, iamax_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, iamax_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::iamax_double"); - test_iamax(); + test_iamax(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, iamax_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::iamax_mv_double"); - test_iamax_mv(); + test_iamax_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -310,12 +310,12 @@ TEST_F(TestCategory, iamax_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, iamax_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::iamax_complex_double"); - test_iamax, TestExecSpace>(); + test_iamax, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, iamax_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::iamax_mv_complex_double"); - test_iamax_mv, TestExecSpace>(); + test_iamax_mv, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -325,12 +325,12 @@ TEST_F(TestCategory, iamax_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, iamax_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::iamax_int"); - test_iamax(); + test_iamax(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, iamax_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::iamax_mv_int"); - test_iamax_mv(); + test_iamax_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_mult.hpp b/blas/unit_test/Test_Blas1_mult.hpp index 0888c7a6b2..6555280f0d 100644 --- a/blas/unit_test/Test_Blas1_mult.hpp +++ b/blas/unit_test/Test_Blas1_mult.hpp @@ -275,12 +275,12 @@ int test_mult_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, mult_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_float"); - test_mult(); + test_mult(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, mult_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_float"); - test_mult_mv(); + test_mult_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -290,12 +290,12 @@ TEST_F(TestCategory, mult_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, mult_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_double"); - test_mult(); + test_mult(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, mult_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_mv_double"); - test_mult_mv(); + test_mult_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -306,13 +306,13 @@ TEST_F(TestCategory, mult_mv_double) { TEST_F(TestCategory, mult_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_complex_double"); test_mult, Kokkos::complex, - Kokkos::complex, TestExecSpace>(); + Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, mult_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_mv_complex_double"); test_mult_mv, Kokkos::complex, - Kokkos::complex, TestExecSpace>(); + Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -322,12 +322,12 @@ TEST_F(TestCategory, mult_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, mult_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_int"); - test_mult(); + test_mult(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, mult_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_mv_int"); - test_mult_mv(); + test_mult_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -336,12 +336,12 @@ TEST_F(TestCategory, mult_mv_int) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, mult_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_double_int"); - test_mult(); + test_mult(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, mult_mv_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::mult_mv_double_int"); - test_mult_mv(); + test_mult_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_nrm1.hpp b/blas/unit_test/Test_Blas1_nrm1.hpp index 5c99895a49..f6938c5147 100644 --- a/blas/unit_test/Test_Blas1_nrm1.hpp +++ b/blas/unit_test/Test_Blas1_nrm1.hpp @@ -182,12 +182,12 @@ int test_nrm1_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm1_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm1_float"); - test_nrm1(); + test_nrm1(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm1_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm1_mv_float"); - test_nrm1_mv(); + test_nrm1_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -197,12 +197,12 @@ TEST_F(TestCategory, nrm1_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm1_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm1_double"); - test_nrm1(); + test_nrm1(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm1_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm1_mv_double"); - test_nrm1_mv(); + test_nrm1_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -212,12 +212,12 @@ TEST_F(TestCategory, nrm1_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm1_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm1_complex_double"); - test_nrm1, TestExecSpace>(); + test_nrm1, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm1_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm1_mv_complex_double"); - test_nrm1_mv, TestExecSpace>(); + test_nrm1_mv, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -227,12 +227,12 @@ TEST_F(TestCategory, nrm1_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm1_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm1_int"); - test_nrm1(); + test_nrm1(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm1_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm1_mv_int"); - test_nrm1_mv(); + test_nrm1_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_nrm2.hpp b/blas/unit_test/Test_Blas1_nrm2.hpp index 1264cfecf2..a9b3f7c10f 100644 --- a/blas/unit_test/Test_Blas1_nrm2.hpp +++ b/blas/unit_test/Test_Blas1_nrm2.hpp @@ -177,12 +177,12 @@ int test_nrm2_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_float"); - test_nrm2(); + test_nrm2(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_mv_float"); - test_nrm2_mv(); + test_nrm2_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -192,12 +192,12 @@ TEST_F(TestCategory, nrm2_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_double"); - test_nrm2(); + test_nrm2(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_mv_double"); - test_nrm2_mv(); + test_nrm2_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -207,12 +207,12 @@ TEST_F(TestCategory, nrm2_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_complex_double"); - test_nrm2, TestExecSpace>(); + test_nrm2, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_mv_complex_double"); - test_nrm2_mv, TestExecSpace>(); + test_nrm2_mv, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -222,12 +222,12 @@ TEST_F(TestCategory, nrm2_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_int"); - test_nrm2(); + test_nrm2(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_mv_int"); - test_nrm2_mv(); + test_nrm2_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_nrm2_squared.hpp b/blas/unit_test/Test_Blas1_nrm2_squared.hpp index c218a12d39..09e4b3d45d 100644 --- a/blas/unit_test/Test_Blas1_nrm2_squared.hpp +++ b/blas/unit_test/Test_Blas1_nrm2_squared.hpp @@ -182,12 +182,12 @@ int test_nrm2_squared_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2_squared_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_squared_float"); - test_nrm2_squared(); + test_nrm2_squared(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2_squared_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_squared_mv_float"); - test_nrm2_squared_mv(); + test_nrm2_squared_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -197,12 +197,12 @@ TEST_F(TestCategory, nrm2_squared_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2_squared_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_squared_double"); - test_nrm2_squared(); + test_nrm2_squared(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2_squared_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_squared_mv_double"); - test_nrm2_squared_mv(); + test_nrm2_squared_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -213,13 +213,13 @@ TEST_F(TestCategory, nrm2_squared_mv_double) { TEST_F(TestCategory, nrm2_squared_complex_double) { Kokkos::Profiling::pushRegion( "KokkosBlas::Test::nrm2_squared_complex_double"); - test_nrm2_squared, TestExecSpace>(); + test_nrm2_squared, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2_squared_mv_complex_double) { Kokkos::Profiling::pushRegion( "KokkosBlas::Test::nrm2_squared_mv_complex_double"); - test_nrm2_squared_mv, TestExecSpace>(); + test_nrm2_squared_mv, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -229,12 +229,12 @@ TEST_F(TestCategory, nrm2_squared_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2_squared_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_squared_int"); - test_nrm2_squared(); + test_nrm2_squared(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2_squared_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2_squared_mv_int"); - test_nrm2_squared_mv(); + test_nrm2_squared_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_nrm2w.hpp b/blas/unit_test/Test_Blas1_nrm2w.hpp index 89c1bdad45..48d8676fe4 100644 --- a/blas/unit_test/Test_Blas1_nrm2w.hpp +++ b/blas/unit_test/Test_Blas1_nrm2w.hpp @@ -185,12 +185,12 @@ int test_nrm2w_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2w_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_float"); - test_nrm2w(); + test_nrm2w(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2w_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_mv_float"); - test_nrm2w_mv(); + test_nrm2w_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -200,12 +200,12 @@ TEST_F(TestCategory, nrm2w_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2w_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_double"); - test_nrm2w(); + test_nrm2w(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2w_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_mv_double"); - test_nrm2w_mv(); + test_nrm2w_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -215,12 +215,12 @@ TEST_F(TestCategory, nrm2w_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2w_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_complex_double"); - test_nrm2w, TestExecSpace>(); + test_nrm2w, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2w_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_mv_complex_double"); - test_nrm2w_mv, TestExecSpace>(); + test_nrm2w_mv, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -230,12 +230,12 @@ TEST_F(TestCategory, nrm2w_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2w_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_int"); - test_nrm2w(); + test_nrm2w(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2w_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_mv_int"); - test_nrm2w_mv(); + test_nrm2w_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_nrm2w_squared.hpp b/blas/unit_test/Test_Blas1_nrm2w_squared.hpp index bacc733b1a..5a55d15fad 100644 --- a/blas/unit_test/Test_Blas1_nrm2w_squared.hpp +++ b/blas/unit_test/Test_Blas1_nrm2w_squared.hpp @@ -179,12 +179,12 @@ int test_nrm2w_squared_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2w_squared_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_squared_float"); - test_nrm2w_squared(); + test_nrm2w_squared(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2w_squared_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_squared_mv_float"); - test_nrm2w_squared_mv(); + test_nrm2w_squared_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -194,12 +194,12 @@ TEST_F(TestCategory, nrm2w_squared_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2w_squared_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_squared_double"); - test_nrm2w_squared(); + test_nrm2w_squared(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2w_squared_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_squared_mv_double"); - test_nrm2w_squared_mv(); + test_nrm2w_squared_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -210,13 +210,13 @@ TEST_F(TestCategory, nrm2w_squared_mv_double) { TEST_F(TestCategory, nrm2w_squared_complex_double) { Kokkos::Profiling::pushRegion( "KokkosBlas::Test::nrm2w_squared_complex_double"); - test_nrm2w_squared, TestExecSpace>(); + test_nrm2w_squared, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2w_squared_mv_complex_double) { Kokkos::Profiling::pushRegion( "KokkosBlas::Test::nrm2w_squared_mv_complex_double"); - test_nrm2w_squared_mv, TestExecSpace>(); + test_nrm2w_squared_mv, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -226,12 +226,12 @@ TEST_F(TestCategory, nrm2w_squared_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrm2w_squared_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_squared_int"); - test_nrm2w_squared(); + test_nrm2w_squared(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrm2w_squared_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrm2w_squared_mv_int"); - test_nrm2w_squared_mv(); + test_nrm2w_squared_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_nrminf.hpp b/blas/unit_test/Test_Blas1_nrminf.hpp index 438db16895..91cc1c7502 100644 --- a/blas/unit_test/Test_Blas1_nrminf.hpp +++ b/blas/unit_test/Test_Blas1_nrminf.hpp @@ -173,12 +173,12 @@ int test_nrminf_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrminf_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrminf_float"); - test_nrminf(); + test_nrminf(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrminf_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrminf_mvfloat"); - test_nrminf_mv(); + test_nrminf_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -188,12 +188,12 @@ TEST_F(TestCategory, nrminf_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrminf_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrminf_double"); - test_nrminf(); + test_nrminf(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrminf_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrminf_mv_double"); - test_nrminf_mv(); + test_nrminf_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -203,12 +203,12 @@ TEST_F(TestCategory, nrminf_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrminf_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrminf_complex_double"); - test_nrminf, TestExecSpace>(); + test_nrminf, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrminf_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrminf_mv_complex_double"); - test_nrminf_mv, TestExecSpace>(); + test_nrminf_mv, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -218,12 +218,12 @@ TEST_F(TestCategory, nrminf_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, nrminf_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrminf_int"); - test_nrminf(); + test_nrminf(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, nrminf_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::nrminf_mv_int"); - test_nrminf_mv(); + test_nrminf_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_reciprocal.hpp b/blas/unit_test/Test_Blas1_reciprocal.hpp index 841725e6fd..c293fa04eb 100644 --- a/blas/unit_test/Test_Blas1_reciprocal.hpp +++ b/blas/unit_test/Test_Blas1_reciprocal.hpp @@ -210,12 +210,12 @@ int test_reciprocal_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, reciprocal_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::reciprocal_float"); - test_reciprocal(); + test_reciprocal(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, reciprocal_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::reciprocal_mv_float"); - test_reciprocal_mv(); + test_reciprocal_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -225,12 +225,12 @@ TEST_F(TestCategory, reciprocal_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, reciprocal_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::reciprocal_double"); - test_reciprocal(); + test_reciprocal(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, reciprocal_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::reciprocal_mv_double"); - test_reciprocal_mv(); + test_reciprocal_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -241,14 +241,14 @@ TEST_F(TestCategory, reciprocal_mv_double) { TEST_F(TestCategory, reciprocal_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::reciprocal_complex_double"); test_reciprocal, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, reciprocal_mv_complex_double) { Kokkos::Profiling::pushRegion( "KokkosBlas::Test::reciprocal_mv_complex_double"); test_reciprocal_mv, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -258,12 +258,12 @@ TEST_F(TestCategory, reciprocal_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, reciprocal_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::reciprocal_int"); - test_reciprocal(); + test_reciprocal(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, reciprocal_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::reciprocal_mv_int"); - test_reciprocal_mv(); + test_reciprocal_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -271,10 +271,10 @@ TEST_F(TestCategory, reciprocal_mv_int) { /* #if !defined(KOKKOSKERNELS_ETI_ONLY) && !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F( TestCategory, -reciprocal_double_int ) { test_reciprocal (); +reciprocal_double_int ) { test_reciprocal (); } TEST_F( TestCategory, reciprocal_double_mv_int ) { - test_reciprocal_mv (); + test_reciprocal_mv (); } #endif */ diff --git a/blas/unit_test/Test_Blas1_rot.hpp b/blas/unit_test/Test_Blas1_rot.hpp index 7fe079d1aa..ab1f395923 100644 --- a/blas/unit_test/Test_Blas1_rot.hpp +++ b/blas/unit_test/Test_Blas1_rot.hpp @@ -75,7 +75,7 @@ int test_rot() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rot_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rot"); - test_rot(); + test_rot(); Kokkos::Profiling::popRegion(); } #endif @@ -85,7 +85,7 @@ TEST_F(TestCategory, rot_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rot_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rot"); - test_rot(); + test_rot(); Kokkos::Profiling::popRegion(); } #endif @@ -95,7 +95,7 @@ TEST_F(TestCategory, rot_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rot_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rot"); - test_rot, TestExecSpace>(); + test_rot, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -105,7 +105,7 @@ TEST_F(TestCategory, rot_complex_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rot_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rot"); - test_rot, TestExecSpace>(); + test_rot, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_rotg.hpp b/blas/unit_test/Test_Blas1_rotg.hpp index 8efcb50182..27f9c3cf71 100644 --- a/blas/unit_test/Test_Blas1_rotg.hpp +++ b/blas/unit_test/Test_Blas1_rotg.hpp @@ -63,7 +63,7 @@ int test_rotg() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rotg_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rotg"); - test_rotg(); + test_rotg(); Kokkos::Profiling::popRegion(); } #endif @@ -73,7 +73,7 @@ TEST_F(TestCategory, rotg_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rotg_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rotg"); - test_rotg(); + test_rotg(); Kokkos::Profiling::popRegion(); } #endif @@ -83,7 +83,7 @@ TEST_F(TestCategory, rotg_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rotg_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rotg"); - test_rotg, TestExecSpace>(); + test_rotg, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -93,7 +93,7 @@ TEST_F(TestCategory, rotg_complex_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rotg_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rotg"); - test_rotg, TestExecSpace>(); + test_rotg, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_rotm.hpp b/blas/unit_test/Test_Blas1_rotm.hpp index c9a09fd915..1f41fd06bc 100644 --- a/blas/unit_test/Test_Blas1_rotm.hpp +++ b/blas/unit_test/Test_Blas1_rotm.hpp @@ -166,7 +166,7 @@ int test_rotm() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rotm_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rotm"); - test_rotm(); + test_rotm(); Kokkos::Profiling::popRegion(); } #endif @@ -176,7 +176,7 @@ TEST_F(TestCategory, rotm_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, rotm_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::rotm"); - test_rotm(); + test_rotm(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_scal.hpp b/blas/unit_test/Test_Blas1_scal.hpp index 6c4f7b7f2a..a88ed646f1 100644 --- a/blas/unit_test/Test_Blas1_scal.hpp +++ b/blas/unit_test/Test_Blas1_scal.hpp @@ -229,12 +229,12 @@ int test_scal_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, scal_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_float"); - test_scal(); + test_scal(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, scal_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_mv_float"); - test_scal_mv(); + test_scal_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -244,12 +244,12 @@ TEST_F(TestCategory, scal_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, scal_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_double"); - test_scal(); + test_scal(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, scal_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_mv_double"); - test_scal_mv(); + test_scal_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -259,13 +259,12 @@ TEST_F(TestCategory, scal_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, scal_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_complex_double"); - test_scal, Kokkos::complex, TestExecSpace>(); + test_scal, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, scal_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_mv_complex_double"); - test_scal_mv, Kokkos::complex, - TestExecSpace>(); + test_scal_mv, Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -275,12 +274,12 @@ TEST_F(TestCategory, scal_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, scal_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_int"); - test_scal(); + test_scal(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, scal_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_mv_int"); - test_scal_mv(); + test_scal_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -289,12 +288,12 @@ TEST_F(TestCategory, scal_mv_int) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, scal_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_double_int"); - test_scal(); + test_scal(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, scal_mv_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::scal_mv_double_int"); - test_scal_mv(); + test_scal_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_serial_setscal.hpp b/blas/unit_test/Test_Blas1_serial_setscal.hpp index 6c55ef65e3..cfbe4d602d 100644 --- a/blas/unit_test/Test_Blas1_serial_setscal.hpp +++ b/blas/unit_test/Test_Blas1_serial_setscal.hpp @@ -181,19 +181,19 @@ int test_blas_matutil() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, blas_scalar_serial_set_float_float) { - test_blas_matutil(); + test_blas_matutil(); } TEST_F(TestCategory, blas_scalar_serial_scale_float_float) { - test_blas_matutil(); + test_blas_matutil(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, blas_scalar_serial_set_double_double) { - test_blas_matutil(); + test_blas_matutil(); } TEST_F(TestCategory, blas_scalar_serial_scale_double_double) { - test_blas_matutil(); + test_blas_matutil(); } #endif @@ -201,19 +201,19 @@ TEST_F(TestCategory, blas_scalar_serial_scale_double_double) { #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, blas_scalar_serial_set_dcomplex_dcomplex) { - test_blas_matutil, + test_blas_matutil, Kokkos::complex, ::Test::BlasSet>(); } TEST_F(TestCategory, blas_scalar_serial_scale_dcomplex_dcomplex) { - test_blas_matutil, + test_blas_matutil, Kokkos::complex, ::Test::BlasScale>(); } TEST_F(TestCategory, blas_scalar_serial_set_dcomplex_double) { - test_blas_matutil, double, + test_blas_matutil, double, ::Test::BlasSet>(); } TEST_F(TestCategory, blas_scalar_serial_scale_dcomplex_double) { - test_blas_matutil, double, + test_blas_matutil, double, ::Test::BlasScale>(); } #endif diff --git a/blas/unit_test/Test_Blas1_sum.hpp b/blas/unit_test/Test_Blas1_sum.hpp index cf119cbd00..34d52a7e4a 100644 --- a/blas/unit_test/Test_Blas1_sum.hpp +++ b/blas/unit_test/Test_Blas1_sum.hpp @@ -167,12 +167,12 @@ int test_sum_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, sum_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::sum_float"); - test_sum(); + test_sum(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, sum_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::sum_mv_float"); - test_sum_mv(); + test_sum_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -182,12 +182,12 @@ TEST_F(TestCategory, sum_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, sum_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::sum_double"); - test_sum(); + test_sum(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, sum_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::sum_mv_double"); - test_sum_mv(); + test_sum_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -197,12 +197,12 @@ TEST_F(TestCategory, sum_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, sum_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::sum_complex_double"); - test_sum, TestExecSpace>(); + test_sum, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, sum_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::sum_mv_complex_double"); - test_sum_mv, TestExecSpace>(); + test_sum_mv, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -212,12 +212,12 @@ TEST_F(TestCategory, sum_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, sum_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::sum_int"); - test_sum(); + test_sum(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, sum_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::sum_mv_int"); - test_sum_mv(); + test_sum_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_swap.hpp b/blas/unit_test/Test_Blas1_swap.hpp index a7e4fff433..382c35947b 100644 --- a/blas/unit_test/Test_Blas1_swap.hpp +++ b/blas/unit_test/Test_Blas1_swap.hpp @@ -60,7 +60,7 @@ int test_swap() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, swap_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::swap_float"); - test_swap(); + test_swap(); Kokkos::Profiling::popRegion(); } #endif @@ -70,7 +70,7 @@ TEST_F(TestCategory, swap_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, swap_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::swap_double"); - test_swap(); + test_swap(); Kokkos::Profiling::popRegion(); } #endif @@ -80,7 +80,7 @@ TEST_F(TestCategory, swap_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, swap_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::swap_complex_float"); - test_swap, TestExecSpace>(); + test_swap, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -90,7 +90,7 @@ TEST_F(TestCategory, swap_complex_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, swap_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::swap_complex_double"); - test_swap, TestExecSpace>(); + test_swap, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas1_team_abs.hpp b/blas/unit_test/Test_Blas1_team_abs.hpp index 642be144e4..eca7657b55 100644 --- a/blas/unit_test/Test_Blas1_team_abs.hpp +++ b/blas/unit_test/Test_Blas1_team_abs.hpp @@ -289,10 +289,10 @@ int test_team_abs_mv() { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_abs_float) { - test_team_abs(); + test_team_abs(); } TEST_F(TestCategory, team_abs_mv_float) { - test_team_abs_mv(); + test_team_abs_mv(); } #endif @@ -300,10 +300,10 @@ TEST_F(TestCategory, team_abs_mv_float) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_abs_double) { - test_team_abs(); + test_team_abs(); } TEST_F(TestCategory, team_abs_mv_double) { - test_team_abs_mv(); + test_team_abs_mv(); } #endif @@ -311,30 +311,29 @@ TEST_F(TestCategory, team_abs_mv_double) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_abs_complex_double) { - test_team_abs, Kokkos::complex, - TestExecSpace>(); + test_team_abs, Kokkos::complex, TestDevice>(); } TEST_F(TestCategory, team_abs_mv_complex_double) { test_team_abs_mv, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); } #endif #if defined(KOKKOSKERNELS_INST_INT) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -TEST_F(TestCategory, team_abs_int) { test_team_abs(); } +TEST_F(TestCategory, team_abs_int) { test_team_abs(); } TEST_F(TestCategory, team_abs_mv_int) { - test_team_abs_mv(); + test_team_abs_mv(); } #endif /*#if !defined(KOKKOSKERNELS_ETI_ONLY) && !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F( TestCategory, -team_abs_double_int ) { test_team_abs (); +team_abs_double_int ) { test_team_abs (); } TEST_F( TestCategory, team_abs_double_mv_int ) { - test_team_abs_mv (); + test_team_abs_mv (); } #endif*/ diff --git a/blas/unit_test/Test_Blas1_team_axpby.hpp b/blas/unit_test/Test_Blas1_team_axpby.hpp index 7052371bdb..5875f2bc1f 100644 --- a/blas/unit_test/Test_Blas1_team_axpby.hpp +++ b/blas/unit_test/Test_Blas1_team_axpby.hpp @@ -291,10 +291,10 @@ int test_team_axpby_mv() { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_axpby_float) { - test_team_axpby(); + test_team_axpby(); } TEST_F(TestCategory, team_axpby_mv_float) { - test_team_axpby_mv(); + test_team_axpby_mv(); } #endif @@ -302,10 +302,10 @@ TEST_F(TestCategory, team_axpby_mv_float) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_axpby_double) { - test_team_axpby(); + test_team_axpby(); } TEST_F(TestCategory, team_axpby_mv_double) { - test_team_axpby_mv(); + test_team_axpby_mv(); } #endif @@ -314,11 +314,11 @@ TEST_F(TestCategory, team_axpby_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_axpby_complex_double) { test_team_axpby, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); } TEST_F(TestCategory, team_axpby_mv_complex_double) { test_team_axpby_mv, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); } #endif @@ -326,20 +326,20 @@ TEST_F(TestCategory, team_axpby_mv_complex_double) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_axpby_int) { - test_team_axpby(); + test_team_axpby(); } TEST_F(TestCategory, team_axpby_mv_int) { - test_team_axpby_mv(); + test_team_axpby_mv(); } #endif #if !defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, team_axpby_double_int) { - test_team_axpby(); + test_team_axpby(); } TEST_F(TestCategory, team_axpby_double_mv_int) { - test_team_axpby_mv(); + test_team_axpby_mv(); } #endif diff --git a/blas/unit_test/Test_Blas1_team_axpy.hpp b/blas/unit_test/Test_Blas1_team_axpy.hpp index 87a4a80fba..a5ac6a9c66 100644 --- a/blas/unit_test/Test_Blas1_team_axpy.hpp +++ b/blas/unit_test/Test_Blas1_team_axpy.hpp @@ -285,10 +285,10 @@ int test_team_axpy_mv() { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_axpy_float) { - test_team_axpy(); + test_team_axpy(); } TEST_F(TestCategory, team_axpy_mv_float) { - test_team_axpy_mv(); + test_team_axpy_mv(); } #endif @@ -296,10 +296,10 @@ TEST_F(TestCategory, team_axpy_mv_float) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_axpy_double) { - test_team_axpy(); + test_team_axpy(); } TEST_F(TestCategory, team_axpy_mv_double) { - test_team_axpy_mv(); + test_team_axpy_mv(); } #endif @@ -308,32 +308,30 @@ TEST_F(TestCategory, team_axpy_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_axpy_complex_double) { test_team_axpy, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); } TEST_F(TestCategory, team_axpy_mv_complex_double) { test_team_axpy_mv, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); } #endif #if defined(KOKKOSKERNELS_INST_INT) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -TEST_F(TestCategory, team_axpy_int) { - test_team_axpy(); -} +TEST_F(TestCategory, team_axpy_int) { test_team_axpy(); } TEST_F(TestCategory, team_axpy_mv_int) { - test_team_axpy_mv(); + test_team_axpy_mv(); } #endif #if !defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, team_axpy_double_int) { - test_team_axpy(); + test_team_axpy(); } TEST_F(TestCategory, team_axpy_double_mv_int) { - test_team_axpy_mv(); + test_team_axpy_mv(); } #endif diff --git a/blas/unit_test/Test_Blas1_team_dot.hpp b/blas/unit_test/Test_Blas1_team_dot.hpp index ec8dad838a..26baf261fe 100644 --- a/blas/unit_test/Test_Blas1_team_dot.hpp +++ b/blas/unit_test/Test_Blas1_team_dot.hpp @@ -355,10 +355,10 @@ int test_team_dot_mv() { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_dot_float) { - test_team_dot(); + test_team_dot(); } TEST_F(TestCategory, team_dot_mv_float) { - test_team_dot_mv(); + test_team_dot_mv(); } #endif @@ -366,10 +366,10 @@ TEST_F(TestCategory, team_dot_mv_float) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_dot_double) { - test_team_dot(); + test_team_dot(); } TEST_F(TestCategory, team_dot_mv_double) { - test_team_dot_mv(); + test_team_dot_mv(); } #endif @@ -377,30 +377,29 @@ TEST_F(TestCategory, team_dot_mv_double) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_dot_complex_double) { - test_team_dot, Kokkos::complex, - TestExecSpace>(); + test_team_dot, Kokkos::complex, TestDevice>(); } TEST_F(TestCategory, team_dot_mv_complex_double) { test_team_dot_mv, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); } #endif #if defined(KOKKOSKERNELS_INST_INT) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -TEST_F(TestCategory, team_dot_int) { test_team_dot(); } +TEST_F(TestCategory, team_dot_int) { test_team_dot(); } TEST_F(TestCategory, team_dot_mv_int) { - test_team_dot_mv(); + test_team_dot_mv(); } #endif /*#if !defined(KOKKOSKERNELS_ETI_ONLY) && !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F( TestCategory, -team_dot_double_int ) { test_team_dot (); +team_dot_double_int ) { test_team_dot (); } TEST_F( TestCategory, team_dot_mv_double_int ) { - test_team_dot_mv (); + test_team_dot_mv (); } #endif*/ diff --git a/blas/unit_test/Test_Blas1_team_mult.hpp b/blas/unit_test/Test_Blas1_team_mult.hpp index e8802a84a6..488e9ccf51 100644 --- a/blas/unit_test/Test_Blas1_team_mult.hpp +++ b/blas/unit_test/Test_Blas1_team_mult.hpp @@ -366,10 +366,10 @@ int test_team_mult_mv() { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_mult_float) { - test_team_mult(); + test_team_mult(); } TEST_F(TestCategory, team_mult_mv_float) { - test_team_mult_mv(); + test_team_mult_mv(); } #endif @@ -377,10 +377,10 @@ TEST_F(TestCategory, team_mult_mv_float) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_mult_double) { - test_team_mult(); + test_team_mult(); } TEST_F(TestCategory, team_mult_mv_double) { - test_team_mult_mv(); + test_team_mult_mv(); } #endif @@ -389,11 +389,11 @@ TEST_F(TestCategory, team_mult_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_mult_complex_double) { test_team_mult, Kokkos::complex, - Kokkos::complex, TestExecSpace>(); + Kokkos::complex, TestDevice>(); } TEST_F(TestCategory, team_mult_mv_complex_double) { test_team_mult_mv, Kokkos::complex, - Kokkos::complex, TestExecSpace>(); + Kokkos::complex, TestDevice>(); } #endif @@ -401,20 +401,20 @@ TEST_F(TestCategory, team_mult_mv_complex_double) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_mult_int) { - test_team_mult(); + test_team_mult(); } TEST_F(TestCategory, team_mult_mv_int) { - test_team_mult_mv(); + test_team_mult_mv(); } #endif #if !defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, team_mult_double_int) { - test_team_mult(); + test_team_mult(); } TEST_F(TestCategory, team_mult_double_mv_int) { - test_team_mult_mv(); + test_team_mult_mv(); } #endif diff --git a/blas/unit_test/Test_Blas1_team_nrm2.hpp b/blas/unit_test/Test_Blas1_team_nrm2.hpp index e5008441a4..12192032c9 100644 --- a/blas/unit_test/Test_Blas1_team_nrm2.hpp +++ b/blas/unit_test/Test_Blas1_team_nrm2.hpp @@ -130,31 +130,27 @@ int test_team_nrm2() { #if defined(KOKKOSKERNELS_INST_FLOAT) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -TEST_F(TestCategory, team_nrm2_float) { - test_team_nrm2(); -} +TEST_F(TestCategory, team_nrm2_float) { test_team_nrm2(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -TEST_F(TestCategory, team_nrm2_double) { - test_team_nrm2(); -} +TEST_F(TestCategory, team_nrm2_double) { test_team_nrm2(); } #endif #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_nrm2_complex_double) { - test_team_nrm2, TestExecSpace>(); + test_team_nrm2, TestDevice>(); } #endif #if defined(KOKKOSKERNELS_INST_INT) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -TEST_F(TestCategory, team_nrm2_int) { test_team_nrm2(); } +TEST_F(TestCategory, team_nrm2_int) { test_team_nrm2(); } #endif #endif // Check for lambda availability in CUDA backend diff --git a/blas/unit_test/Test_Blas1_team_scal.hpp b/blas/unit_test/Test_Blas1_team_scal.hpp index aad2e8723f..212b1e09e9 100644 --- a/blas/unit_test/Test_Blas1_team_scal.hpp +++ b/blas/unit_test/Test_Blas1_team_scal.hpp @@ -358,10 +358,10 @@ int test_team_scal_mv() { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_scal_float) { - test_team_scal(); + test_team_scal(); } TEST_F(TestCategory, team_scal_mv_float) { - test_team_scal_mv(); + test_team_scal_mv(); } #endif @@ -369,10 +369,10 @@ TEST_F(TestCategory, team_scal_mv_float) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_scal_double) { - test_team_scal(); + test_team_scal(); } TEST_F(TestCategory, team_scal_mv_double) { - test_team_scal_mv(); + test_team_scal_mv(); } #endif @@ -381,32 +381,30 @@ TEST_F(TestCategory, team_scal_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_scal_complex_double) { test_team_scal, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); } TEST_F(TestCategory, team_scal_mv_complex_double) { test_team_scal_mv, Kokkos::complex, - TestExecSpace>(); + TestDevice>(); } #endif #if defined(KOKKOSKERNELS_INST_INT) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -TEST_F(TestCategory, team_scal_int) { - test_team_scal(); -} +TEST_F(TestCategory, team_scal_int) { test_team_scal(); } TEST_F(TestCategory, team_scal_mv_int) { - test_team_scal_mv(); + test_team_scal_mv(); } #endif #if !defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, team_scal_double_int) { - test_team_scal(); + test_team_scal(); } TEST_F(TestCategory, team_scal_double_mv_int) { - test_team_scal_mv(); + test_team_scal_mv(); } #endif diff --git a/blas/unit_test/Test_Blas1_team_setscal.hpp b/blas/unit_test/Test_Blas1_team_setscal.hpp index cae6e68be0..4d2499a466 100644 --- a/blas/unit_test/Test_Blas1_team_setscal.hpp +++ b/blas/unit_test/Test_Blas1_team_setscal.hpp @@ -194,19 +194,19 @@ int test_blas_team_matutil() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, blas_scalar_team_set_float_float) { - test_blas_team_matutil(); + test_blas_team_matutil(); } TEST_F(TestCategory, blas_scalar_team_scale_float_float) { - test_blas_team_matutil(); + test_blas_team_matutil(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, blas_scalar_team_set_double_double) { - test_blas_team_matutil(); + test_blas_team_matutil(); } TEST_F(TestCategory, blas_scalar_team_scale_double_double) { - test_blas_team_matutil(); + test_blas_team_matutil(); } #endif @@ -214,19 +214,19 @@ TEST_F(TestCategory, blas_scalar_team_scale_double_double) { #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, blas_scalar_team_set_dcomplex_dcomplex) { - test_blas_team_matutil, + test_blas_team_matutil, Kokkos::complex, ::Test::BlasSet>(); } TEST_F(TestCategory, blas_scalar_team_scale_dcomplex_dcomplex) { - test_blas_team_matutil, + test_blas_team_matutil, Kokkos::complex, ::Test::BlasScale>(); } TEST_F(TestCategory, blas_scalar_team_set_dcomplex_double) { - test_blas_team_matutil, double, + test_blas_team_matutil, double, ::Test::BlasSet>(); } TEST_F(TestCategory, blas_scalar_team_scale_dcomplex_double) { - test_blas_team_matutil, double, + test_blas_team_matutil, double, ::Test::BlasScale>(); } #endif diff --git a/blas/unit_test/Test_Blas1_team_update.hpp b/blas/unit_test/Test_Blas1_team_update.hpp index 35182b27fd..cfc76455f3 100644 --- a/blas/unit_test/Test_Blas1_team_update.hpp +++ b/blas/unit_test/Test_Blas1_team_update.hpp @@ -370,10 +370,10 @@ int test_team_update_mv() { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_update_float) { - test_team_update(); + test_team_update(); } TEST_F(TestCategory, team_update_mv_float) { - test_team_update_mv(); + test_team_update_mv(); } #endif @@ -381,10 +381,10 @@ TEST_F(TestCategory, team_update_mv_float) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_update_double) { - test_team_update(); + test_team_update(); } TEST_F(TestCategory, team_update_mv_double) { - test_team_update_mv(); + test_team_update_mv(); } #endif @@ -393,11 +393,11 @@ TEST_F(TestCategory, team_update_mv_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_update_complex_double) { test_team_update, Kokkos::complex, - Kokkos::complex, TestExecSpace>(); + Kokkos::complex, TestDevice>(); } TEST_F(TestCategory, team_update_mv_complex_double) { test_team_update_mv, Kokkos::complex, - Kokkos::complex, TestExecSpace>(); + Kokkos::complex, TestDevice>(); } #endif @@ -405,20 +405,20 @@ TEST_F(TestCategory, team_update_mv_complex_double) { (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, team_update_int) { - test_team_update(); + test_team_update(); } TEST_F(TestCategory, team_update_mv_int) { - test_team_update_mv(); + test_team_update_mv(); } #endif #if !defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, team_update_double_int) { - test_team_update(); + test_team_update(); } TEST_F(TestCategory, team_update_double_mv_int) { - test_team_update_mv(); + test_team_update_mv(); } #endif diff --git a/blas/unit_test/Test_Blas1_update.hpp b/blas/unit_test/Test_Blas1_update.hpp index 07445f595e..cfeddb9d3d 100644 --- a/blas/unit_test/Test_Blas1_update.hpp +++ b/blas/unit_test/Test_Blas1_update.hpp @@ -279,12 +279,12 @@ int test_update_mv() { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, update_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_float"); - test_update(); + test_update(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, update_mv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_mv_float"); - test_update_mv(); + test_update_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -294,11 +294,11 @@ TEST_F(TestCategory, update_mv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, update_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_double"); - test_update(); + test_update(); } TEST_F(TestCategory, update_mv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_mv_double"); - test_update_mv(); + test_update_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -309,13 +309,13 @@ TEST_F(TestCategory, update_mv_double) { TEST_F(TestCategory, update_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_complex_double"); test_update, Kokkos::complex, - Kokkos::complex, TestExecSpace>(); + Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, update_mv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_mv_complex_double"); test_update_mv, Kokkos::complex, - Kokkos::complex, TestExecSpace>(); + Kokkos::complex, TestDevice>(); Kokkos::Profiling::popRegion(); } #endif @@ -325,12 +325,12 @@ TEST_F(TestCategory, update_mv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, update_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_int"); - test_update(); + test_update(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, update_mv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_mv_int"); - test_update_mv(); + test_update_mv(); Kokkos::Profiling::popRegion(); } #endif @@ -339,12 +339,12 @@ TEST_F(TestCategory, update_mv_int) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, update_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_double_int"); - test_update(); + test_update(); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, update_mv_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::update_mv_double_int"); - test_update_mv(); + test_update_mv(); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas2_gemv.hpp b/blas/unit_test/Test_Blas2_gemv.hpp index dc83ac82f5..518e7b8055 100644 --- a/blas/unit_test/Test_Blas2_gemv.hpp +++ b/blas/unit_test/Test_Blas2_gemv.hpp @@ -240,11 +240,11 @@ int test_gemv(const char* mode) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, gemv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_float"); - test_gemv("N"); + test_gemv("N"); Kokkos::Profiling::popRegion(); Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_tran_float"); - test_gemv("T"); + test_gemv("T"); Kokkos::Profiling::popRegion(); } #endif @@ -254,11 +254,11 @@ TEST_F(TestCategory, gemv_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, gemv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_double"); - test_gemv("N"); + test_gemv("N"); Kokkos::Profiling::popRegion(); Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_tran_double"); - test_gemv("T"); + test_gemv("T"); Kokkos::Profiling::popRegion(); } #endif @@ -269,17 +269,17 @@ TEST_F(TestCategory, gemv_double) { TEST_F(TestCategory, gemv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_complex_double"); test_gemv, Kokkos::complex, - Kokkos::complex, TestExecSpace>("N"); + Kokkos::complex, TestDevice>("N"); Kokkos::Profiling::popRegion(); Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_tran_complex_double"); test_gemv, Kokkos::complex, - Kokkos::complex, TestExecSpace>("T"); + Kokkos::complex, TestDevice>("T"); Kokkos::Profiling::popRegion(); Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_conj_complex_double"); test_gemv, Kokkos::complex, - Kokkos::complex, TestExecSpace>("C"); + Kokkos::complex, TestDevice>("C"); Kokkos::Profiling::popRegion(); } #endif @@ -289,11 +289,11 @@ TEST_F(TestCategory, gemv_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, gemv_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_int"); - test_gemv("N"); + test_gemv("N"); Kokkos::Profiling::popRegion(); Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_tran_int"); - test_gemv("T"); + test_gemv("T"); Kokkos::Profiling::popRegion(); } #endif @@ -302,11 +302,11 @@ TEST_F(TestCategory, gemv_int) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, gemv_double_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemv_double_int"); - test_gemv("N"); + test_gemv("N"); Kokkos::Profiling::popRegion(); // Kokkos::Profiling::pushRegion("KokkosBlas::Test::gemvt_double_int"); - // test_gemv ("T"); + // test_gemv ("T"); // Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas2_gemv_util.hpp b/blas/unit_test/Test_Blas2_gemv_util.hpp index 80bf76b0dd..e28310c8eb 100644 --- a/blas/unit_test/Test_Blas2_gemv_util.hpp +++ b/blas/unit_test/Test_Blas2_gemv_util.hpp @@ -23,8 +23,9 @@ namespace Test { -template ::value> +template ::value> using simd_vector = KokkosBatched::Vector, length>; @@ -320,7 +321,7 @@ struct GEMVTest { SCALAR_COEF) \ using PREFIX##_##NAME##_gemv_test = \ ::Test::GEMVTest<::Test::FACTORY, SCALAR_A, SCALAR_X, SCALAR_Y, \ - TestExecSpace, SCALAR_COEF>; \ + TestDevice, SCALAR_COEF>; \ TEST_F(TestCategory, PREFIX##_gemv_nt_##NAME) { \ PREFIX##_##NAME##_gemv_test::run("N"); \ } \ diff --git a/blas/unit_test/Test_Blas2_ger.hpp b/blas/unit_test/Test_Blas2_ger.hpp index 6bf44f98f8..abafd79ac9 100644 --- a/blas/unit_test/Test_Blas2_ger.hpp +++ b/blas/unit_test/Test_Blas2_ger.hpp @@ -1613,7 +1613,7 @@ int test_ger(const std::string& /*caseName*/) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, ger_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::ger_float"); - test_ger("test case ger_float"); + test_ger("test case ger_float"); Kokkos::Profiling::popRegion(); } #endif @@ -1624,8 +1624,7 @@ TEST_F(TestCategory, ger_float) { TEST_F(TestCategory, ger_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::ger_complex_float"); test_ger, Kokkos::complex, - Kokkos::complex, TestExecSpace>( - "test case ger_complex_float"); + Kokkos::complex, TestDevice>("test case ger_complex_float"); Kokkos::Profiling::popRegion(); } #endif @@ -1635,7 +1634,7 @@ TEST_F(TestCategory, ger_complex_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, ger_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::ger_double"); - test_ger("test case ger_double"); + test_ger("test case ger_double"); Kokkos::Profiling::popRegion(); } #endif @@ -1646,8 +1645,7 @@ TEST_F(TestCategory, ger_double) { TEST_F(TestCategory, ger_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::ger_complex_double"); test_ger, Kokkos::complex, - Kokkos::complex, TestExecSpace>( - "test case ger_complex_double"); + Kokkos::complex, TestDevice>("test case ger_complex_double"); Kokkos::Profiling::popRegion(); } #endif @@ -1657,7 +1655,7 @@ TEST_F(TestCategory, ger_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, ger_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::ger_int"); - test_ger("test case ger_int"); + test_ger("test case ger_int"); Kokkos::Profiling::popRegion(); } #endif @@ -1666,7 +1664,7 @@ TEST_F(TestCategory, ger_int) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, ger_double_int_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::ger_double_int_float"); - test_ger("test case ger_double_int_float"); + test_ger("test case ger_double_int_float"); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas2_syr.hpp b/blas/unit_test/Test_Blas2_syr.hpp index e7b5e7de3d..b57061ce8f 100644 --- a/blas/unit_test/Test_Blas2_syr.hpp +++ b/blas/unit_test/Test_Blas2_syr.hpp @@ -1777,7 +1777,7 @@ int test_syr(const std::string& /*caseName*/) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, syr_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::syr_float"); - test_syr("test case syr_float"); + test_syr("test case syr_float"); Kokkos::Profiling::popRegion(); } #endif @@ -1787,7 +1787,7 @@ TEST_F(TestCategory, syr_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, syr_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::syr_complex_float"); - test_syr, Kokkos::complex, TestExecSpace>( + test_syr, Kokkos::complex, TestDevice>( "test case syr_complex_float"); Kokkos::Profiling::popRegion(); } @@ -1798,7 +1798,7 @@ TEST_F(TestCategory, syr_complex_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, syr_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::syr_double"); - test_syr("test case syr_double"); + test_syr("test case syr_double"); Kokkos::Profiling::popRegion(); } #endif @@ -1808,7 +1808,7 @@ TEST_F(TestCategory, syr_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, syr_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::syr_complex_double"); - test_syr, Kokkos::complex, TestExecSpace>( + test_syr, Kokkos::complex, TestDevice>( "test case syr_complex_double"); Kokkos::Profiling::popRegion(); } @@ -1819,7 +1819,7 @@ TEST_F(TestCategory, syr_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, syr_int) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::syr_int"); - test_syr("test case syr_int"); + test_syr("test case syr_int"); Kokkos::Profiling::popRegion(); } #endif @@ -1828,7 +1828,7 @@ TEST_F(TestCategory, syr_int) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS) TEST_F(TestCategory, syr_int_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::syr_int_float"); - test_syr("test case syr_int_float"); + test_syr("test case syr_int_float"); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas3_gemm.hpp b/blas/unit_test/Test_Blas3_gemm.hpp index bc2d881600..cd91bc6d95 100644 --- a/blas/unit_test/Test_Blas3_gemm.hpp +++ b/blas/unit_test/Test_Blas3_gemm.hpp @@ -81,7 +81,7 @@ void build_matrices(const int M, const int N, const int K, const typename ViewTypeA::value_type alpha, ViewTypeA& A, ViewTypeB& B, const typename ViewTypeA::value_type beta, ViewTypeC& C, ViewTypeC& Cref) { - using execution_space = typename TestExecSpace::execution_space; + using execution_space = typename TestDevice::execution_space; using ScalarA = typename ViewTypeA::non_const_value_type; using ScalarB = typename ViewTypeB::non_const_value_type; using ScalarC = typename ViewTypeC::non_const_value_type; @@ -337,10 +337,10 @@ void impl_test_stream_gemm_psge2(const int M, const int N, const int K, template void test_gemm() { - typedef typename TestExecSpace::execution_space execution_space; - typedef Kokkos::View view_type_a; - typedef Kokkos::View view_type_b; - typedef Kokkos::View view_type_c; + typedef typename TestDevice::execution_space execution_space; + typedef Kokkos::View view_type_a; + typedef Kokkos::View view_type_b; + typedef Kokkos::View view_type_c; std::vector modes = {"N", "T"}; if (std::is_same>::value || std::is_same>::value) @@ -350,37 +350,32 @@ void test_gemm() { for (Scalar beta : betas) { for (auto amode : modes) { for (auto bmode : modes) { - Test::impl_test_gemm(amode, bmode, 0, 0, 0, alpha, beta); + Test::impl_test_gemm( + amode, bmode, 0, 0, 0, alpha, beta); // BMK: N = 1 exercises the special GEMV code path in GEMM (currently, // only for modes N/N) - Test::impl_test_gemm(amode, bmode, 50, 1, 40, alpha, - beta); + Test::impl_test_gemm( + amode, bmode, 50, 1, 40, alpha, beta); // LBV: K = 0 exercise the quick return code path in GEMM - Test::impl_test_gemm(amode, bmode, 20, 14, 0, alpha, - beta); - Test::impl_test_gemm(amode, bmode, 13, 15, 17, alpha, - beta); - Test::impl_test_gemm(amode, bmode, 179, 15, 211, alpha, - beta); - Test::impl_test_gemm(amode, bmode, 12, 3071, 517, alpha, - beta); + Test::impl_test_gemm( + amode, bmode, 20, 14, 0, alpha, beta); + Test::impl_test_gemm( + amode, bmode, 13, 15, 17, alpha, beta); + Test::impl_test_gemm( + amode, bmode, 179, 15, 211, alpha, beta); + Test::impl_test_gemm( + amode, bmode, 12, 3071, 517, alpha, beta); } } } auto pool_size = execution_space().concurrency(); if (pool_size >= 2) { - Test::impl_test_stream_gemm_psge2( + Test::impl_test_stream_gemm_psge2( 53, 42, 17, 4.5, 3.0); // General code path - Test::impl_test_stream_gemm_psge2( + Test::impl_test_stream_gemm_psge2( 13, 1, 17, 4.5, 3.0); // gemv based gemm code path - Test::impl_test_stream_gemm_psge2( + Test::impl_test_stream_gemm_psge2( 7, 13, 17, 4.5, 3.0); // dot based gemm code path } @@ -402,8 +397,8 @@ void test_gemm_enabled_layouts() { template void test_gemm_mixed_scalars() { - using Matrix1 = Kokkos::View; - using Matrix2 = Kokkos::View; + using Matrix1 = Kokkos::View; + using Matrix2 = Kokkos::View; const int dim1 = 400, dim2 = 1000; @@ -416,8 +411,8 @@ void test_gemm_mixed_scalars() { Kokkos::deep_copy(B, Kokkos::ArithTraits::one()); Kokkos::deep_copy(C, Kokkos::ArithTraits::one()); - KokkosBlas::gemm(TestExecSpace(), "N", "N", 1.0, D, A, 0.0, C); - KokkosBlas::gemm(TestExecSpace(), "N", "T", 1.0, C, D, 0.0, B); + KokkosBlas::gemm(TestDevice(), "N", "N", 1.0, D, A, 0.0, C); + KokkosBlas::gemm(TestDevice(), "N", "T", 1.0, C, D, 0.0, B); } #if defined(KOKKOSKERNELS_INST_FLOAT) || \ diff --git a/blas/unit_test/Test_Blas3_trmm.hpp b/blas/unit_test/Test_Blas3_trmm.hpp index 188999c5e0..a186835aaa 100644 --- a/blas/unit_test/Test_Blas3_trmm.hpp +++ b/blas/unit_test/Test_Blas3_trmm.hpp @@ -259,42 +259,42 @@ int test_trmm(const char* mode, ScalarA alpha) { TEST_F(TestCategory, trmm_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_float"); float alpha = 1.0f; - test_trmm("LLNN", alpha); - test_trmm("LLNU", alpha); - test_trmm("LLTN", alpha); - test_trmm("LLTU", alpha); - test_trmm("LUNN", alpha); - test_trmm("LUNU", alpha); - test_trmm("LUTN", alpha); - test_trmm("LUTU", alpha); - - test_trmm("RLNN", alpha); - test_trmm("RLNU", alpha); - test_trmm("RLTN", alpha); - test_trmm("RLTU", alpha); - test_trmm("RUNN", alpha); - test_trmm("RUNU", alpha); - test_trmm("RUTN", alpha); - test_trmm("RUTU", alpha); + test_trmm("LLNN", alpha); + test_trmm("LLNU", alpha); + test_trmm("LLTN", alpha); + test_trmm("LLTU", alpha); + test_trmm("LUNN", alpha); + test_trmm("LUNU", alpha); + test_trmm("LUTN", alpha); + test_trmm("LUTU", alpha); + + test_trmm("RLNN", alpha); + test_trmm("RLNU", alpha); + test_trmm("RLTN", alpha); + test_trmm("RLTU", alpha); + test_trmm("RUNN", alpha); + test_trmm("RUNU", alpha); + test_trmm("RUTN", alpha); + test_trmm("RUTU", alpha); alpha = 4.5f; - test_trmm("LLNN", alpha); - test_trmm("LLNU", alpha); - test_trmm("LLTN", alpha); - test_trmm("LLTU", alpha); - test_trmm("LUNN", alpha); - test_trmm("LUNU", alpha); - test_trmm("LUTN", alpha); - test_trmm("LUTU", alpha); - - test_trmm("RLNN", alpha); - test_trmm("RLNU", alpha); - test_trmm("RLTN", alpha); - test_trmm("RLTU", alpha); - test_trmm("RUNN", alpha); - test_trmm("RUNU", alpha); - test_trmm("RUTN", alpha); - test_trmm("RUTU", alpha); + test_trmm("LLNN", alpha); + test_trmm("LLNU", alpha); + test_trmm("LLTN", alpha); + test_trmm("LLTU", alpha); + test_trmm("LUNN", alpha); + test_trmm("LUNU", alpha); + test_trmm("LUTN", alpha); + test_trmm("LUTU", alpha); + + test_trmm("RLNN", alpha); + test_trmm("RLNU", alpha); + test_trmm("RLTN", alpha); + test_trmm("RLTU", alpha); + test_trmm("RUNN", alpha); + test_trmm("RUNU", alpha); + test_trmm("RUTN", alpha); + test_trmm("RUTU", alpha); Kokkos::Profiling::popRegion(); } #endif @@ -305,42 +305,42 @@ TEST_F(TestCategory, trmm_float) { TEST_F(TestCategory, trmm_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_double"); double alpha = 1.0; - test_trmm("LLNN", alpha); - test_trmm("LLNU", alpha); - test_trmm("LLTN", alpha); - test_trmm("LLTU", alpha); - test_trmm("LUNN", alpha); - test_trmm("LUNU", alpha); - test_trmm("LUTN", alpha); - test_trmm("LUTU", alpha); - - test_trmm("RLNN", alpha); - test_trmm("RLNU", alpha); - test_trmm("RLTN", alpha); - test_trmm("RLTU", alpha); - test_trmm("RUNN", alpha); - test_trmm("RUNU", alpha); - test_trmm("RUTN", alpha); - test_trmm("RUTU", alpha); + test_trmm("LLNN", alpha); + test_trmm("LLNU", alpha); + test_trmm("LLTN", alpha); + test_trmm("LLTU", alpha); + test_trmm("LUNN", alpha); + test_trmm("LUNU", alpha); + test_trmm("LUTN", alpha); + test_trmm("LUTU", alpha); + + test_trmm("RLNN", alpha); + test_trmm("RLNU", alpha); + test_trmm("RLTN", alpha); + test_trmm("RLTU", alpha); + test_trmm("RUNN", alpha); + test_trmm("RUNU", alpha); + test_trmm("RUTN", alpha); + test_trmm("RUTU", alpha); alpha = 4.5; - test_trmm("LLNN", alpha); - test_trmm("LLNU", alpha); - test_trmm("LLTN", alpha); - test_trmm("LLTU", alpha); - test_trmm("LUNN", alpha); - test_trmm("LUNU", alpha); - test_trmm("LUTN", alpha); - test_trmm("LUTU", alpha); - - test_trmm("RLNN", alpha); - test_trmm("RLNU", alpha); - test_trmm("RLTN", alpha); - test_trmm("RLTU", alpha); - test_trmm("RUNN", alpha); - test_trmm("RUNU", alpha); - test_trmm("RUTN", alpha); - test_trmm("RUTU", alpha); + test_trmm("LLNN", alpha); + test_trmm("LLNU", alpha); + test_trmm("LLTN", alpha); + test_trmm("LLTU", alpha); + test_trmm("LUNN", alpha); + test_trmm("LUNU", alpha); + test_trmm("LUTN", alpha); + test_trmm("LUTU", alpha); + + test_trmm("RLNN", alpha); + test_trmm("RLNU", alpha); + test_trmm("RLTN", alpha); + test_trmm("RLTU", alpha); + test_trmm("RUNN", alpha); + test_trmm("RUNU", alpha); + test_trmm("RUTN", alpha); + test_trmm("RUTU", alpha); Kokkos::Profiling::popRegion(); } #endif @@ -351,194 +351,194 @@ TEST_F(TestCategory, trmm_double) { ///////////////// alpha 1.0 ///////////////// TEST_F(TestCategory, trmm_complex_double_LLNN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LLNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLNN", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LLNU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LLNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLNU", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LLCN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LLCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLCN", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LLCU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LLCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLCU", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LUNN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LUNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUNN", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LUNU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LUNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUNU", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LUCN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LUCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUCN", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LUCU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LUCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUCU", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RLNN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RLNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLNN", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RLNU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RLNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLNU", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RLCN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RLCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLCN", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RLCU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RLCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLCU", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RUNN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RUNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUNN", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RUNU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RUNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUNU", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RUCN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RUCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUCN", 1.0); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RUCU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RUCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUCU", 1.0); Kokkos::Profiling::popRegion(); } ///////////////// alpha 4.5 ///////////////// TEST_F(TestCategory, trmm_complex_double_LLNN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LLNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLNN", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LLNU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LLNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLNU", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LLCN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LLCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLCN", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LLCU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LLCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLCU", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LUNN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LUNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUNN", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LUNU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LUNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUNU", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LUCN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LUCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUCN", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_LUCU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_LUCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUCU", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RLNN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RLNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLNN", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RLNU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RLNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLNU", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RLCN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RLCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLCN", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RLCU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RLCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLCU", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RUNN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RUNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUNN", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RUNU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RUNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUNU", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RUCN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RUCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUCN", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_double_RUCU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_double_RUCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUCU", Kokkos::complex(4.5, 0.0)); Kokkos::Profiling::popRegion(); } @@ -550,194 +550,194 @@ TEST_F(TestCategory, trmm_complex_double_RUCU_fourfive) { ///////////////// alpha 1.0 ///////////////// TEST_F(TestCategory, trmm_complex_float_LLNN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LLNN"); - test_trmm, Kokkos::complex, TestExecSpace>( - "LLNN", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("LLNN", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LLNU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LLNU"); - test_trmm, Kokkos::complex, TestExecSpace>( - "LLNU", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("LLNU", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LLCN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LLCN"); - test_trmm, Kokkos::complex, TestExecSpace>( - "LLCN", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("LLCN", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LLCU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LLCU"); - test_trmm, Kokkos::complex, TestExecSpace>( - "LLCU", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("LLCU", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LUNN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LUNN"); - test_trmm, Kokkos::complex, TestExecSpace>( - "LUNN", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("LUNN", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LUNU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LUNU"); - test_trmm, Kokkos::complex, TestExecSpace>( - "LUNU", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("LUNU", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LUCN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LUCN"); - test_trmm, Kokkos::complex, TestExecSpace>( - "LUCN", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("LUCN", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LUCU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LUCU"); - test_trmm, Kokkos::complex, TestExecSpace>( - "LUCU", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("LUCU", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RLNN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RLNN"); - test_trmm, Kokkos::complex, TestExecSpace>( - "RLNN", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("RLNN", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RLNU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RLNU"); - test_trmm, Kokkos::complex, TestExecSpace>( - "RLNU", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("RLNU", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RLCN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RLCN"); - test_trmm, Kokkos::complex, TestExecSpace>( - "RLCN", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("RLCN", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RLCU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RLCU"); - test_trmm, Kokkos::complex, TestExecSpace>( - "RLCU", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("RLCU", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RUNN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RUNN"); - test_trmm, Kokkos::complex, TestExecSpace>( - "RUNN", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("RUNN", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RUNU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RUNU"); - test_trmm, Kokkos::complex, TestExecSpace>( - "RUNU", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("RUNU", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RUCN_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RUCN"); - test_trmm, Kokkos::complex, TestExecSpace>( - "RUCN", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("RUCN", + 1.0f); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RUCU_one) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RUCU"); - test_trmm, Kokkos::complex, TestExecSpace>( - "RUCU", 1.0f); + test_trmm, Kokkos::complex, TestDevice>("RUCU", + 1.0f); Kokkos::Profiling::popRegion(); } ///////////////// alpha 4.5 ///////////////// TEST_F(TestCategory, trmm_complex_float_LLNN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LLNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLNN", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LLNU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LLNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLNU", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LLCN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LLCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLCN", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LLCU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LLCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LLCU", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LUNN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LUNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUNN", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LUNU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LUNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUNU", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LUCN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LUCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUCN", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_LUCU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_LUCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "LUCU", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RLNN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RLNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLNN", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RLNU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RLNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLNU", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RLCN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RLCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLCN", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RLCU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RLCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RLCU", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RUNN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RUNN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUNN", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RUNU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RUNU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUNU", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RUCN_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RUCN"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUCN", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, trmm_complex_float_RUCU_fourfive) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trmm_complex_float_RUCU"); - test_trmm, Kokkos::complex, TestExecSpace>( + test_trmm, Kokkos::complex, TestDevice>( "RUCU", Kokkos::complex(4.5f, 0.0f)); Kokkos::Profiling::popRegion(); } diff --git a/blas/unit_test/Test_Blas3_trsm.hpp b/blas/unit_test/Test_Blas3_trsm.hpp index 5edd175652..9a00f22263 100644 --- a/blas/unit_test/Test_Blas3_trsm.hpp +++ b/blas/unit_test/Test_Blas3_trsm.hpp @@ -261,42 +261,42 @@ int test_trsm(const char* mode, ScalarA alpha) { TEST_F(TestCategory, trsm_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trsm_float"); float alpha = 1.0f; - test_trsm("LLNN", alpha); - test_trsm("LLNU", alpha); - test_trsm("LLTN", alpha); - test_trsm("LLTU", alpha); - test_trsm("LUNN", alpha); - test_trsm("LUNU", alpha); - test_trsm("LUTN", alpha); - test_trsm("LUTU", alpha); - - test_trsm("RLNN", alpha); - test_trsm("RLNU", alpha); - test_trsm("RLTN", alpha); - test_trsm("RLTU", alpha); - test_trsm("RUNN", alpha); - test_trsm("RUNU", alpha); - test_trsm("RUTN", alpha); - test_trsm("RUTU", alpha); + test_trsm("LLNN", alpha); + test_trsm("LLNU", alpha); + test_trsm("LLTN", alpha); + test_trsm("LLTU", alpha); + test_trsm("LUNN", alpha); + test_trsm("LUNU", alpha); + test_trsm("LUTN", alpha); + test_trsm("LUTU", alpha); + + test_trsm("RLNN", alpha); + test_trsm("RLNU", alpha); + test_trsm("RLTN", alpha); + test_trsm("RLTU", alpha); + test_trsm("RUNN", alpha); + test_trsm("RUNU", alpha); + test_trsm("RUTN", alpha); + test_trsm("RUTU", alpha); alpha = 4.5f; - test_trsm("LLNN", alpha); - test_trsm("LLNU", alpha); - test_trsm("LLTN", alpha); - test_trsm("LLTU", alpha); - test_trsm("LUNN", alpha); - test_trsm("LUNU", alpha); - test_trsm("LUTN", alpha); - test_trsm("LUTU", alpha); - - test_trsm("RLNN", alpha); - test_trsm("RLNU", alpha); - test_trsm("RLTN", alpha); - test_trsm("RLTU", alpha); - test_trsm("RUNN", alpha); - test_trsm("RUNU", alpha); - test_trsm("RUTN", alpha); - test_trsm("RUTU", alpha); + test_trsm("LLNN", alpha); + test_trsm("LLNU", alpha); + test_trsm("LLTN", alpha); + test_trsm("LLTU", alpha); + test_trsm("LUNN", alpha); + test_trsm("LUNU", alpha); + test_trsm("LUTN", alpha); + test_trsm("LUTU", alpha); + + test_trsm("RLNN", alpha); + test_trsm("RLNU", alpha); + test_trsm("RLTN", alpha); + test_trsm("RLTU", alpha); + test_trsm("RUNN", alpha); + test_trsm("RUNU", alpha); + test_trsm("RUTN", alpha); + test_trsm("RUTU", alpha); Kokkos::Profiling::popRegion(); } #endif @@ -307,42 +307,42 @@ TEST_F(TestCategory, trsm_float) { TEST_F(TestCategory, trsm_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trsm_double"); double alpha = 1.0; - test_trsm("LLNN", alpha); - test_trsm("LLNU", alpha); - test_trsm("LLTN", alpha); - test_trsm("LLTU", alpha); - test_trsm("LUNN", alpha); - test_trsm("LUNU", alpha); - test_trsm("LUTN", alpha); - test_trsm("LUTU", alpha); - - test_trsm("RLNN", alpha); - test_trsm("RLNU", alpha); - test_trsm("RLTN", alpha); - test_trsm("RLTU", alpha); - test_trsm("RUNN", alpha); - test_trsm("RUNU", alpha); - test_trsm("RUTN", alpha); - test_trsm("RUTU", alpha); + test_trsm("LLNN", alpha); + test_trsm("LLNU", alpha); + test_trsm("LLTN", alpha); + test_trsm("LLTU", alpha); + test_trsm("LUNN", alpha); + test_trsm("LUNU", alpha); + test_trsm("LUTN", alpha); + test_trsm("LUTU", alpha); + + test_trsm("RLNN", alpha); + test_trsm("RLNU", alpha); + test_trsm("RLTN", alpha); + test_trsm("RLTU", alpha); + test_trsm("RUNN", alpha); + test_trsm("RUNU", alpha); + test_trsm("RUTN", alpha); + test_trsm("RUTU", alpha); alpha = 4.5; - test_trsm("LLNN", alpha); - test_trsm("LLNU", alpha); - test_trsm("LLTN", alpha); - test_trsm("LLTU", alpha); - test_trsm("LUNN", alpha); - test_trsm("LUNU", alpha); - test_trsm("LUTN", alpha); - test_trsm("LUTU", alpha); - - test_trsm("RLNN", alpha); - test_trsm("RLNU", alpha); - test_trsm("RLTN", alpha); - test_trsm("RLTU", alpha); - test_trsm("RUNN", alpha); - test_trsm("RUNU", alpha); - test_trsm("RUTN", alpha); - test_trsm("RUTU", alpha); + test_trsm("LLNN", alpha); + test_trsm("LLNU", alpha); + test_trsm("LLTN", alpha); + test_trsm("LLTU", alpha); + test_trsm("LUNN", alpha); + test_trsm("LUNU", alpha); + test_trsm("LUTN", alpha); + test_trsm("LUTU", alpha); + + test_trsm("RLNN", alpha); + test_trsm("RLNU", alpha); + test_trsm("RLTN", alpha); + test_trsm("RLTU", alpha); + test_trsm("RUNN", alpha); + test_trsm("RUNU", alpha); + test_trsm("RUTN", alpha); + test_trsm("RUTU", alpha); Kokkos::Profiling::popRegion(); } #endif @@ -353,73 +353,73 @@ TEST_F(TestCategory, trsm_double) { TEST_F(TestCategory, trsm_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trsm_complex_double"); Kokkos::complex alpha = 1.0; - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LLNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LLNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LLCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LLCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LUNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LUNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LUCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LUCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RLNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RLNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RLCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RLCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RUNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RUNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RUCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RUCU", alpha); alpha = Kokkos::complex(4.5, 0.0); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LLNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LLNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LLCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LLCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LUNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LUNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LUCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "LUCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RLNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RLNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RLCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RLCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RUNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RUNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RUCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( + test_trsm, Kokkos::complex, TestDevice>( "RUCU", alpha); Kokkos::Profiling::popRegion(); } @@ -431,74 +431,74 @@ TEST_F(TestCategory, trsm_complex_double) { TEST_F(TestCategory, trsm_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trsm_complex_float"); Kokkos::complex alpha = 1.0f; - test_trsm, Kokkos::complex, TestExecSpace>( - "LLNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LLNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LLCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LLCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LUNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LUNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LUCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LUCU", alpha); - - test_trsm, Kokkos::complex, TestExecSpace>( - "RLNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RLNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RLCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RLCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RUNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RUNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RUCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RUCU", alpha); + test_trsm, Kokkos::complex, TestDevice>("LLNN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LLNU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LLCN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LLCU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LUNN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LUNU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LUCN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LUCU", + alpha); + + test_trsm, Kokkos::complex, TestDevice>("RLNN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RLNU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RLCN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RLCU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RUNN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RUNU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RUCN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RUCU", + alpha); alpha = Kokkos::complex(4.5f, 0.0f); - test_trsm, Kokkos::complex, TestExecSpace>( - "LLNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LLNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LLCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LLCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LUNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LUNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LUCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "LUCU", alpha); - - test_trsm, Kokkos::complex, TestExecSpace>( - "RLNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RLNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RLCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RLCU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RUNN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RUNU", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RUCN", alpha); - test_trsm, Kokkos::complex, TestExecSpace>( - "RUCU", alpha); + test_trsm, Kokkos::complex, TestDevice>("LLNN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LLNU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LLCN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LLCU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LUNN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LUNU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LUCN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("LUCU", + alpha); + + test_trsm, Kokkos::complex, TestDevice>("RLNN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RLNU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RLCN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RLCU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RUNN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RUNU", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RUCN", + alpha); + test_trsm, Kokkos::complex, TestDevice>("RUCU", + alpha); Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas_Newton.hpp b/blas/unit_test/Test_Blas_Newton.hpp index 001a6b2395..5bb6946e99 100644 --- a/blas/unit_test/Test_Blas_Newton.hpp +++ b/blas/unit_test/Test_Blas_Newton.hpp @@ -191,8 +191,8 @@ int test_intersection() { template int test_newton() { - Test::test_logistic(); - Test::test_intersection(); + Test::test_logistic(); + Test::test_intersection(); return 1; } diff --git a/blas/unit_test/Test_Blas_gesv.hpp b/blas/unit_test/Test_Blas_gesv.hpp index 710102137e..57ee6373bf 100644 --- a/blas/unit_test/Test_Blas_gesv.hpp +++ b/blas/unit_test/Test_Blas_gesv.hpp @@ -343,15 +343,15 @@ int test_gesv_mrhs(const char* mode) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, gesv_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gesv_float"); - test_gesv("N"); // No pivoting - test_gesv("Y"); // Partial pivoting + test_gesv("N"); // No pivoting + test_gesv("Y"); // Partial pivoting Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, gesv_mrhs_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gesv_mrhs_float"); - test_gesv_mrhs("N"); // No pivoting - test_gesv_mrhs("Y"); // Partial pivoting + test_gesv_mrhs("N"); // No pivoting + test_gesv_mrhs("Y"); // Partial pivoting Kokkos::Profiling::popRegion(); } #endif @@ -361,15 +361,15 @@ TEST_F(TestCategory, gesv_mrhs_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, gesv_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gesv_double"); - test_gesv("N"); // No pivoting - test_gesv("Y"); // Partial pivoting + test_gesv("N"); // No pivoting + test_gesv("Y"); // Partial pivoting Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, gesv_mrhs_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gesv_mrhs_double"); - test_gesv_mrhs("N"); // No pivoting - test_gesv_mrhs("Y"); // Partial pivoting + test_gesv_mrhs("N"); // No pivoting + test_gesv_mrhs("Y"); // Partial pivoting Kokkos::Profiling::popRegion(); } #endif @@ -379,16 +379,15 @@ TEST_F(TestCategory, gesv_mrhs_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, gesv_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gesv_complex_double"); - test_gesv, TestExecSpace>("N"); // No pivoting - test_gesv, TestExecSpace>("Y"); // Partial pivoting + test_gesv, TestDevice>("N"); // No pivoting + test_gesv, TestDevice>("Y"); // Partial pivoting Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, gesv_mrhs_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gesv_mrhs_complex_double"); - test_gesv_mrhs, TestExecSpace>("N"); // No pivoting - test_gesv_mrhs, TestExecSpace>( - "Y"); // Partial pivoting + test_gesv_mrhs, TestDevice>("N"); // No pivoting + test_gesv_mrhs, TestDevice>("Y"); // Partial pivoting Kokkos::Profiling::popRegion(); } #endif @@ -398,16 +397,15 @@ TEST_F(TestCategory, gesv_mrhs_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, gesv_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gesv_complex_float"); - test_gesv, TestExecSpace>("N"); // No pivoting - test_gesv, TestExecSpace>("Y"); // Partial pivoting + test_gesv, TestDevice>("N"); // No pivoting + test_gesv, TestDevice>("Y"); // Partial pivoting Kokkos::Profiling::popRegion(); } TEST_F(TestCategory, gesv_mrhs_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::gesv_mrhs_complex_float"); - test_gesv_mrhs, TestExecSpace>("N"); // No pivoting - test_gesv_mrhs, TestExecSpace>( - "Y"); // Partial pivoting + test_gesv_mrhs, TestDevice>("N"); // No pivoting + test_gesv_mrhs, TestDevice>("Y"); // Partial pivoting Kokkos::Profiling::popRegion(); } #endif diff --git a/blas/unit_test/Test_Blas_serial_axpy.hpp b/blas/unit_test/Test_Blas_serial_axpy.hpp index e6a571b7de..427925a3dc 100644 --- a/blas/unit_test/Test_Blas_serial_axpy.hpp +++ b/blas/unit_test/Test_Blas_serial_axpy.hpp @@ -156,35 +156,35 @@ int test_blas_serial_axpy() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, serial_axpy_float_float) { - test_blas_serial_axpy(); + test_blas_serial_axpy(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, serial_axpy_double_double) { - test_blas_serial_axpy(); + test_blas_serial_axpy(); } #endif #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, serial_axpy_dcomplex_dcomplex) { - test_blas_serial_axpy, + test_blas_serial_axpy, Kokkos::complex >(); } TEST_F(TestCategory, serial_axpy_dcomplex_double) { - test_blas_serial_axpy, double>(); + test_blas_serial_axpy, double>(); } #endif #if defined(KOKKOSKERNELS_INST_COMPLEX_FLOAT) TEST_F(TestCategory, serial_axpy_fcomplex_fcomplex) { - test_blas_serial_axpy, + test_blas_serial_axpy, Kokkos::complex >(); } TEST_F(TestCategory, serial_axpy_fcomplex_float) { - test_blas_serial_axpy, float>(); + test_blas_serial_axpy, float>(); } #endif diff --git a/blas/unit_test/Test_Blas_serial_nrm2.hpp b/blas/unit_test/Test_Blas_serial_nrm2.hpp index 1e0a7a4ffa..147df52353 100644 --- a/blas/unit_test/Test_Blas_serial_nrm2.hpp +++ b/blas/unit_test/Test_Blas_serial_nrm2.hpp @@ -263,25 +263,25 @@ int test_blas_serial_nrm2() { #if defined(KOKKOSKERNELS_INST_FLOAT) TEST_F(TestCategory, serial_nrm2_float_float) { - test_blas_serial_nrm2(); + test_blas_serial_nrm2(); } #endif #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, serial_nrm2_double_double) { - test_blas_serial_nrm2(); + test_blas_serial_nrm2(); } #endif #if defined(KOKKOSKERNELS_INST_COMPLEX_FLOAT) TEST_F(TestCategory, serial_nrm2_fcomplex_float) { - test_blas_serial_nrm2 >(); + test_blas_serial_nrm2 >(); } #endif #if defined(KOKKOSKERNELS_INST_COMPLEX_DOUBLE) TEST_F(TestCategory, serial_nrm2_dcomplex_dcomplex) { - test_blas_serial_nrm2 >(); + test_blas_serial_nrm2 >(); } #endif diff --git a/blas/unit_test/Test_Blas_trtri.hpp b/blas/unit_test/Test_Blas_trtri.hpp index 0bebb9edf0..aa12fa959b 100644 --- a/blas/unit_test/Test_Blas_trtri.hpp +++ b/blas/unit_test/Test_Blas_trtri.hpp @@ -363,10 +363,10 @@ int test_trtri(const char* mode) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, trtri_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trtri_float"); - test_trtri("UN"); - test_trtri("UU"); - test_trtri("LN"); - test_trtri("LU"); + test_trtri("UN"); + test_trtri("UU"); + test_trtri("LN"); + test_trtri("LU"); Kokkos::Profiling::popRegion(); } #endif @@ -376,10 +376,10 @@ TEST_F(TestCategory, trtri_float) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, trtri_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trtri_double"); - test_trtri("UN"); - test_trtri("UU"); - test_trtri("LN"); - test_trtri("LU"); + test_trtri("UN"); + test_trtri("UU"); + test_trtri("LN"); + test_trtri("LU"); Kokkos::Profiling::popRegion(); } #endif @@ -389,10 +389,10 @@ TEST_F(TestCategory, trtri_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, trtri_complex_double) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trtri_complex_double"); - test_trtri, TestExecSpace>("UN"); - test_trtri, TestExecSpace>("UU"); - test_trtri, TestExecSpace>("LN"); - test_trtri, TestExecSpace>("LU"); + test_trtri, TestDevice>("UN"); + test_trtri, TestDevice>("UU"); + test_trtri, TestDevice>("LN"); + test_trtri, TestDevice>("LU"); Kokkos::Profiling::popRegion(); } #endif @@ -402,10 +402,10 @@ TEST_F(TestCategory, trtri_complex_double) { !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) TEST_F(TestCategory, trtri_complex_float) { Kokkos::Profiling::pushRegion("KokkosBlas::Test::trtri_complex_float"); - test_trtri, TestExecSpace>("UN"); - test_trtri, TestExecSpace>("UU"); - test_trtri, TestExecSpace>("LN"); - test_trtri, TestExecSpace>("LU"); + test_trtri, TestDevice>("UN"); + test_trtri, TestDevice>("UU"); + test_trtri, TestDevice>("LN"); + test_trtri, TestDevice>("LU"); Kokkos::Profiling::popRegion(); } #endif diff --git a/common/unit_test/Test_Common_ArithTraits.hpp b/common/unit_test/Test_Common_ArithTraits.hpp index b5bf350847..37bb8fce80 100644 --- a/common/unit_test/Test_Common_ArithTraits.hpp +++ b/common/unit_test/Test_Common_ArithTraits.hpp @@ -1703,6 +1703,6 @@ void test_ArithTraits() { success = runAllArithTraitsHostTests(out, 0); EXPECT_TRUE(success); } -TEST_F(TestCategory, common_ArithTraits) { test_ArithTraits(); } +TEST_F(TestCategory, common_ArithTraits) { test_ArithTraits(); } #endif // KOKKOS_ARITHTRAITSTEST_HPP diff --git a/common/unit_test/Test_Common_IOUtils.hpp b/common/unit_test/Test_Common_IOUtils.hpp index c4e031adf4..1219304421 100644 --- a/common/unit_test/Test_Common_IOUtils.hpp +++ b/common/unit_test/Test_Common_IOUtils.hpp @@ -70,6 +70,6 @@ void testPrintView() { "[2x2 multi-vector]\n"); } -TEST_F(TestCategory, common_print_view) { testPrintView(); } +TEST_F(TestCategory, common_print_view) { testPrintView(); } #endif // KOKKOSKERNELS_IOTEST_HPP diff --git a/common/unit_test/Test_Common_LowerBound.hpp b/common/unit_test/Test_Common_LowerBound.hpp index 3ff27da23c..476a44abf4 100644 --- a/common/unit_test/Test_Common_LowerBound.hpp +++ b/common/unit_test/Test_Common_LowerBound.hpp @@ -228,31 +228,31 @@ void test_lower_bound() { #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(int, TestExecSpace) +EXECUTE_TEST(int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(int64_t, TestExecSpace) +EXECUTE_TEST(int64_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(size_t, TestExecSpace) +EXECUTE_TEST(size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_FLOAT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(float, TestExecSpace) +EXECUTE_TEST(float, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_DOUBLE)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, TestExecSpace) +EXECUTE_TEST(double, TestDevice) #endif #undef EXECUTE_TEST diff --git a/common/unit_test/Test_Common_PrintConfiguration.hpp b/common/unit_test/Test_Common_PrintConfiguration.hpp index 07a55e152b..6638c6e398 100644 --- a/common/unit_test/Test_Common_PrintConfiguration.hpp +++ b/common/unit_test/Test_Common_PrintConfiguration.hpp @@ -57,7 +57,7 @@ void testPrintConfiguration() { } TEST_F(TestCategory, common_print_configuration) { - testPrintConfiguration(); + testPrintConfiguration(); } #endif // KOKKOSKERNELS_PRINTCONFIGURATIONTEST_HPP diff --git a/common/unit_test/Test_Common_Sorting.hpp b/common/unit_test/Test_Common_Sorting.hpp index 6969453395..eea69437d0 100644 --- a/common/unit_test/Test_Common_Sorting.hpp +++ b/common/unit_test/Test_Common_Sorting.hpp @@ -508,8 +508,8 @@ TEST_F(TestCategory, common_serial_radix) { // 1st arg is #arrays, 2nd arg is max subarray size size_t numArrays = 100; for (size_t arrayMax = 0; arrayMax < 1000; arrayMax = 1 + 4 * arrayMax) { - testSerialRadixSort(numArrays, arrayMax); - testSerialRadixSort(numArrays, arrayMax); + testSerialRadixSort(numArrays, arrayMax); + testSerialRadixSort(numArrays, arrayMax); } } @@ -518,10 +518,10 @@ TEST_F(TestCategory, common_serial_radix2) { // 1st arg is #arrays, 2nd arg is max subarray size size_t numArrays = 100; for (size_t arrayMax = 0; arrayMax < 1000; arrayMax = 1 + 4 * arrayMax) { - testSerialRadixSort2(numArrays, arrayMax); - testSerialRadixSort2(numArrays, arrayMax); - testSerialRadixSort2>(numArrays, - arrayMax); + testSerialRadixSort2(numArrays, arrayMax); + testSerialRadixSort2(numArrays, arrayMax); + testSerialRadixSort2>(numArrays, + arrayMax); } } @@ -530,8 +530,8 @@ TEST_F(TestCategory, common_team_bitonic) { // 1st arg is #arrays, 2nd arg is max subarray size size_t numArrays = 20; for (size_t arrayMax = 0; arrayMax < 10000; arrayMax = 1 + 4 * arrayMax) { - testTeamBitonicSort(numArrays, arrayMax); - testTeamBitonicSort(numArrays, arrayMax); + testTeamBitonicSort(numArrays, arrayMax); + testTeamBitonicSort(numArrays, arrayMax); } } @@ -540,27 +540,27 @@ TEST_F(TestCategory, common_team_bitonic2) { // 1st arg is #arrays, 2nd arg is max subarray size size_t numArrays = 20; for (size_t arrayMax = 0; arrayMax < 10000; arrayMax = 1 + 4 * arrayMax) { - testTeamBitonicSort2(numArrays, arrayMax); - testTeamBitonicSort2(numArrays, arrayMax); - testTeamBitonicSort2>(numArrays, - arrayMax); + testTeamBitonicSort2(numArrays, arrayMax); + testTeamBitonicSort2(numArrays, arrayMax); + testTeamBitonicSort2>(numArrays, + arrayMax); } } TEST_F(TestCategory, common_device_bitonic) { // Test device-level bitonic with some larger arrays - testBitonicSort(243743); - testBitonicSort(2157); - testBitonicSort(424); - testBitonicSort(5); - testBitonicSort(92314); - testBitonicSort(123); - testBitonicSort(60234); - testBitonicSort(53); + testBitonicSort(243743); + testBitonicSort(2157); + testBitonicSort(424); + testBitonicSort(5); + testBitonicSort(92314); + testBitonicSort(123); + testBitonicSort(60234); + testBitonicSort(53); // Test custom comparator: ">" instead of "<" to sort descending - testBitonicSortDescending(); + testBitonicSortDescending(); // Test custom comparator: lexicographic comparison of 3-element struct - testBitonicSortLexicographic(); + testBitonicSortLexicographic(); } #endif diff --git a/common/unit_test/Test_Common_UpperBound.hpp b/common/unit_test/Test_Common_UpperBound.hpp index a6d3b24d84..9e431285fd 100644 --- a/common/unit_test/Test_Common_UpperBound.hpp +++ b/common/unit_test/Test_Common_UpperBound.hpp @@ -219,31 +219,31 @@ void test_upper_bound() { #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(int, TestExecSpace) +EXECUTE_TEST(int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(int64_t, TestExecSpace) +EXECUTE_TEST(int64_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(size_t, TestExecSpace) +EXECUTE_TEST(size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_FLOAT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(float, TestExecSpace) +EXECUTE_TEST(float, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_DOUBLE)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, TestExecSpace) +EXECUTE_TEST(double, TestDevice) #endif #undef EXECUTE_TEST diff --git a/common/unit_test/Test_Common_set_bit_count.hpp b/common/unit_test/Test_Common_set_bit_count.hpp index dd65ced821..6e2c6e80b6 100644 --- a/common/unit_test/Test_Common_set_bit_count.hpp +++ b/common/unit_test/Test_Common_set_bit_count.hpp @@ -218,35 +218,35 @@ void test_ffs() { } TEST_F(TestCategory, common_set_bit_count) { - test_set_bit_count(); - test_set_bit_count(); - test_set_bit_count(); - test_set_bit_count(); - - test_set_bit_count(); - test_set_bit_count(); - test_set_bit_count(); - test_set_bit_count(); - - test_set_bit_count(); - test_set_bit_count(); - test_set_bit_count(); - test_set_bit_count(); + test_set_bit_count(); + test_set_bit_count(); + test_set_bit_count(); + test_set_bit_count(); + + test_set_bit_count(); + test_set_bit_count(); + test_set_bit_count(); + test_set_bit_count(); + + test_set_bit_count(); + test_set_bit_count(); + test_set_bit_count(); + test_set_bit_count(); } TEST_F(TestCategory, common_ffs) { - test_ffs(); - test_ffs(); - test_ffs(); - test_ffs(); - - test_ffs(); - test_ffs(); - test_ffs(); - test_ffs(); - - test_ffs(); - test_ffs(); - test_ffs(); - test_ffs(); + test_ffs(); + test_ffs(); + test_ffs(); + test_ffs(); + + test_ffs(); + test_ffs(); + test_ffs(); + test_ffs(); + + test_ffs(); + test_ffs(); + test_ffs(); + test_ffs(); } diff --git a/graph/unit_test/Test_Graph_coarsen.hpp b/graph/unit_test/Test_Graph_coarsen.hpp index 6f0eda42f3..95f1533c88 100644 --- a/graph/unit_test/Test_Graph_coarsen.hpp +++ b/graph/unit_test/Test_Graph_coarsen.hpp @@ -422,7 +422,7 @@ void test_coarsen_random(lno_t numVerts, size_type nnz, lno_t bandwidth, defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, int, TestExecSpace) +EXECUTE_TEST(double, int, int, TestDevice) #endif #endif @@ -430,21 +430,21 @@ EXECUTE_TEST(double, int, int, TestExecSpace) defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, int, TestExecSpace) +EXECUTE_TEST(double, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, size_t, TestExecSpace) +EXECUTE_TEST(double, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, size_t, TestExecSpace) +EXECUTE_TEST(double, int64_t, size_t, TestDevice) #endif #endif diff --git a/graph/unit_test/Test_Graph_graph_color.hpp b/graph/unit_test/Test_Graph_graph_color.hpp index ee917e6ef4..5d4eec03ca 100644 --- a/graph/unit_test/Test_Graph_graph_color.hpp +++ b/graph/unit_test/Test_Graph_graph_color.hpp @@ -194,28 +194,28 @@ void test_coloring(lno_t numRows, size_type nnz, lno_t bandwidth, defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(default_scalar, int, int, TestExecSpace) +EXECUTE_TEST(default_scalar, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(default_scalar, int64_t, int, TestExecSpace) +EXECUTE_TEST(default_scalar, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(default_scalar, int, size_t, TestExecSpace) +EXECUTE_TEST(default_scalar, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(default_scalar, int64_t, size_t, TestExecSpace) +EXECUTE_TEST(default_scalar, int64_t, size_t, TestDevice) #endif #undef EXECUTE_TEST diff --git a/graph/unit_test/Test_Graph_graph_color_deterministic.hpp b/graph/unit_test/Test_Graph_graph_color_deterministic.hpp index 3b3cadd71b..7bd3c4cd40 100644 --- a/graph/unit_test/Test_Graph_graph_color_deterministic.hpp +++ b/graph/unit_test/Test_Graph_graph_color_deterministic.hpp @@ -247,28 +247,28 @@ void test_coloring_deterministic(lno_t numRows, size_type nnz) { defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(default_scalar, int, int, TestExecSpace) +EXECUTE_TEST(default_scalar, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(default_scalar, int64_t, int, TestExecSpace) +EXECUTE_TEST(default_scalar, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(default_scalar, int, size_t, TestExecSpace) +EXECUTE_TEST(default_scalar, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(default_scalar, int64_t, size_t, TestExecSpace) +EXECUTE_TEST(default_scalar, int64_t, size_t, TestDevice) #endif #undef EXECUTE_TEST diff --git a/graph/unit_test/Test_Graph_graph_color_distance2.hpp b/graph/unit_test/Test_Graph_graph_color_distance2.hpp index d022a0d2d6..44ddaed0bf 100644 --- a/graph/unit_test/Test_Graph_graph_color_distance2.hpp +++ b/graph/unit_test/Test_Graph_graph_color_distance2.hpp @@ -343,28 +343,28 @@ void test_bipartite(lno_t numRows, lno_t numCols, size_type nnz, defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, int, TestExecSpace) +EXECUTE_TEST(double, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, int, TestExecSpace) +EXECUTE_TEST(double, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, size_t, TestExecSpace) +EXECUTE_TEST(double, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, size_t, TestExecSpace) +EXECUTE_TEST(double, int64_t, size_t, TestDevice) #endif #endif diff --git a/graph/unit_test/Test_Graph_mis2.hpp b/graph/unit_test/Test_Graph_mis2.hpp index faaea3b155..c6fb7562e7 100644 --- a/graph/unit_test/Test_Graph_mis2.hpp +++ b/graph/unit_test/Test_Graph_mis2.hpp @@ -274,7 +274,7 @@ void test_mis2_coarsening_zero_rows() { defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, int, TestExecSpace) +EXECUTE_TEST(double, int, int, TestDevice) #endif #endif @@ -282,21 +282,21 @@ EXECUTE_TEST(double, int, int, TestExecSpace) defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, int, TestExecSpace) +EXECUTE_TEST(double, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, size_t, TestExecSpace) +EXECUTE_TEST(double, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, size_t, TestExecSpace) +EXECUTE_TEST(double, int64_t, size_t, TestDevice) #endif #undef EXECUTE_TEST diff --git a/graph/unit_test/Test_Graph_rcm.hpp b/graph/unit_test/Test_Graph_rcm.hpp index 861634071e..2e05554d2d 100644 --- a/graph/unit_test/Test_Graph_rcm.hpp +++ b/graph/unit_test/Test_Graph_rcm.hpp @@ -151,28 +151,28 @@ void test_rcm(lno_t gridX, lno_t gridY, lno_t gridZ) { defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, int, TestExecSpace) +EXECUTE_TEST(double, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, int, TestExecSpace) +EXECUTE_TEST(double, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, size_t, TestExecSpace) +EXECUTE_TEST(double, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, size_t, TestExecSpace) +EXECUTE_TEST(double, int64_t, size_t, TestDevice) #endif #undef EXECUTE_TEST diff --git a/ode/unit_test/Test_ODE_Newton.hpp b/ode/unit_test/Test_ODE_Newton.hpp index 7cc3fd2a6d..f6b63ee562 100644 --- a/ode/unit_test/Test_ODE_Newton.hpp +++ b/ode/unit_test/Test_ODE_Newton.hpp @@ -525,29 +525,29 @@ void test_newton_on_device() { // No ETI is performed for these device routines // Just pick scalar types at will... TEST_F(TestCategory, Newton_status_float) { - ::Test::test_newton_status(); + ::Test::test_newton_status(); } TEST_F(TestCategory, Newton_status_double) { - ::Test::test_newton_status(); + ::Test::test_newton_status(); } TEST_F(TestCategory, Newton_simple_float) { - ::Test::test_simple_problems(); + ::Test::test_simple_problems(); } TEST_F(TestCategory, Newton_simple_double) { - ::Test::test_simple_problems(); + ::Test::test_simple_problems(); } TEST_F(TestCategory, Newton_system_float) { - ::Test::test_simple_systems(); + ::Test::test_simple_systems(); } TEST_F(TestCategory, Newton_system_double) { - ::Test::test_simple_systems(); + ::Test::test_simple_systems(); } TEST_F(TestCategory, Newton_parallel_float) { - ::Test::test_newton_on_device(); + ::Test::test_newton_on_device(); } TEST_F(TestCategory, Newton_parallel_double) { - ::Test::test_newton_on_device(); + ::Test::test_newton_on_device(); } diff --git a/ode/unit_test/Test_ODE_RK.hpp b/ode/unit_test/Test_ODE_RK.hpp index 039e0211eb..c7d1a84865 100644 --- a/ode/unit_test/Test_ODE_RK.hpp +++ b/ode/unit_test/Test_ODE_RK.hpp @@ -561,11 +561,11 @@ void test_adaptivity() { } // namespace Test -void test_RK() { Test::test_RK(); } +void test_RK() { Test::test_RK(); } -void test_RK_conv_rate() { Test::test_convergence_rate(); } +void test_RK_conv_rate() { Test::test_convergence_rate(); } -void test_RK_adaptivity() { Test::test_adaptivity(); } +void test_RK_adaptivity() { Test::test_adaptivity(); } #if defined(KOKKOSKERNELS_INST_DOUBLE) TEST_F(TestCategory, RKSolve_serial) { test_RK(); } diff --git a/ode/unit_test/Test_ODE_RK_chem.hpp b/ode/unit_test/Test_ODE_RK_chem.hpp index 763394e1ec..763f38a013 100644 --- a/ode/unit_test/Test_ODE_RK_chem.hpp +++ b/ode/unit_test/Test_ODE_RK_chem.hpp @@ -189,7 +189,7 @@ void test_chem() { } // namespace Test int test_chem_models() { - Test::test_chem(); + Test::test_chem(); return 1; } diff --git a/sparse/unit_test/Test_Sparse_MergeMatrix.hpp b/sparse/unit_test/Test_Sparse_MergeMatrix.hpp index 9fc533ed9c..b6301778a3 100644 --- a/sparse/unit_test/Test_Sparse_MergeMatrix.hpp +++ b/sparse/unit_test/Test_Sparse_MergeMatrix.hpp @@ -564,35 +564,35 @@ void test_merge_matrix() { TEST_F(TestCategory, common_merge_matrix) { // clang-format off - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); // test some select integer / float combos - Test_Sparse_MergeMatrix::test_merge_matrix(); - Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); + Test_Sparse_MergeMatrix::test_merge_matrix(); // no generally safe way to compare all possible values of these types - // Test_Sparse_MergeMatrix::test_merge_matrix(); - // Test_Sparse_MergeMatrix::test_merge_matrix(); - // Test_Sparse_MergeMatrix::test_merge_matrix(); + // Test_Sparse_MergeMatrix::test_merge_matrix(); + // Test_Sparse_MergeMatrix::test_merge_matrix(); + // Test_Sparse_MergeMatrix::test_merge_matrix(); // clang-format on } diff --git a/sparse/unit_test/Test_Sparse_SortCrs.hpp b/sparse/unit_test/Test_Sparse_SortCrs.hpp index fe092461f3..c06509b3ec 100644 --- a/sparse/unit_test/Test_Sparse_SortCrs.hpp +++ b/sparse/unit_test/Test_Sparse_SortCrs.hpp @@ -506,14 +506,14 @@ TEST_F(TestCategory, common_sort_crsgraph) { // because the exec space type is determined from the graph. if (doStructInterface && howExecSpecified == SortCrsTest::ExplicitType) continue; - testSortCRS(10, 10, 20, false, doStructInterface, - howExecSpecified); - testSortCRS(100, 100, 2000, false, doStructInterface, - howExecSpecified); - testSortCRS(1000, 1000, 30000, false, doStructInterface, - howExecSpecified); + testSortCRS(10, 10, 20, false, doStructInterface, + howExecSpecified); + testSortCRS(100, 100, 2000, false, doStructInterface, + howExecSpecified); + testSortCRS(1000, 1000, 30000, false, doStructInterface, + howExecSpecified); } - testSortCRSUnmanaged(false, doStructInterface); + testSortCRSUnmanaged(false, doStructInterface); } } @@ -525,24 +525,24 @@ TEST_F(TestCategory, common_sort_crsmatrix) { // because the exec space type is determined from the matrix. if (doStructInterface && howExecSpecified == SortCrsTest::ExplicitType) continue; - testSortCRS(10, 10, 20, true, doStructInterface, - howExecSpecified); - testSortCRS(100, 100, 2000, true, doStructInterface, - howExecSpecified); - testSortCRS(1000, 1000, 30000, true, doStructInterface, - howExecSpecified); + testSortCRS(10, 10, 20, true, doStructInterface, + howExecSpecified); + testSortCRS(100, 100, 2000, true, doStructInterface, + howExecSpecified); + testSortCRS(1000, 1000, 30000, true, doStructInterface, + howExecSpecified); } - testSortCRSUnmanaged(true, doStructInterface); + testSortCRSUnmanaged(true, doStructInterface); } } TEST_F(TestCategory, common_sort_crs_longrows) { // Matrix/graph with one very long row // Just test this once with graph, and once with matrix - testSortCRS(1, 50000, 10000, false, false, - SortCrsTest::ImplicitType); - testSortCRS(1, 50000, 10000, true, false, - SortCrsTest::ImplicitType); + testSortCRS(1, 50000, 10000, false, false, + SortCrsTest::ImplicitType); + testSortCRS(1, 50000, 10000, true, false, + SortCrsTest::ImplicitType); } TEST_F(TestCategory, common_sort_merge_crsmatrix) { @@ -555,8 +555,8 @@ TEST_F(TestCategory, common_sort_merge_crsmatrix) { howExecSpecified == SortCrsTest::ExplicitType) continue; if (doStructInterface && inPlace) continue; - testSortAndMerge(false, howExecSpecified, - doStructInterface, inPlace, testCase); + testSortAndMerge(false, howExecSpecified, + doStructInterface, inPlace, testCase); } } } @@ -573,8 +573,8 @@ TEST_F(TestCategory, common_sort_merge_crsgraph) { howExecSpecified == SortCrsTest::ExplicitType) continue; if (doStructInterface && inPlace) continue; - testSortAndMerge(true, howExecSpecified, - doStructInterface, inPlace, testCase); + testSortAndMerge(true, howExecSpecified, + doStructInterface, inPlace, testCase); } } } diff --git a/sparse/unit_test/Test_Sparse_TestUtils_RandCsMat.hpp b/sparse/unit_test/Test_Sparse_TestUtils_RandCsMat.hpp index 279f4f89f9..029ddd14b0 100644 --- a/sparse/unit_test/Test_Sparse_TestUtils_RandCsMat.hpp +++ b/sparse/unit_test/Test_Sparse_TestUtils_RandCsMat.hpp @@ -75,12 +75,12 @@ void doAllCsMat(size_t m, size_t n) { // Test randomly generated Cs matrices TEST_F(TestCategory, sparse_randcsmat) { // Square cases - for (int dim = 1; dim < 1024; dim *= 4) doAllCsMat(dim, dim); + for (int dim = 1; dim < 1024; dim *= 4) doAllCsMat(dim, dim); // Non-square cases for (int dim = 1; dim < 1024; dim *= 4) { - doAllCsMat(dim * 3, dim); - doAllCsMat(dim, dim * 3); + doAllCsMat(dim * 3, dim); + doAllCsMat(dim, dim * 3); } } } // namespace Test \ No newline at end of file diff --git a/sparse/unit_test/Test_Sparse_Transpose.hpp b/sparse/unit_test/Test_Sparse_Transpose.hpp index 35f7a0516c..05773b6b75 100644 --- a/sparse/unit_test/Test_Sparse_Transpose.hpp +++ b/sparse/unit_test/Test_Sparse_Transpose.hpp @@ -294,32 +294,32 @@ void testTransposeBsr(int numRows, int numCols, int blockSize) { TEST_F(TestCategory, sparse_transpose_matrix) { // Test both matrix and graph transpose with various sizes - testTranspose(100, 100, true); - testTranspose(500, 50, true); - testTranspose(50, 500, true); - testTranspose(4000, 2000, true); - testTranspose(2000, 4000, true); - testTranspose(2000, 2000, true); + testTranspose(100, 100, true); + testTranspose(500, 50, true); + testTranspose(50, 500, true); + testTranspose(4000, 2000, true); + testTranspose(2000, 4000, true); + testTranspose(2000, 2000, true); } TEST_F(TestCategory, sparse_transpose_graph) { - testTranspose(100, 100, false); - testTranspose(500, 50, false); - testTranspose(50, 500, false); - testTranspose(4000, 2000, false); - testTranspose(2000, 4000, false); - testTranspose(2000, 2000, false); + testTranspose(100, 100, false); + testTranspose(500, 50, false); + testTranspose(50, 500, false); + testTranspose(4000, 2000, false); + testTranspose(2000, 4000, false); + testTranspose(2000, 2000, false); } TEST_F(TestCategory, sparse_transpose_bsr_matrix) { - testTransposeBsrRef(); + testTransposeBsrRef(); // Test bsrMatrix transpose with various sizes - testTransposeBsr(100, 100, 3); - testTransposeBsr(500, 50, 5); - testTransposeBsr(50, 500, 16); - testTransposeBsr(4000, 2000, 3); - testTransposeBsr(2000, 4000, 3); - testTransposeBsr(2000, 2000, 5); + testTransposeBsr(100, 100, 3); + testTransposeBsr(500, 50, 5); + testTransposeBsr(50, 500, 16); + testTransposeBsr(4000, 2000, 3); + testTransposeBsr(2000, 4000, 3); + testTransposeBsr(2000, 2000, 5); } #endif diff --git a/sparse/unit_test/Test_Sparse_ccs2crs.hpp b/sparse/unit_test/Test_Sparse_ccs2crs.hpp index 56972b8a07..f7e2797759 100644 --- a/sparse/unit_test/Test_Sparse_ccs2crs.hpp +++ b/sparse/unit_test/Test_Sparse_ccs2crs.hpp @@ -136,19 +136,19 @@ TEST_F(TestCategory, sparse_ccs2crs) { std::srand(ticks); // Empty cases - doCcs2Crs(1, 0, 1, 10); - doCcs2Crs(0, 1, 1, 10); + doCcs2Crs(1, 0, 1, 10); + doCcs2Crs(0, 1, 1, 10); - doCcs2Crs(1, 0, 1, 10); - doCcs2Crs(0, 1, 1, 10); + doCcs2Crs(1, 0, 1, 10); + doCcs2Crs(0, 1, 1, 10); - doCcs2Crs(0, 0, 1, 10); - doCcs2Crs(0, 0, 1, 10); + doCcs2Crs(0, 0, 1, 10); + doCcs2Crs(0, 0, 1, 10); // Square cases for (size_t i = 4; i < 1024; i *= 4) { size_t dim = (std::rand() % 511) + 1; - doAllCcs2crs(dim, dim); + doAllCcs2crs(dim, dim); } // Non-square cases @@ -156,16 +156,16 @@ TEST_F(TestCategory, sparse_ccs2crs) { size_t m = (std::rand() % 511) + 1; size_t n = (std::rand() % 511) + 1; while (n == m) n = (std::rand() % 511) + 1; - doAllCcs2crs(m, n); + doAllCcs2crs(m, n); } // Fully sparse cases - doCcs2Crs(5, 5, 1, 10, true); - doCcs2Crs(50, 10, 10, 100, true); + doCcs2Crs(5, 5, 1, 10, true); + doCcs2Crs(50, 10, 10, 100, true); // Test the convenience wrapper that accepts a ccs matrix - RandCsMatrix csMat(2, 2, 10, 10, - false); + RandCsMatrix csMat(2, 2, 10, 10, + false); auto ccsMatrix = crs2ccs(csMat.get_dim1(), csMat.get_dim2(), csMat.get_nnz(), csMat.get_vals(), csMat.get_map(), csMat.get_ids()); auto crsMatrix = ccs2crs(ccsMatrix); diff --git a/sparse/unit_test/Test_Sparse_coo2crs.hpp b/sparse/unit_test/Test_Sparse_coo2crs.hpp index a2ccd6bc62..3427ec44cd 100644 --- a/sparse/unit_test/Test_Sparse_coo2crs.hpp +++ b/sparse/unit_test/Test_Sparse_coo2crs.hpp @@ -242,12 +242,12 @@ TEST_F(TestCategory, sparse_coo2crs) { UINT32_MAX; std::srand(ticks); - doAllCoo2Crs(0, 0); + doAllCoo2Crs(0, 0); // Square cases for (size_t i = 1; i < 256; i *= 4) { size_t dim = (std::rand() % 511) + 1; - doAllCoo2Crs(dim, dim); + doAllCoo2Crs(dim, dim); } // Non-square cases @@ -255,11 +255,11 @@ TEST_F(TestCategory, sparse_coo2crs) { size_t m = (std::rand() % 511) + 1; size_t n = (std::rand() % 511) + 1; while (n == m) n = (std::rand() % 511) + 1; - doAllCoo2Crs(m, n); + doAllCoo2Crs(m, n); } - RandCooMat cooMat(2, 2, 2 * 2, 10, - 10); + RandCooMat cooMat(2, 2, 2 * 2, 10, + 10); auto crsMatrix = KokkosSparse::coo2crs(2, 2, cooMat.get_row(), cooMat.get_col(), cooMat.get_data()); auto cooMatrix = KokkosSparse::crs2coo(crsMatrix); @@ -276,15 +276,15 @@ TEST_F(TestCategory, sparse_coo2crs_staticMatrix_edgeCases) { float staticData[16]{7.28411, 8.17991, 8.84304, 5.01788, 9.85646, 5.79404, 8.42014, 1.90238, 8.24195, 4.39955, 3.2637, 5.4546, 6.51895, 8.09302, 9.36294, 3.44206}; - Kokkos::View row("coo row", 16); - Kokkos::View col("coo col", 16); - Kokkos::View data("coo data", 16); + Kokkos::View row("coo row", 16); + Kokkos::View col("coo col", 16); + Kokkos::View data("coo data", 16); - typename Kokkos::View::HostMirror row_h = + typename Kokkos::View::HostMirror row_h = Kokkos::create_mirror_view(row); - typename Kokkos::View::HostMirror col_h = + typename Kokkos::View::HostMirror col_h = Kokkos::create_mirror_view(col); - typename Kokkos::View::HostMirror data_h = + typename Kokkos::View::HostMirror data_h = Kokkos::create_mirror_view(data); for (int i = 0; i < 16; i++) { row_h(i) = staticRow[i]; diff --git a/sparse/unit_test/Test_Sparse_crs2ccs.hpp b/sparse/unit_test/Test_Sparse_crs2ccs.hpp index 720c6cd05e..46cc2fb361 100644 --- a/sparse/unit_test/Test_Sparse_crs2ccs.hpp +++ b/sparse/unit_test/Test_Sparse_crs2ccs.hpp @@ -134,19 +134,19 @@ TEST_F(TestCategory, sparse_crs2ccs) { std::srand(ticks); // Empty cases - doCrs2Ccs(1, 0, 1, 10); - doCrs2Ccs(0, 1, 1, 10); + doCrs2Ccs(1, 0, 1, 10); + doCrs2Ccs(0, 1, 1, 10); - doCrs2Ccs(1, 0, 1, 10); - doCrs2Ccs(0, 1, 1, 10); + doCrs2Ccs(1, 0, 1, 10); + doCrs2Ccs(0, 1, 1, 10); - doCrs2Ccs(0, 0, 1, 10); - doCrs2Ccs(0, 0, 1, 10); + doCrs2Ccs(0, 0, 1, 10); + doCrs2Ccs(0, 0, 1, 10); // Square cases for (size_t i = 4; i < 1024; i *= 4) { size_t dim = (std::rand() % 511) + 1; - doAllCrs2Ccs(dim, dim); + doAllCrs2Ccs(dim, dim); } // Non-square cases @@ -154,16 +154,16 @@ TEST_F(TestCategory, sparse_crs2ccs) { size_t m = (std::rand() % 511) + 1; size_t n = (std::rand() % 511) + 1; while (n == m) n = (std::rand() % 511) + 1; - doAllCrs2Ccs(m, n); + doAllCrs2Ccs(m, n); } // Fully sparse cases - doCrs2Ccs(5, 5, 1, 10, true); - doCrs2Ccs(50, 10, 10, 100, true); + doCrs2Ccs(5, 5, 1, 10, true); + doCrs2Ccs(50, 10, 10, 100, true); // Test the convenience wrapper that accepts a crs matrix - RandCsMatrix csMat(2, 2, 10, 10, - false); + RandCsMatrix csMat(2, 2, 10, 10, + false); auto crsMatrix = ccs2crs(csMat.get_dim2(), csMat.get_dim1(), csMat.get_nnz(), csMat.get_vals(), csMat.get_map(), csMat.get_ids()); auto ccsMatrix = crs2ccs(crsMatrix); diff --git a/sparse/unit_test/Test_Sparse_crs2coo.hpp b/sparse/unit_test/Test_Sparse_crs2coo.hpp index 13ff60b0c8..9f81e20f90 100644 --- a/sparse/unit_test/Test_Sparse_crs2coo.hpp +++ b/sparse/unit_test/Test_Sparse_crs2coo.hpp @@ -128,7 +128,7 @@ TEST_F(TestCategory, sparse_crs2coo) { // Square cases for (size_t i = 1; i < 256; i *= 4) { size_t dim = (std::rand() % 511) + 1; - doAllCrs2Coo(dim, dim); + doAllCrs2Coo(dim, dim); } // Non-square cases @@ -136,7 +136,7 @@ TEST_F(TestCategory, sparse_crs2coo) { size_t m = (std::rand() % 511) + 1; size_t n = (std::rand() % 511) + 1; while (n == m) n = (std::rand() % 511) + 1; - doAllCrs2Coo(m, n); + doAllCrs2Coo(m, n); } } } // namespace Test \ No newline at end of file diff --git a/sparse/unit_test/Test_Sparse_csc2csr.hpp b/sparse/unit_test/Test_Sparse_csc2csr.hpp index 61857a3e4f..aa838a4428 100644 --- a/sparse/unit_test/Test_Sparse_csc2csr.hpp +++ b/sparse/unit_test/Test_Sparse_csc2csr.hpp @@ -124,19 +124,19 @@ TEST_F(TestCategory, sparse_csc2csr) { std::srand(ticks); // Empty cases - doCsc2Csr(1, 0, 1, 10); - doCsc2Csr(0, 1, 1, 10); + doCsc2Csr(1, 0, 1, 10); + doCsc2Csr(0, 1, 1, 10); - doCsc2Csr(1, 0, 1, 10); - doCsc2Csr(0, 1, 1, 10); + doCsc2Csr(1, 0, 1, 10); + doCsc2Csr(0, 1, 1, 10); - doCsc2Csr(0, 0, 1, 10); - doCsc2Csr(0, 0, 1, 10); + doCsc2Csr(0, 0, 1, 10); + doCsc2Csr(0, 0, 1, 10); // Square cases for (size_t i = 4; i < 1024; i *= 4) { size_t dim = (std::rand() % 511) + 1; - doAllCsc2csr(dim, dim); + doAllCsc2csr(dim, dim); } // Non-square cases @@ -144,11 +144,11 @@ TEST_F(TestCategory, sparse_csc2csr) { size_t m = (std::rand() % 511) + 1; size_t n = (std::rand() % 511) + 1; while (n == m) n = (std::rand() % 511) + 1; - doAllCsc2csr(m, n); + doAllCsc2csr(m, n); } // Fully sparse cases - doCsc2Csr(5, 5, 1, 10, true); - doCsc2Csr(50, 10, 10, 100, true); + doCsc2Csr(5, 5, 1, 10, true); + doCsc2Csr(50, 10, 10, 100, true); } } // namespace Test \ No newline at end of file diff --git a/sparse/unit_test/Test_Sparse_findRelOffset.hpp b/sparse/unit_test/Test_Sparse_findRelOffset.hpp index 9c7224b756..642f1666e7 100644 --- a/sparse/unit_test/Test_Sparse_findRelOffset.hpp +++ b/sparse/unit_test/Test_Sparse_findRelOffset.hpp @@ -430,13 +430,13 @@ void test_findRelOffset() { #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int, int, TestExecSpace) +EXECUTE_TEST(double, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T)) || \ (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST(double, int64_t, int, TestExecSpace) +EXECUTE_TEST(double, int64_t, int, TestDevice) #endif #undef EXECUTE_TEST diff --git a/sparse/unit_test/Test_Sparse_removeCrsMatrixZeros.hpp b/sparse/unit_test/Test_Sparse_removeCrsMatrixZeros.hpp index bdd175558f..52a9a1874b 100644 --- a/sparse/unit_test/Test_Sparse_removeCrsMatrixZeros.hpp +++ b/sparse/unit_test/Test_Sparse_removeCrsMatrixZeros.hpp @@ -224,8 +224,8 @@ void getTestInput(int test, Matrix& A, Matrix& Afiltered_ref) { if (haveHardcodedReference) { Matrix Afiltered_refimpl = removeMatrixZerosReference(A); bool referenceImplMatchesHardcoded = - Test::is_same_matrix(Afiltered_ref, - Afiltered_refimpl); + Test::is_same_matrix(Afiltered_ref, + Afiltered_refimpl); ASSERT_TRUE(referenceImplMatchesHardcoded) << "Test case " << test << ": reference impl gave wrong answer!"; } @@ -235,14 +235,13 @@ void getTestInput(int test, Matrix& A, Matrix& Afiltered_ref) { void testRemoveCrsMatrixZeros(int testCase) { using namespace TestRemoveCrsMatrixZeros; - using Matrix = - KokkosSparse::CrsMatrix; + using Matrix = KokkosSparse::CrsMatrix; Matrix A, Afiltered_ref; getTestInput(testCase, A, Afiltered_ref); Matrix Afiltered_actual = KokkosSparse::removeCrsMatrixZeros(A); - bool matches = Test::is_same_matrix(Afiltered_actual, - Afiltered_ref); + bool matches = + Test::is_same_matrix(Afiltered_actual, Afiltered_ref); EXPECT_TRUE(matches) << "Test case " << testCase << ": matrix with zeros filtered out does not match reference."; diff --git a/sparse/unit_test/Test_Sparse_spmv.hpp b/sparse/unit_test/Test_Sparse_spmv.hpp index ca5c5a22f4..8c9c72017a 100644 --- a/sparse/unit_test/Test_Sparse_spmv.hpp +++ b/sparse/unit_test/Test_Sparse_spmv.hpp @@ -1321,12 +1321,12 @@ void test_spmv_all_interfaces_light() { #if (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -EXECUTE_TEST_ISSUE_101(TestExecSpace) +EXECUTE_TEST_ISSUE_101(TestDevice) #endif #define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ - EXECUTE_TEST_FN(SCALAR, ORDINAL, OFFSET, TestExecSpace) \ - EXECUTE_TEST_STRUCT(SCALAR, ORDINAL, OFFSET, TestExecSpace) + EXECUTE_TEST_FN(SCALAR, ORDINAL, OFFSET, TestDevice) \ + EXECUTE_TEST_STRUCT(SCALAR, ORDINAL, OFFSET, TestDevice) #include @@ -1336,10 +1336,10 @@ EXECUTE_TEST_ISSUE_101(TestExecSpace) (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -#define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ - EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestExecSpace) \ - EXECUTE_TEST_MV_STRUCT(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestExecSpace) \ - EXECUTE_TEST_INTERFACES(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestExecSpace) +#define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ + EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestDevice) \ + EXECUTE_TEST_MV_STRUCT(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestDevice) \ + EXECUTE_TEST_INTERFACES(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestDevice) #include @@ -1351,9 +1351,9 @@ EXECUTE_TEST_ISSUE_101(TestExecSpace) (!defined(KOKKOSKERNELS_ETI_ONLY) && \ !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) -#define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ - EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LayoutRight, TestExecSpace) \ - EXECUTE_TEST_INTERFACES(SCALAR, ORDINAL, OFFSET, LayoutRight, TestExecSpace) +#define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ + EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LayoutRight, TestDevice) \ + EXECUTE_TEST_INTERFACES(SCALAR, ORDINAL, OFFSET, LayoutRight, TestDevice) #include diff --git a/sparse/unit_test/Test_Sparse_spmv_bsr.hpp b/sparse/unit_test/Test_Sparse_spmv_bsr.hpp index 839421d916..164c87b8df 100644 --- a/sparse/unit_test/Test_Sparse_spmv_bsr.hpp +++ b/sparse/unit_test/Test_Sparse_spmv_bsr.hpp @@ -744,8 +744,7 @@ void test_spm_mv() { #if defined(KOKKOSKERNELS_INST_LAYOUTLEFT) #define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ - EXECUTE_BSR_TIMES_MVEC_TEST(SCALAR, ORDINAL, OFFSET, LayoutLeft, \ - TestExecSpace) + EXECUTE_BSR_TIMES_MVEC_TEST(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestDevice) #include @@ -756,8 +755,7 @@ void test_spm_mv() { #if defined(KOKKOSKERNELS_INST_LAYOUTRIGHT) #define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ - EXECUTE_BSR_TIMES_MVEC_TEST(SCALAR, ORDINAL, OFFSET, LayoutRight, \ - TestExecSpace) + EXECUTE_BSR_TIMES_MVEC_TEST(SCALAR, ORDINAL, OFFSET, LayoutRight, TestDevice) #include diff --git a/sparse/unit_test/Test_Sparse_trsv.hpp b/sparse/unit_test/Test_Sparse_trsv.hpp index e6bc13d6a0..d580cc472d 100644 --- a/sparse/unit_test/Test_Sparse_trsv.hpp +++ b/sparse/unit_test/Test_Sparse_trsv.hpp @@ -139,7 +139,7 @@ void test_trsv_mv(lno_t numRows, size_type nnz, lno_t bandwidth, !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) #define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ - EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestExecSpace) + EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LayoutLeft, TestDevice) #include @@ -152,7 +152,7 @@ void test_trsv_mv(lno_t numRows, size_type nnz, lno_t bandwidth, !defined(KOKKOSKERNELS_IMPL_CHECK_ETI_CALLS)) #define KOKKOSKERNELS_EXECUTE_TEST(SCALAR, ORDINAL, OFFSET, DEVICE) \ - EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LayoutRight, TestExecSpace) + EXECUTE_TEST_MV(SCALAR, ORDINAL, OFFSET, LayoutRight, TestDevice) #include diff --git a/test_common/Test_Common_Test_All_Type_Combos.hpp b/test_common/Test_Common_Test_All_Type_Combos.hpp index c51601fdf4..a51d796632 100644 --- a/test_common/Test_Common_Test_All_Type_Combos.hpp +++ b/test_common/Test_Common_Test_All_Type_Combos.hpp @@ -31,26 +31,25 @@ // ETI is off, test all possible type combos -KOKKOSKERNELS_EXECUTE_TEST(double, int, int, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(double, int64_t, int, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(double, int, size_t, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(double, int64_t, size_t, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(float, int, int, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, int, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(float, int, size_t, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(double, int, int, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(double, int64_t, int, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(double, int, size_t, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(double, int64_t, size_t, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(float, int, int, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, int, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(float, int, size_t, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, size_t, TestDevice) #if !defined(NO_TEST_COMPLEX) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int, int, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int64_t, int, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int, size_t, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int64_t, size_t, - TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int, int, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, int, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int, size_t, TestExecSpace) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int, int, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int64_t, int, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int, size_t, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int64_t, size_t, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int, int, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, int, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int, size_t, TestDevice) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, size_t, TestDevice) #endif @@ -61,49 +60,49 @@ KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, size_t, TestExecSpace) #if (defined(KOKKOSKERNELS_INST_DOUBLE) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) -KOKKOSKERNELS_EXECUTE_TEST(double, int, int, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(double, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_DOUBLE) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) -KOKKOSKERNELS_EXECUTE_TEST(double, int64_t, int, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(double, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_DOUBLE) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) -KOKKOSKERNELS_EXECUTE_TEST(double, int, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(double, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_DOUBLE) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) -KOKKOSKERNELS_EXECUTE_TEST(double, int64_t, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(double, int64_t, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_FLOAT) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) -KOKKOSKERNELS_EXECUTE_TEST(float, int, int, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(float, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_FLOAT) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) -KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, int, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_FLOAT) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) -KOKKOSKERNELS_EXECUTE_TEST(float, int, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(float, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_FLOAT) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) -KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, size_t, TestDevice) #endif #if !defined(NO_TEST_COMPLEX) @@ -111,50 +110,49 @@ KOKKOSKERNELS_EXECUTE_TEST(float, int64_t, size_t, TestExecSpace) #if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int, int, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int64_t, int, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_DOUBLE_) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int64_t, size_t, - TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_double, int64_t, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int, int, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_INT)) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, int, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, int, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int, size_t, TestDevice) #endif #if (defined(KOKKOSKERNELS_INST_KOKKOS_COMPLEX_FLOAT_) && \ defined(KOKKOSKERNELS_INST_ORDINAL_INT64_T) && \ defined(KOKKOSKERNELS_INST_OFFSET_SIZE_T)) -KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, size_t, TestExecSpace) +KOKKOSKERNELS_EXECUTE_TEST(kokkos_complex_float, int64_t, size_t, TestDevice) #endif #endif // !NO_TEST_COMPLEX diff --git a/test_common/Test_Cuda.hpp b/test_common/Test_Cuda.hpp index 9230d7f935..01eb78dfef 100644 --- a/test_common/Test_Cuda.hpp +++ b/test_common/Test_Cuda.hpp @@ -39,9 +39,9 @@ using CudaUVMSpaceDevice = Kokkos::Device; // Prefer for any testing where only one exec space is used #if defined(KOKKOSKERNELS_INST_MEMSPACE_CUDAUVMSPACE) && \ !defined(KOKKOSKERNELS_INST_MEMSPACE_CUDASPACE) -#define TestExecSpace CudaUVMSpaceDevice +#define TestDevice CudaUVMSpaceDevice #else -#define TestExecSpace CudaSpaceDevice +#define TestDevice CudaSpaceDevice #endif #endif // TEST_CUDA_HPP diff --git a/test_common/Test_HIP.hpp b/test_common/Test_HIP.hpp index 7e61bfc9c3..6d619d1378 100644 --- a/test_common/Test_HIP.hpp +++ b/test_common/Test_HIP.hpp @@ -32,6 +32,6 @@ class hip : public ::testing::Test { }; #define TestCategory hip -#define TestExecSpace Kokkos::Experimental::HIP +#define TestDevice Kokkos::Experimental::HIP #endif // TEST_HIP_HPP diff --git a/test_common/Test_OpenMP.hpp b/test_common/Test_OpenMP.hpp index 8b4f90730e..3d110e4479 100644 --- a/test_common/Test_OpenMP.hpp +++ b/test_common/Test_OpenMP.hpp @@ -32,6 +32,6 @@ class openmp : public ::testing::Test { }; #define TestCategory openmp -#define TestExecSpace Kokkos::OpenMP +#define TestDevice Kokkos::OpenMP #endif // TEST_OPENMP_HPP diff --git a/test_common/Test_OpenMPTarget.hpp b/test_common/Test_OpenMPTarget.hpp index 2056d8be01..d41f95dad1 100644 --- a/test_common/Test_OpenMPTarget.hpp +++ b/test_common/Test_OpenMPTarget.hpp @@ -32,6 +32,6 @@ class openmptarget : public ::testing::Test { }; #define TestCategory openmptarget -#define TestExecSpace Kokkos::Experimental::OpenMPTarget +#define TestDevice Kokkos::Experimental::OpenMPTarget #endif // TEST_OPENMPTARGET_HPP diff --git a/test_common/Test_SYCL.hpp b/test_common/Test_SYCL.hpp index c7022f35d1..493b8082a4 100644 --- a/test_common/Test_SYCL.hpp +++ b/test_common/Test_SYCL.hpp @@ -29,4 +29,4 @@ class sycl_test : public ::testing::Test { }; #define TestCategory sycl_test -#define TestExecSpace Kokkos::Experimental::SYCL +#define TestDevice Kokkos::Experimental::SYCL diff --git a/test_common/Test_Serial.hpp b/test_common/Test_Serial.hpp index fe2917937b..aca218cade 100644 --- a/test_common/Test_Serial.hpp +++ b/test_common/Test_Serial.hpp @@ -32,6 +32,6 @@ class serial : public ::testing::Test { }; #define TestCategory serial -#define TestExecSpace Kokkos::Serial +#define TestDevice Kokkos::Serial #endif // TEST_SERIAL_HPP diff --git a/test_common/Test_Threads.hpp b/test_common/Test_Threads.hpp index 1e2919b68f..d527023c8f 100644 --- a/test_common/Test_Threads.hpp +++ b/test_common/Test_Threads.hpp @@ -32,6 +32,6 @@ class threads : public ::testing::Test { }; #define TestCategory threads -#define TestExecSpace Kokkos::Threads +#define TestDevice Kokkos::Threads #endif // TEST_THREADS_HPP