Actually test installed Papi logger when available

ginkgo-project · Jun 5, 2020 · df7ae88 · df7ae88
1 parent 36cb424
commit df7ae88
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/include/ginkgo/core/log/papi.hpp b/include/ginkgo/core/log/papi.hpp
@@ -185,7 +185,7 @@ class Papi : public Logger {
      */
     static std::shared_ptr<Papi> create(
         std::shared_ptr<const gko::Executor> exec,
-        const Logger::mask_type &enabled_events)
+        const Logger::mask_type &enabled_events = Logger::all_events_mask)
     {
         return std::shared_ptr<Papi>(new Papi(exec, enabled_events));
     }

diff --git a/test_install/test_install.cpp b/test_install/test_install.cpp
@@ -196,10 +196,12 @@ int main(int, char **)
         auto test = gko::log::Stream<>::create(refExec);
     }
 
-    // core/log/convergence.hpp
+#ifdef GKO_HAVE_PAPI_SDE
+    // core/log/papi.hpp
     {
-        auto test = gko::log::Convergence<>::create(refExec);
+        auto test = gko::log::Papi<>::create(refExec);
     }
+#endif  // GKO_HAVE_PAPI_SDE
 
     // core/matrix/coo.hpp
     {

diff --git a/test_install/test_install_cuda.cu b/test_install/test_install_cuda.cu
@@ -200,10 +200,12 @@ int main(int, char **)
         gko::log::Stream<>::create(cudaExec);
     }
 
-    // core/log/convergence.hpp
+#ifdef GKO_HAVE_PAPI_SDE
+    // core/log/papi.hpp
     {
-        gko::log::Convergence<>::create(cudaExec);
+        gko::log::Papi<>::create(cudaExec);
     }
+#endif  // GKO_HAVE_PAPI_SDE
 
     // core/matrix/coo.hpp
     {