review updates and formatting

ginkgo-project · Jul 5, 2024 · b59f135 · b59f135
1 parent 0886d22
commit b59f135
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -720,7 +720,7 @@ cudamemcheck:
     - .before_script_template
     - .default_variables
     - .deploy_condition
-  image: use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
+  image: ginkgohub/cuda:110-mvapich2-gnu9-llvm9-intel2020
   tags:
     - private_ci
     - nvidia-gpu

diff --git a/core/log/profiler_hook.cpp b/core/log/profiler_hook.cpp
@@ -431,13 +431,6 @@ profiling_scope_guard::~profiling_scope_guard()
     }
 }
 
-profiling_scope_guard::profiling_scope_guard(profiling_scope_guard&& other)
-    : empty_{std::exchange(other.empty_, true)},
-      name_{std::exchange(other.name_, nullptr)},
-      category_{other.category_},
-      end_{std::move(other.end_)}
-{}
-
 
 }  // namespace log
 }  // namespace gko
diff --git a/core/log/profiler_hook.hpp b/core/log/profiler_hook.hpp
@@ -6,11 +6,10 @@
 #define GKO_CORE_LOG_PROFILER_HOOK_HPP_
 
 
-#include <ginkgo/core/log/profiler_hook.hpp>
-
-
 #include <optional>
 
+#include <ginkgo/core/log/profiler_hook.hpp>
+
 
 namespace gko {
 namespace log {

diff --git a/include/ginkgo/core/base/std_extensions.hpp b/include/ginkgo/core/base/std_extensions.hpp
@@ -32,7 +32,10 @@ using void_t = std::void_t<Ts...>;
 
 
 GKO_DEPRECATED("use std::uncaught_exceptions")
-inline bool uncaught_exception() noexcept { return std::uncaught_exception(); }
+inline bool uncaught_exception() noexcept
+{
+    return std::uncaught_exceptions() > 0;
+}
 
 
 // Kept for backward compatibility.

diff --git a/include/ginkgo/core/log/profiler_hook.hpp b/include/ginkgo/core/log/profiler_hook.hpp
@@ -419,8 +419,7 @@ class profiling_scope_guard {
 
     profiling_scope_guard(const profiling_scope_guard&) = delete;
 
-    /** Move-constructs from another scope guard, other will be left empty. */
-    profiling_scope_guard(profiling_scope_guard&& other);
+    profiling_scope_guard(profiling_scope_guard&& other) = delete;
 
     profiling_scope_guard& operator=(const profiling_scope_guard&) = delete;
 

diff --git a/include/ginkgo/core/solver/solver_traits.hpp b/include/ginkgo/core/solver/solver_traits.hpp
@@ -8,7 +8,6 @@
 
 #include <type_traits>
 
-
 #include <ginkgo/core/stop/criterion.hpp>