fixup! Fix several conversion warnings

acts-project · Jul 25, 2024 · 5d3fb0a · 5d3fb0a
1 parent 140bd91
commit 5d3fb0a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/lib/core/covfie/core/backend/transformer/nearest_neighbour.hpp b/lib/core/covfie/core/backend/transformer/nearest_neighbour.hpp
@@ -140,7 +140,9 @@ struct nearest_neighbour {
 
             for (std::size_t i = 0; i < contravariant_output_t::dimensions; ++i)
             {
-                nc[i] = std::lrintf(c[i]);
+                nc[i] = static_cast<typename contravariant_output_t::vector_t>(
+                    std::lrintf(c[i])
+                );
             }
 
             return m_backend.at(nc);

diff --git a/lib/cuda/covfie/cuda/backend/primitive/cuda_texture.hpp b/lib/cuda/covfie/cuda/backend/primitive/cuda_texture.hpp
@@ -125,32 +125,24 @@ struct cuda_texture {
 
                     std::size_t idx2 = static_cast<std::size_t>(idx);
 
+                    using stage_scalar_t =
+                        typename covariant_output_t::scalar_t;
+
                     if constexpr (covariant_output_t::dimensions == 1) {
-                        stage[idx2] =
-                            static_cast<covariant_output_t::scalar_t>(v[0]);
+                        stage[idx2] = static_cast < stage_scalar_t(v[0]);
                     } else if constexpr (covariant_output_t::dimensions == 2) {
-                        stage[idx2].x =
-                            static_cast<covariant_output_t::scalar_t>(v[0]);
-                        stage[idx2].y =
-                            static_cast<covariant_output_t::scalar_t>(v[1]);
+                        stage[idx2].x = static_cast < stage_scalar_t(v[0]);
+                        stage[idx2].y = static_cast < stage_scalar_t(v[1]);
                     } else if constexpr (covariant_output_t::dimensions == 3) {
-                        stage[idx2].x =
-                            static_cast<covariant_output_t::scalar_t>(v[0]);
-                        stage[idx2].y =
-                            static_cast<covariant_output_t::scalar_t>(v[1]);
-                        stage[idx2].z =
-                            static_cast<covariant_output_t::scalar_t>(v[2]);
-                        stage[idx2].w =
-                            static_cast<covariant_output_t::scalar_t>(0.f);
+                        stage[idx2].x = static_cast < stage_scalar_t(v[0]);
+                        stage[idx2].y = static_cast < stage_scalar_t(v[1]);
+                        stage[idx2].z = static_cast < stage_scalar_t(v[2]);
+                        stage[idx2].w = static_cast < stage_scalar_t(0.f);
                     } else if constexpr (covariant_output_t::dimensions == 4) {
-                        stage[idx2].x =
-                            static_cast<covariant_output_t::scalar_t>(v[0]);
-                        stage[idx2].y =
-                            static_cast<covariant_output_t::scalar_t>(v[1]);
-                        stage[idx2].z =
-                            static_cast<covariant_output_t::scalar_t>(v[2]);
-                        stage[idx2].w =
-                            static_cast<covariant_output_t::scalar_t>(v[3]);
+                        stage[idx2].x = static_cast < stage_scalar_t(v[0]);
+                        stage[idx2].y = static_cast < stage_scalar_t(v[1]);
+                        stage[idx2].z = static_cast < stage_scalar_t(v[2]);
+                        stage[idx2].w = static_cast < stage_scalar_t(v[3]);
                     }
                 }),
                 std::tuple_cat(srcSize)