#5 fixed PR comments

kokkos · Dec 13, 2022 · d953f8f · d953f8f
1 parent 752db16
commit d953f8f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -90,7 +90,6 @@ jobs:
           -DCMAKE_CXX_FLAGS="-Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wuninitialized" \
           -DCMAKE_INSTALL_PREFIX=$PWD/../install \
           -DKokkosKernels_ENABLE_TESTS=ON \
-          -DKokkosKernels_ENABLE_BENCHMARKS=ON \
           -DKokkosKernels_ENABLE_EXAMPLES:BOOL=ON \
           -DKokkosKernels_INST_COMPLEX_DOUBLE=ON \
           -DKokkosKernels_INST_DOUBLE=ON \

diff --git a/.jenkins/nightly.groovy b/.jenkins/nightly.groovy
@@ -37,7 +37,6 @@ pipeline {
                                 -DCMAKE_BUILD_TYPE=Release \
                                 -DCMAKE_CXX_COMPILER=clang++ \
                                 -DKokkosKernels_ENABLE_TESTS=ON \
-                                -DKokkosKernels_ENABLE_BENCHMARKS=ON \
                                 -DKokkosKernels_ENABLE_EXAMPLES=ON \
                                 -DKokkosKernels_INST_DOUBLE=ON \
                                 -DKokkosKernels_INST_ORDINAL_INT=ON \
@@ -77,7 +76,6 @@ pipeline {
                                 -DCMAKE_CXX_EXTENSIONS=OFF \
                                 -DKokkosKernels_ENABLE_TESTS=ON \
                                 -DKokkosKernels_ENABLE_BENCHMARKS=ON \
-                                -DKokkosKernels_ENABLE_EXAMPLES=ON \
                                 -DKokkosKernels_INST_DOUBLE=ON \
                                 -DKokkosKernels_INST_ORDINAL_INT=ON \
                                 -DKokkosKernels_INST_OFFSET_INT=ON \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,7 +96,6 @@ SET(KokkosKernels_INSTALL_TESTING OFF CACHE INTERNAL
 IF (KokkosKernels_INSTALL_TESTING)
   # Force testing on if we are doing intall testing
   SET(KOKKOSKERNELS_ENABLE_TESTS ON)
-  SET(KOKKOSKERNELS_ENABLE_BENCHMARKS ON)
   SET(KOKKOSKERNELS_ENABLE_EXAMPLES ON)
   # Don't build, load installed kernels
   FIND_PACKAGE(KokkosKernels REQUIRED)

diff --git a/perf_test/BenchmarkMain.cpp b/perf_test/BenchmarkMain.cpp
@@ -36,7 +36,7 @@
 // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+// Questions? Contact Siva Rajamanickam (srajama@sandia.gov)
 //
 // ************************************************************************
 //@HEADER
@@ -51,7 +51,7 @@ int main(int argc, char** argv) {
   Kokkos::initialize(argc, argv);
   benchmark::Initialize(&argc, argv);
   benchmark::SetDefaultTimeUnit(benchmark::kSecond);
-  KokkosBenchmark::add_benchmark_context(true);
+  KokkosKernelsBenchmark::add_benchmark_context(true);
 
   benchmark::RunSpecifiedBenchmarks();
 

diff --git a/perf_test/Benchmark_Context.hpp b/perf_test/Benchmark_Context.hpp
@@ -36,22 +36,22 @@
 // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
+// Questions? Contact Siva Rajamanickam (srajama@sandia.gov)
 //
 // ************************************************************************
 //@HEADER
 */
 
-#ifndef KOKKOS_CORE_PERFTEST_BENCHMARK_CONTEXT_HPP
-#define KOKKOS_CORE_PERFTEST_BENCHMARK_CONTEXT_HPP
+#ifndef KOKKOSKERNELS_PERFTEST_BENCHMARK_CONTEXT_HPP
+#define KOKKOSKENERLS_PERFTEST_BENCHMARK_CONTEXT_HPP
 
 #include <string>
 
 #include <benchmark/benchmark.h>
 
 #include <Kokkos_Core.hpp>
 
-namespace KokkosBenchmark {
+namespace KokkosKernelsBenchmark {
 
 /// \brief Remove unwanted spaces and colon signs from input string. In case of
 /// invalid input it will return an empty string.
@@ -94,6 +94,6 @@ void add_benchmark_context(bool verbose = false) {
   add_kokkos_configuration(verbose);
 }
 
-}  // namespace KokkosBenchmark
+}  // namespace KokkosKernelsBenchmark
 
 #endif
diff --git a/perf_test/CMakeLists.txt b/perf_test/CMakeLists.txt
@@ -51,7 +51,7 @@ if (KokkosKernels_ENABLE_PERFTESTS)
     ADD_SUBDIRECTORY(performance)
     #ADD_SUBDIRECTORY(common)
 
-    IF (KOKKOS_HAS_TRILINOS)
+    IF (KOKKOSKERNELS_HAS_TRILINOS)
       message(FATAL_ERROR "Benchmarks are not supported when building as part of Trilinos")
     ENDIF()
 
@@ -64,6 +64,8 @@ if (KokkosKernels_ENABLE_PERFTESTS)
       SET(BENCHMARK_ENABLE_TESTING OFF)
 
       list(APPEND CMAKE_MESSAGE_INDENT "    ")
+      #Note: recent bug (google/benchmark#1441) is preventing us from using
+      # the latest benchmark release.
       FetchContent_Declare(
         googlebenchmark
         URL https://github.com/google/benchmark/archive/refs/tags/v1.6.2.tar.gz