Reduce warning amount with nvhpc

ginkgo-project · May 16, 2023 · bd3b858 · bd3b858
1 parent b37bf44
commit bd3b858
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/core/test/solver/gcr.cpp b/core/test/solver/gcr.cpp
@@ -151,7 +151,7 @@ TYPED_TEST(Gcr, CanBeMoved)
     using Solver = typename TestFixture::Solver;
     auto copy = this->gcr_factory->generate(Mtx::create(this->exec));
 
-    copy->copy_from(std::move(this->solver));
+    copy->move_from(this->solver);
 
     ASSERT_EQ(copy->get_size(), gko::dim<2>(3, 3));
     auto copy_mtx = static_cast<Solver*>(copy.get())->get_system_matrix();

diff --git a/include/ginkgo/core/base/polymorphic_object.hpp b/include/ginkgo/core/base/polymorphic_object.hpp
@@ -183,7 +183,7 @@ class PolymorphicObject : public log::EnableLogging<PolymorphicObject> {
     template <typename Derived, typename Deleter>
     [[deprecated(
         "This function will be removed in a future release, the replacement "
-        "will copy instead of move. If a move in intended, use move_to "
+        "will copy instead of move. If a move is intended, use move_from "
         "instead.")]] std::
         enable_if_t<
             std::is_base_of<PolymorphicObject, std::decay_t<Derived>>::value,

diff --git a/include/ginkgo/core/log/logger.hpp b/include/ginkgo/core/log/logger.hpp
@@ -518,18 +518,24 @@ public:                                                              \
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+#endif  // defined(__GNUC__) || defined(__clang__)
+#ifdef __NVCOMPILER
+#pragma diag_suppress 1445
+#endif  // __NVCOMPILER
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 5211, 4973, 4974)
-#endif
+#endif  // _MSC_VER
         this->on_iteration_complete(solver, it, r, x, tau, implicit_tau_sq);
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
-#endif
+#endif  // defined(__GNUC__) || defined(__clang__)
+#ifdef __NVCOMPILER
+#pragma diag_warning 1445
+#endif  // __NVCOMPILER
 #ifdef _MSC_VER
 #pragma warning(pop)
-#endif
+#endif  // _MSC_VER
     }
 
 public:

diff --git a/reference/test/solver/gcr_kernels.cpp b/reference/test/solver/gcr_kernels.cpp
@@ -119,7 +119,6 @@ class Gcr : public ::testing::Test {
                                    exec))
     {
         auto small_size = gko::dim<2>{3, 2};
-        constexpr gko::size_type small_restart{2};
         small_b = gko::initialize<Mtx>(
             {I<T>{1., 2.}, I<T>{3., 4.}, I<T>{5., 6.}}, exec);
         small_x = Mtx::create(exec, small_size);