fix missing device_type and ptr_param

ginkgo-project · Mar 23, 2023 · bbb0fcb · bbb0fcb
1 parent 710fcc8
commit bbb0fcb
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 2 deletions.
diff --git a/common/cuda_hip/solver/multigrid_kernels.hpp.inc b/common/cuda_hip/solver/multigrid_kernels.hpp.inc
@@ -191,8 +191,8 @@ void kcycle_check_stop(std::shared_ptr<const DefaultExecutor> exec,
         kernel::kcycle_check_stop_kernel<<<grid, default_block_size, 0,
                                            exec->get_stream()>>>(
             nrhs, as_device_type(old_norm->get_const_values()),
-            as_device_type(new_norm->get_const_values()), rel_tol,
-            as_device_type(dis_stop.get_data()));
+            as_device_type(new_norm->get_const_values()),
+            as_device_type(rel_tol), as_device_type(dis_stop.get_data()));
     }
     is_stop = exec->copy_val_to_host(dis_stop.get_const_data());
 }

diff --git a/include/ginkgo/core/distributed/matrix.hpp b/include/ginkgo/core/distributed/matrix.hpp
@@ -302,6 +302,11 @@ class Matrix
 #if GINKGO_ENABLE_HALF
     friend class Matrix<previous_precision<previous_precision<ValueType>>,
                         LocalIndexType, GlobalIndexType>;
+    using ConvertibleTo<
+        Matrix<next_precision<next_precision<value_type>>, local_index_type,
+               global_index_type>>::convert_to;
+    using ConvertibleTo<Matrix<next_precision<next_precision<value_type>>,
+                               local_index_type, global_index_type>>::move_to;
 
     void convert_to(
         Matrix<next_precision<next_precision<value_type>>, local_index_type,

diff --git a/include/ginkgo/core/distributed/vector.hpp b/include/ginkgo/core/distributed/vector.hpp
@@ -198,6 +198,10 @@ class Vector
 
 #if GINKGO_ENABLE_HALF
     friend class Vector<previous_precision<previous_precision<ValueType>>>;
+    using ConvertibleTo<
+        Vector<next_precision<next_precision<ValueType>>>>::convert_to;
+    using ConvertibleTo<
+        Vector<next_precision<next_precision<ValueType>>>>::move_to;
 
     void convert_to(Vector<next_precision<next_precision<ValueType>>>* result)
         const override;

diff --git a/include/ginkgo/core/matrix/coo.hpp b/include/ginkgo/core/matrix/coo.hpp
@@ -124,6 +124,10 @@ class Coo : public EnableLinOp<Coo<ValueType, IndexType>>,
 #if GINKGO_ENABLE_HALF
     friend class Coo<previous_precision<previous_precision<ValueType>>,
                      IndexType>;
+    using ConvertibleTo<
+        Coo<next_precision<next_precision<ValueType>>, IndexType>>::convert_to;
+    using ConvertibleTo<
+        Coo<next_precision<next_precision<ValueType>>, IndexType>>::move_to;
 
     void convert_to(Coo<next_precision<next_precision<ValueType>>, IndexType>*
                         result) const override;

diff --git a/include/ginkgo/core/matrix/csr.hpp b/include/ginkgo/core/matrix/csr.hpp
@@ -730,6 +730,10 @@ class Csr : public EnableLinOp<Csr<ValueType, IndexType>>,
 #if GINKGO_ENABLE_HALF
     friend class Csr<previous_precision<previous_precision<ValueType>>,
                      IndexType>;
+    using ConvertibleTo<
+        Csr<next_precision<next_precision<ValueType>>, IndexType>>::convert_to;
+    using ConvertibleTo<
+        Csr<next_precision<next_precision<ValueType>>, IndexType>>::move_to;
 
     void convert_to(Csr<next_precision<next_precision<ValueType>>, IndexType>*
                         result) const override;

diff --git a/include/ginkgo/core/matrix/dense.hpp b/include/ginkgo/core/matrix/dense.hpp
@@ -308,6 +308,10 @@ class Dense
 
 #if GINKGO_ENABLE_HALF
     friend class Dense<previous_precision<previous_precision<ValueType>>>;
+    using ConvertibleTo<
+        Dense<next_precision<next_precision<ValueType>>>>::convert_to;
+    using ConvertibleTo<
+        Dense<next_precision<next_precision<ValueType>>>>::move_to;
 
     void convert_to(Dense<next_precision<next_precision<ValueType>>>* result)
         const override;

diff --git a/include/ginkgo/core/matrix/diagonal.hpp b/include/ginkgo/core/matrix/diagonal.hpp
@@ -116,6 +116,10 @@ class Diagonal
 
 #if GINKGO_ENABLE_HALF
     friend class Diagonal<previous_precision<previous_precision<ValueType>>>;
+    using ConvertibleTo<
+        Diagonal<next_precision<next_precision<ValueType>>>>::convert_to;
+    using ConvertibleTo<
+        Diagonal<next_precision<next_precision<ValueType>>>>::move_to;
 
     void convert_to(Diagonal<next_precision<next_precision<ValueType>>>* result)
         const override;

diff --git a/include/ginkgo/core/matrix/ell.hpp b/include/ginkgo/core/matrix/ell.hpp
@@ -125,6 +125,10 @@ class Ell : public EnableLinOp<Ell<ValueType, IndexType>>,
 #if GINKGO_ENABLE_HALF
     friend class Ell<previous_precision<previous_precision<ValueType>>,
                      IndexType>;
+    using ConvertibleTo<
+        Ell<next_precision<next_precision<ValueType>>, IndexType>>::convert_to;
+    using ConvertibleTo<
+        Ell<next_precision<next_precision<ValueType>>, IndexType>>::move_to;
 
     void convert_to(Ell<next_precision<next_precision<ValueType>>, IndexType>*
                         result) const override;

diff --git a/include/ginkgo/core/matrix/fbcsr.hpp b/include/ginkgo/core/matrix/fbcsr.hpp
@@ -189,6 +189,10 @@ class Fbcsr : public EnableLinOp<Fbcsr<ValueType, IndexType>>,
 #if GINKGO_ENABLE_HALF
     friend class Fbcsr<previous_precision<previous_precision<ValueType>>,
                        IndexType>;
+    using ConvertibleTo<Fbcsr<next_precision<next_precision<ValueType>>,
+                              IndexType>>::convert_to;
+    using ConvertibleTo<
+        Fbcsr<next_precision<next_precision<ValueType>>, IndexType>>::move_to;
 
     void convert_to(Fbcsr<next_precision<next_precision<ValueType>>, IndexType>*
                         result) const override;

diff --git a/include/ginkgo/core/matrix/hybrid.hpp b/include/ginkgo/core/matrix/hybrid.hpp
@@ -400,6 +400,10 @@ class Hybrid
 #if GINKGO_ENABLE_HALF
     friend class Hybrid<previous_precision<previous_precision<ValueType>>,
                         IndexType>;
+    using ConvertibleTo<Hybrid<next_precision<next_precision<ValueType>>,
+                               IndexType>>::convert_to;
+    using ConvertibleTo<
+        Hybrid<next_precision<next_precision<ValueType>>, IndexType>>::move_to;
 
     void convert_to(Hybrid<next_precision<next_precision<ValueType>>,
                            IndexType>* result) const override;

diff --git a/include/ginkgo/core/matrix/sellp.hpp b/include/ginkgo/core/matrix/sellp.hpp
@@ -116,6 +116,10 @@ class Sellp : public EnableLinOp<Sellp<ValueType, IndexType>>,
 #if GINKGO_ENABLE_HALF
     friend class Sellp<previous_precision<previous_precision<ValueType>>,
                        IndexType>;
+    using ConvertibleTo<Sellp<next_precision<next_precision<ValueType>>,
+                              IndexType>>::convert_to;
+    using ConvertibleTo<
+        Sellp<next_precision<next_precision<ValueType>>, IndexType>>::move_to;
 
     void convert_to(Sellp<next_precision<next_precision<ValueType>>, IndexType>*
                         result) const override;