fix after rebase

ginkgo-project · Oct 2, 2024 · 25f386f · 25f386f
1 parent d8982fe
commit 25f386f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/core/config/type_descriptor_helper.hpp b/core/config/type_descriptor_helper.hpp
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include <ginkgo/core/base/half.hpp>
 #include <ginkgo/core/base/types.hpp>
 #include <ginkgo/core/config/property_tree.hpp>
 #include <ginkgo/core/config/type_descriptor.hpp>
@@ -38,8 +39,10 @@ struct type_string {};
 TYPE_STRING_OVERLOAD(void, "void");
 TYPE_STRING_OVERLOAD(double, "float64");
 TYPE_STRING_OVERLOAD(float, "float32");
+TYPE_STRING_OVERLOAD(half, "float16");
 TYPE_STRING_OVERLOAD(std::complex<double>, "complex<float64>");
 TYPE_STRING_OVERLOAD(std::complex<float>, "complex<float32>");
+TYPE_STRING_OVERLOAD(std::complex<half>, "complex<float16>");
 TYPE_STRING_OVERLOAD(int32, "int32");
 TYPE_STRING_OVERLOAD(int64, "int64");
 

diff --git a/core/log/solver_progress.cpp b/core/log/solver_progress.cpp
@@ -247,6 +247,14 @@ class SolverProgressStore : public SolverProgress {
         run<gko::matrix::Dense<double>, gko::matrix::Dense<float>,
             gko::matrix::Dense<std::complex<double>>,
             gko::matrix::Dense<std::complex<float>>,
+#if GINKGO_ENABLE_HALF
+            gko::matrix::Dense<gko::half>,
+            gko::matrix::Dense<std::complex<gko::half>>,
+            gko::WritableToMatrixData<gko::half, int32>,
+            gko::WritableToMatrixData<std::complex<gko::half>, int32>,
+            gko::WritableToMatrixData<gko::half, int64>,
+            gko::WritableToMatrixData<std::complex<gko::half>, int64>,
+#endif
             // fallback for other matrix types
             gko::WritableToMatrixData<double, int32>,
             gko::WritableToMatrixData<float, int32>,

diff --git a/cuda/solver/common_trs_kernels.cuh b/cuda/solver/common_trs_kernels.cuh
@@ -359,6 +359,10 @@ struct float_to_unsigned_impl<float> {
     using type = uint32;
 };
 
+template <>
+struct float_to_unsigned_impl<__half> {
+    using type = uint16;
+};
 
 /**
  * Checks if a floating point number representation matches the representation