perf_tests: remove false dependence on google test (kokkos#2385)

* perf_tests: remove false dependence on google test Signed-off-by: Carl Pearson <[email protected]> * KokkosBlas3_gemm_perf_test.hpp: remove comment Signed-off-by: Carl Pearson <[email protected]> * Test::epsilon -> Kokkos::ArithTraits<>::eps Signed-off-by: Carl Pearson <[email protected]> --------- Signed-off-by: Carl Pearson <[email protected]>
lucbv · Oct 18, 2024 · ff46aee · ff46aee
1 parent 9f8122b
commit ff46aee
Show file tree

Hide file tree

Showing 37 changed files with 367 additions and 274 deletions.
diff --git a/batched/dense/unit_test/Test_Batched_SerialGemm.hpp b/batched/dense/unit_test/Test_Batched_SerialGemm.hpp
@@ -25,6 +25,7 @@
 #include "KokkosBatched_Gemm_Serial_Impl.hpp"
 
 #include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestVanilla.hpp"
 
 using namespace KokkosBatched;
 

diff --git a/batched/dense/unit_test/Test_Batched_SerialSVD.hpp b/batched/dense/unit_test/Test_Batched_SerialSVD.hpp
@@ -18,6 +18,8 @@
 #include "KokkosBatched_SVD_Decl.hpp"             //For testing overall kernel
 #include "KokkosBatched_SVD_Serial_Internal.hpp"  //For unit testing individual components
 #include "KokkosBatched_SetIdentity_Decl.hpp"
+#include "KokkosKernels_TestMatrixUtils.hpp"
+#include "KokkosKernels_TestVanilla.hpp"
 
 namespace Test {
 template <typename Scalar>

diff --git a/blas/unit_test/Test_Blas2_gemv.hpp b/blas/unit_test/Test_Blas2_gemv.hpp
@@ -19,6 +19,7 @@
 #include <KokkosBlas2_gemv.hpp>
 #include <KokkosBlas1_dot.hpp>
 #include <KokkosKernels_TestUtils.hpp>
+#include "KokkosKernels_TestVanilla.hpp"
 
 namespace Test {
 template <class ExecutionSpace, class ViewTypeA, class ViewTypeX, class ViewTypeY, class Device>

diff --git a/perf_test/CMakeLists.txt b/perf_test/CMakeLists.txt
@@ -11,21 +11,6 @@ if (KokkosKernels_ENABLE_PERFTESTS)
     #build correctly with or without MPI, but only run them with a single
     #MPI process.
 
-    SET(GTEST_SOURCE_DIR ${PACKAGE_SOURCE_DIR}/tpls/gtest)
-
-    KOKKOSKERNELS_ADD_TEST_LIBRARY(
-                                kokkoskernelsperf_gtest
-                                HEADERS ${GTEST_SOURCE_DIR}/gtest/gtest.h
-                                SOURCES ${GTEST_SOURCE_DIR}/gtest/gtest-all.cc
-                                    )
-    #Disables pthreads, this is a problem for serial builds in Trilinos & Sierra if it's enabled.
-
-    TARGET_COMPILE_DEFINITIONS(kokkoskernelsperf_gtest PUBLIC "-DGTEST_HAS_PTHREAD=0")
-    TARGET_INCLUDE_DIRECTORIES(kokkoskernelsperf_gtest PUBLIC $<BUILD_INTERFACE:${GTEST_SOURCE_DIR}>)
-
-    #Gtest minimally requires C++ 11
-    TARGET_COMPILE_FEATURES(kokkoskernelsperf_gtest PUBLIC cxx_std_11)
-
     KOKKOSKERNELS_INCLUDE_DIRECTORIES(sparse)
 
     if(KokkosKernels_ENABLE_TESTS_AND_PERFSUITE)

diff --git a/perf_test/KokkosKernels_perf_test_utilities.hpp b/perf_test/KokkosKernels_perf_test_utilities.hpp
@@ -20,7 +20,7 @@
 #ifndef KOKKOSKERNELS_PERF_TEST_UTILITIES_HPP
 #define KOKKOSKERNELS_PERF_TEST_UTILITIES_HPP
 
-#include "KokkosKernels_TestUtils.hpp"  // for string_compare_no_case
+#include "KokkosKernels_TestStringUtils.hpp"  // for string_compare_no_case
 
 // Namepsace that defines common utilities
 // for performance tests

diff --git a/perf_test/blas/blas1/KokkosBlas_dot_mv_perf_test.cpp b/perf_test/blas/blas1/KokkosBlas_dot_mv_perf_test.cpp
@@ -14,10 +14,12 @@
 //
 //@HEADER
 
+#include <iostream>
+
 #include <Kokkos_Core.hpp>
 #include <src/KokkosBlas1_dot.hpp>
 #include <Kokkos_Random.hpp>
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 
 struct Params {
   int use_cuda    = 0;

diff --git a/perf_test/blas/blas1/KokkosBlas_dot_perf_test.cpp b/perf_test/blas/blas1/KokkosBlas_dot_perf_test.cpp
@@ -14,12 +14,14 @@
 //
 //@HEADER
 
+#include <iostream>
+
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Random.hpp>
 
 // For RPS implementation
 #include "KokkosBlas_dot_perf_test.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 
 struct Params {
   int use_cuda    = 0;

diff --git a/perf_test/blas/blas1/KokkosBlas_team_dot_perf_test.cpp b/perf_test/blas/blas1/KokkosBlas_team_dot_perf_test.cpp
@@ -14,10 +14,12 @@
 //
 //@HEADER
 
+#include <iostream>
+
 #include <Kokkos_Core.hpp>
 #include <KokkosBlas1_team_dot.hpp>
 #include <Kokkos_Random.hpp>
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 
 struct Params {
   int use_cuda    = 0;

diff --git a/perf_test/blas/blas1/KokkosBlas_team_dot_perf_test_benchmark.cpp b/perf_test/blas/blas1/KokkosBlas_team_dot_perf_test_benchmark.cpp
@@ -42,10 +42,12 @@
 //@HEADER
 */
 
+#include <iostream>
+
 #include <Kokkos_Core.hpp>
 #include <KokkosBlas1_team_dot.hpp>
 #include <Kokkos_Random.hpp>
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 
 #include <benchmark/benchmark.h>
 

diff --git a/perf_test/blas/blas2/KokkosBlas2_gemv_perf_test.cpp b/perf_test/blas/blas2/KokkosBlas2_gemv_perf_test.cpp
@@ -16,7 +16,7 @@
 
 #include "KokkosBlas2_gemv.hpp"
 #include <Kokkos_Random.hpp>
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 
 struct Params {
   int use_cuda    = 0;

diff --git a/perf_test/blas/blas2/KokkosBlas2_gemv_perf_test_benchmark.cpp b/perf_test/blas/blas2/KokkosBlas2_gemv_perf_test_benchmark.cpp
@@ -19,7 +19,7 @@
 
 #include "KokkosBlas2_gemv.hpp"
 
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 #include <Benchmark_Context.hpp>

diff --git a/perf_test/blas/blas2/KokkosBlas2_ger_perf_test_benchmark.cpp b/perf_test/blas/blas2/KokkosBlas2_ger_perf_test_benchmark.cpp
@@ -21,7 +21,7 @@
 #include "KokkosBlas2_ger.hpp"
 #include <typeinfo>
 
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 #include <Benchmark_Context.hpp>

diff --git a/perf_test/blas/blas3/CMakeLists.txt b/perf_test/blas/blas3/CMakeLists.txt
@@ -4,7 +4,6 @@ KOKKOSKERNELS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 KOKKOSKERNELS_ADD_EXECUTABLE(
     KokkosBlas3_perf_test
     SOURCES KokkosBlas3_perf_test.cpp
-    TESTONLYLIBS kokkoskernelsperf_gtest
 )
 
 KOKKOSKERNELS_ADD_EXECUTABLE(

diff --git a/perf_test/blas/blas3/KokkosBlas3_gemm_perf_test.hpp b/perf_test/blas/blas3/KokkosBlas3_gemm_perf_test.hpp
@@ -25,11 +25,12 @@
 
 #include <KokkosBlas3_gemm.hpp>
 
+#include "Kokkos_ArithTraits.hpp"
 #include "KokkosBatched_HostLevel_Gemm.hpp"
 #include "KokkosBatched_Gemm_Decl.hpp"
 #include "KokkosBatched_Util.hpp"
-#include "gtest/gtest.h"  // EXPECT_NEAR
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
+#include "KokkosKernels_TestVanilla.hpp"
 
 #include <chrono>
 
@@ -1368,7 +1369,8 @@ static inline bool __gemm_print_compare_failure(ViewType h_expected, ViewType h_
  */
 template <class ScalarType, class LayoutType>
 static inline bool __gemm_do_compare(view_type_3d expected, view_type_3d actual) {
-  double epsilon = Test::epsilon<ScalarType>::value * 1e3;
+  double epsilon = Kokkos::ArithTraits<ScalarType>::eps() * 1e3;
+
   STATUS;
 
   typename view_type_3d::HostMirror h_expected = Kokkos::create_mirror_view(expected);

diff --git a/perf_test/blas/blas3/KokkosBlas3_gemm_standalone_perf_test.cpp b/perf_test/blas/blas3/KokkosBlas3_gemm_standalone_perf_test.cpp
@@ -16,7 +16,7 @@
 
 #include "KokkosBlas3_gemm.hpp"
 #include <Kokkos_Random.hpp>
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 
 struct Params {
   int use_cuda    = 0;

diff --git a/perf_test/blas/blas3/KokkosBlas3_gemm_standalone_perf_test_benchmark.cpp b/perf_test/blas/blas3/KokkosBlas3_gemm_standalone_perf_test_benchmark.cpp
@@ -16,7 +16,7 @@
 
 #include "KokkosBlas3_gemm.hpp"
 #include <Kokkos_Random.hpp>
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 #include "Benchmark_Context.hpp"
 #include <benchmark/benchmark.h>

diff --git a/perf_test/graph/KokkosGraph_color.cpp b/perf_test/graph/KokkosGraph_color.cpp
@@ -26,7 +26,7 @@
 #include "KokkosSparse_CrsMatrix.hpp"
 #include "KokkosKernels_TestParameters.hpp"
 #include "KokkosGraph_Distance1Color.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosSparse_IOUtils.hpp"
 
 void print_options(std::ostream &os, const char *app_name, unsigned int indent = 0) {

diff --git a/perf_test/graph/KokkosGraph_color_d2.cpp b/perf_test/graph/KokkosGraph_color_d2.cpp
@@ -36,7 +36,7 @@
 #include <KokkosKernels_TestParameters.hpp>
 #include <KokkosGraph_Distance2Color.hpp>
 #include "KokkosKernels_default_types.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosSparse_IOUtils.hpp"
 
 using namespace KokkosGraph;

diff --git a/perf_test/graph/KokkosGraph_mis_d2.cpp b/perf_test/graph/KokkosGraph_mis_d2.cpp
@@ -37,7 +37,7 @@
 #include "KokkosSparse_spadd.hpp"
 #include "KokkosGraph_MIS2.hpp"
 #include "KokkosKernels_default_types.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosSparse_IOUtils.hpp"
 
 using namespace KokkosGraph;

diff --git a/perf_test/graph/KokkosGraph_triangle.cpp b/perf_test/graph/KokkosGraph_triangle.cpp
@@ -18,7 +18,7 @@
 #include "KokkosGraph_Triangle.hpp"
 #include "KokkosSparse_CrsMatrix.hpp"
 #include "KokkosSparse_IOUtils.hpp"  //for read_kokkos_crst_graph
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_TestParameters.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 

diff --git a/perf_test/lapack/KokkosLapack_SVD_benchmark.cpp b/perf_test/lapack/KokkosLapack_SVD_benchmark.cpp
@@ -14,9 +14,11 @@
 //
 //@HEADER
 
-#include "KokkosLapack_svd.hpp"
+#include <Kokkos_Random.hpp>
 
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_IOUtils.hpp"  // getRandomBounds
+#include "KokkosLapack_svd.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 #include <benchmark/benchmark.h>
@@ -72,7 +74,7 @@ void run_svd_benchmark(benchmark::State& state, const svd_parameters& svd_params
 
   // Initialize A with random numbers
   double randStart = 0, randEnd = 0;
-  Test::getRandomBounds(10.0, randStart, randEnd);
+  KokkosKernels::Impl::getRandomBounds(10.0, randStart, randEnd);
   Kokkos::fill_random(A, rand_pool, randStart, randEnd);
 
   for (auto _ : state) {

diff --git a/perf_test/ode/KokkosODE_BDF.cpp b/perf_test/ode/KokkosODE_BDF.cpp
@@ -16,7 +16,7 @@
 
 #include "KokkosODE_BDF.hpp"
 
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 #include <benchmark/benchmark.h>

diff --git a/perf_test/ode/KokkosODE_RK.cpp b/perf_test/ode/KokkosODE_RK.cpp
@@ -16,7 +16,7 @@
 
 #include "KokkosODE_RungeKutta.hpp"
 
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 #include <benchmark/benchmark.h>

diff --git a/perf_test/sparse/CMakeLists.txt b/perf_test/sparse/CMakeLists.txt
@@ -103,7 +103,6 @@ KOKKOSKERNELS_ADD_EXECUTABLE(
 KOKKOSKERNELS_ADD_EXECUTABLE(
         sparse_gs
         SOURCES KokkosSparse_gs.cpp
-        TESTONLYLIBS kokkoskernelsperf_gtest
 )
 
 KOKKOSKERNELS_ADD_EXECUTABLE(

diff --git a/perf_test/sparse/KokkosSparse_block_pcg.cpp b/perf_test/sparse/KokkosSparse_block_pcg.cpp
@@ -23,7 +23,7 @@
 #include "KokkosKernels_Utils.hpp"
 #include "KokkosSparse_IOUtils.hpp"
 
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 
 #define MAXVAL 1
 

diff --git a/perf_test/sparse/KokkosSparse_gs.cpp b/perf_test/sparse/KokkosSparse_gs.cpp
@@ -14,22 +14,25 @@
 //
 //@HEADER
 
+#include <iostream>
+#include <random>
+#include <vector>
+#include <string>
+#include <unordered_set>
+
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Timer.hpp>
+
 #include <KokkosKernels_Handle.hpp>
-#include <KokkosKernels_TestUtils.hpp>
+#include <KokkosKernels_TestStringUtils.hpp>
 #include <KokkosSparse_gauss_seidel.hpp>
 #include <KokkosSparse_spmv.hpp>
 #include <KokkosKernels_IOUtils.hpp>
 #include <KokkosBlas1_nrm2.hpp>
 #include <KokkosKernels_config.h>
 #include "KokkosKernels_default_types.hpp"
 #include "KokkosSparse_IOUtils.hpp"
-#include <iostream>
-#include <random>
-#include <vector>
-#include <string>
-#include <unordered_set>
+#include "KokkosKernels_TestMatrixUtils.hpp"
 
 using std::cout;
 using std::string;

diff --git a/perf_test/sparse/KokkosSparse_mdf.cpp b/perf_test/sparse/KokkosSparse_mdf.cpp
@@ -19,7 +19,7 @@
 #include "KokkosKernels_Handle.hpp"
 #include "KokkosSparse_IOUtils.hpp"
 #include "KokkosSparse_Utils_cusparse.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 #include "KokkosSparse_mdf.hpp"

diff --git a/perf_test/sparse/KokkosSparse_pcg.cpp b/perf_test/sparse/KokkosSparse_pcg.cpp
@@ -20,7 +20,7 @@
 #include "KokkosKernels_Utils.hpp"
 #include "KokkosKernels_IOUtils.hpp"
 #include "KokkosKernels_default_types.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosSparse_IOUtils.hpp"
 #include <iostream>
 

diff --git a/perf_test/sparse/KokkosSparse_spadd.cpp b/perf_test/sparse/KokkosSparse_spadd.cpp
@@ -20,7 +20,7 @@
 #include "KokkosSparse_IOUtils.hpp"
 #include "KokkosSparse_Utils_cusparse.hpp"
 #include "KokkosSparse_Utils_mkl.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 #include "KokkosSparse_spadd.hpp"

diff --git a/perf_test/sparse/KokkosSparse_spgemm.cpp b/perf_test/sparse/KokkosSparse_spgemm.cpp
@@ -23,7 +23,7 @@
 #include "KokkosBlas1_nrminf.hpp"
 #include "KokkosBlas1_axpby.hpp"
 #include "KokkosKernels_TestParameters.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 #define TRANSPOSEFIRST false

diff --git a/perf_test/sparse/KokkosSparse_spgemm_jacobi.cpp b/perf_test/sparse/KokkosSparse_spgemm_jacobi.cpp
@@ -18,7 +18,7 @@
 #include "KokkosKernels_default_types.hpp"
 #include "KokkosKernels_IOUtils.hpp"
 #include "KokkosSparse_run_spgemm_jacobi.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 
 void print_options() {
   std::cerr << "Options\n" << std::endl;

diff --git a/perf_test/sparse/KokkosSparse_spmv_benchmark.cpp b/perf_test/sparse/KokkosSparse_spmv_benchmark.cpp
@@ -21,7 +21,7 @@
 #include <KokkosKernels_IOUtils.hpp>
 #include <KokkosSparse_IOUtils.hpp>
 #include "KokkosKernels_default_types.hpp"
-#include "KokkosKernels_TestUtils.hpp"
+#include "KokkosKernels_TestStringUtils.hpp"
 #include "KokkosKernels_perf_test_utilities.hpp"
 
 // Headers for benchmark library