allow complex inner mapping construction in Bytesplit

alpaka-group · Dec 15, 2021 · 021efe5 · 021efe5
1 parent ef045ec
commit 021efe5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/include/llama/mapping/Bytesplit.hpp b/include/llama/mapping/Bytesplit.hpp
@@ -37,6 +37,12 @@ namespace llama::mapping
         {
         }
 
+        template<typename... Args>
+        LLAMA_FN_HOST_ACC_INLINE constexpr explicit Bytesplit(std::tuple<Args...> innerMappingArgs, TRecordDim = {})
+            : Inner(std::make_from_tuple<Inner>(innerMappingArgs))
+        {
+        }
+
         template<std::size_t... RecordCoords>
         static constexpr auto isComputed(RecordCoord<RecordCoords...>)
         {

diff --git a/tests/mapping.Bytesplit.cpp b/tests/mapping.Bytesplit.cpp
@@ -57,6 +57,21 @@ TEST_CASE("mapping.ByteSplit.ChangeType.SoA")
     iotaCheckView(view);
 }
 
+TEST_CASE("mapping.ByteSplit.Split.BitPackedIntSoA")
+{
+    auto view = llama::allocView(llama::mapping::Bytesplit<
+                                 llama::ArrayExtentsDynamic<1>,
+                                 Vec3I,
+                                 llama::mapping::PreconfiguredSplit<
+                                     llama::RecordCoord<1>,
+                                     llama::mapping::BitPackedIntSoA,
+                                     llama::mapping::PreconfiguredAoS<>::type,
+                                     true>::type>{
+        std::tuple{std::tuple{23, llama::ArrayExtents{128}}, std::tuple{llama::ArrayExtents{128}}}});
+    iotaFillView(view);
+    iotaCheckView(view);
+}
+
 TEST_CASE("mapping.ByteSplit.SoA.verify")
 {
     using Mapping

diff --git a/tests/proxyrefopmixin.cpp b/tests/proxyrefopmixin.cpp
@@ -231,7 +231,8 @@ namespace
 TEST_CASE("proxyrefopmixin.Bytesplit")
 {
     auto view = llama::allocView(
-        llama::mapping::Bytesplit<llama::ArrayExtents<4>, Vec3I, llama::mapping::PreconfiguredAoS<>::type>{{}});
+        llama::mapping::Bytesplit<llama::ArrayExtents<4>, Vec3I, llama::mapping::PreconfiguredAoS<>::type>{
+            llama::ArrayExtents<4>{}});
     testProxyRef(view(2)(tag::X{}));
 }