Fix warnings in tree mapping

alpaka-group · Jun 13, 2022 · 2a36ee9 · 2a36ee9
1 parent c2697f0
commit 2a36ee9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/include/llama/mapping/tree/Mapping.hpp b/include/llama/mapping/tree/Mapping.hpp
@@ -219,7 +219,9 @@ namespace llama::mapping::tree
             // TODO(bgruber): propagate use of size_type
             auto const basicTreeCoord = createTreeCoord<RecordCoord<RecordCoords...>>(ai);
             auto const resultTreeCoord = mergedFunctors.basicCoordToResultCoord(basicTreeCoord, basicTree);
-            const auto offset = internal::getTreeBlobByte(resultTree, resultTreeCoord);
+            const auto offset = static_cast<size_type>(internal::getTreeBlobByte(
+                resultTree,
+                resultTreeCoord)); // FIXME(bgruber): size_type should be propagated through getTreeBlobByte
             return {0, offset};
         }
     };

diff --git a/include/llama/mapping/tree/TreeFromDimensions.hpp b/include/llama/mapping/tree/TreeFromDimensions.hpp
@@ -127,11 +127,14 @@ namespace llama::mapping::tree
     LLAMA_FN_HOST_ACC_INLINE auto createTree(const ArrayIndex<V, N>& size)
     {
         if constexpr(Pos == N - 1)
-            return TreeFromRecordDim<RecordDim>{size[N - 1]};
+            return TreeFromRecordDim<RecordDim>{
+                static_cast<std::size_t>(size[N - 1])}; // FIXME(bgruber): propagate index type
         else
         {
             Tuple inner{createTree<RecordDim, V, N, Pos + 1>(size)};
-            return Node<NoName, decltype(inner)>{size[Pos], inner};
+            return Node<NoName, decltype(inner)>{
+                static_cast<std::size_t>(size[Pos]),
+                inner}; // FIXME(bgruber): propagate index type
         }
     };