From 4a5195e7a57bd4760cd2a7e600ecb63932ea216f Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Mon, 7 Nov 2022 13:15:06 +0100 Subject: [PATCH 1/2] fix unused function warning --- cuda/test/base/CMakeLists.txt | 2 +- cuda/test/base/{index_set.cu => index_set.cpp} | 9 --------- hip/test/base/CMakeLists.txt | 2 +- hip/test/base/{index_set.hip.cpp => index_set.cpp} | 9 --------- 4 files changed, 2 insertions(+), 20 deletions(-) rename cuda/test/base/{index_set.cu => index_set.cpp} (93%) rename hip/test/base/{index_set.hip.cpp => index_set.cpp} (93%) diff --git a/cuda/test/base/CMakeLists.txt b/cuda/test/base/CMakeLists.txt index 7b0cd28436c..9be3caf9faa 100644 --- a/cuda/test/base/CMakeLists.txt +++ b/cuda/test/base/CMakeLists.txt @@ -1,6 +1,6 @@ ginkgo_create_cuda_test(array) ginkgo_create_cuda_test(cuda_executor) -ginkgo_create_cuda_test(index_set) +ginkgo_create_test(index_set) ginkgo_create_test(cuda_executor_reset ADDITIONAL_LIBRARIES Threads::Threads) if(GINKGO_HAVE_HWLOC) find_package(NUMA REQUIRED) diff --git a/cuda/test/base/index_set.cu b/cuda/test/base/index_set.cpp similarity index 93% rename from cuda/test/base/index_set.cu rename to cuda/test/base/index_set.cpp index c5c09d2e3d9..fe812003113 100644 --- a/cuda/test/base/index_set.cu +++ b/cuda/test/base/index_set.cpp @@ -81,15 +81,6 @@ class index_set : public ::testing::Test { } } - static void assert_equal_arrays(const T num_elems, const T* a, const T* b) - { - if (num_elems > 0) { - for (auto i = 0; i < num_elems; ++i) { - EXPECT_EQ(a[i], b[i]); - } - } - } - std::shared_ptr exec; std::shared_ptr cuda; }; diff --git a/hip/test/base/CMakeLists.txt b/hip/test/base/CMakeLists.txt index 91dd4209d5d..7ed0d2ceb52 100644 --- a/hip/test/base/CMakeLists.txt +++ b/hip/test/base/CMakeLists.txt @@ -1,5 +1,5 @@ ginkgo_create_hip_test(hip_executor) -ginkgo_create_hip_test(index_set) +ginkgo_create_test(index_set) ginkgo_create_test(hip_executor_reset ADDITIONAL_LIBRARIES Threads::Threads) if(GINKGO_HAVE_HWLOC) find_package(NUMA REQUIRED) diff --git a/hip/test/base/index_set.hip.cpp b/hip/test/base/index_set.cpp similarity index 93% rename from hip/test/base/index_set.hip.cpp rename to hip/test/base/index_set.cpp index 0e5e024031d..dda52d2bd55 100644 --- a/hip/test/base/index_set.hip.cpp +++ b/hip/test/base/index_set.cpp @@ -81,15 +81,6 @@ class index_set : public ::testing::Test { } } - static void assert_equal_arrays(const T num_elems, const T* a, const T* b) - { - if (num_elems > 0) { - for (auto i = 0; i < num_elems; ++i) { - EXPECT_EQ(a[i], b[i]); - } - } - } - std::shared_ptr exec; std::shared_ptr hip; }; From f217d5170a41cfe95dea13bd78773014f159cff8 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Mon, 7 Nov 2022 13:16:04 +0100 Subject: [PATCH 2/2] disable obsolete Doxygen option CLASS_DIAGRAMS is obsolete and has been replaced by CLASS_GRAPH, which was available since forever. --- doc/conf/Doxyfile-pdf.in | 1 - doc/conf/Doxyfile.in | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/conf/Doxyfile-pdf.in b/doc/conf/Doxyfile-pdf.in index 9f7f3bf94cf..21d54095a2d 100644 --- a/doc/conf/Doxyfile-pdf.in +++ b/doc/conf/Doxyfile-pdf.in @@ -24,7 +24,6 @@ LATEX_TIMESTAMP = NO PREDEFINED = @default_predefined_macros@ protected=private # hide all unnecessary graphs -CLASS_DIAGRAMS = NO CLASS_GRAPH = NO COLLABORATION_GRAPH = NO GROUP_GRAPHS = NO diff --git a/doc/conf/Doxyfile.in b/doc/conf/Doxyfile.in index 9ad1631bf8a..2572ed4fd68 100644 --- a/doc/conf/Doxyfile.in +++ b/doc/conf/Doxyfile.in @@ -82,8 +82,7 @@ ALLEXTERNALS = NO EXTERNAL_GROUPS = YES # Graph generation -CLASS_DIAGRAMS = YES -CLASS_GRAPH = NO +CLASS_GRAPH = YES COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES GRAPHICAL_HIERARCHY = YES