Use the correct memory space in the empty deriv chunkspans

Author: tretre91

benchmarks/splines.cpp

@@ -183,7 +183,9 @@ void characteristics_advection_unitary(benchmark::State& state)
             ddc::StridedDiscreteDomain<
                     DDimX<IsNonUniform, s_degree_x>,
                     ddc::Deriv<typename DDimX<IsNonUniform, s_degree_x>::continuous_dimension_type>,
-                    DDimY>> const derivs {};
+                    DDimY>,
+            Kokkos::layout_right,
+            typename ExecSpace::memory_space> const derivs {};
 
     for (auto _ : state) {
         Kokkos::Profiling::pushRegion("FeetCharacteristics");

examples/characteristics_advection.cpp

@@ -13,6 +13,7 @@
 #include <ddc/kernels/splines.hpp>
 
 #include <Kokkos_Core.hpp>
+#include <Kokkos_Core_fwd.hpp>
 
 #define PERIODIC_DOMAIN // Comment this to run non-periodic simulation
 
@@ -234,10 +235,9 @@ int main(int argc, char** argv)
     // Instantiate empty derivative chunkspan
     ddc::ChunkSpan<
             double const,
-            ddc::StridedDiscreteDomain<
-                    DDimX,
-                    ddc::Deriv<DDimX::continuous_dimension_type>,
-                    DDimY>> const derivs {};
+            ddc::StridedDiscreteDomain<DDimX, ddc::Deriv<DDimX::continuous_dimension_type>, DDimY>,
+            Kokkos::layout_right,
+            ddc::DeviceAllocator<double>::memory_space> const derivs {};
     //! [instantiate intermediate chunks]
 
 

tests/splines/extrapolation_rule.cpp

@@ -199,14 +199,21 @@ void ExtrapolationRuleSplineTest()
     auto const dom_spline = spline_builder.batched_spline_domain(dom_vals);
 
     // Create empty ChunkSpans for the derivatives, as they are not used here
-    ddc::ChunkSpan<double const, ddc::StridedDiscreteDomain<DDimI1, ddc::Deriv<I1>, DDimI2>> const
-            derivs1 {};
-    ddc::ChunkSpan<double const, ddc::StridedDiscreteDomain<DDimI2, DDimI1, ddc::Deriv<I2>>> const
-            derivs2 {};
     ddc::ChunkSpan<
             double const,
-            ddc::StridedDiscreteDomain<DDimI1, DDimI2, ddc::Deriv<I1>, ddc::Deriv<I2>>> const
-            mixed_derivs1_2 {};
+            ddc::StridedDiscreteDomain<DDimI1, ddc::Deriv<I1>, DDimI2>,
+            Kokkos::layout_right,
+            MemorySpace> const derivs1 {};
+    ddc::ChunkSpan<
+            double const,
+            ddc::StridedDiscreteDomain<DDimI2, DDimI1, ddc::Deriv<I2>>,
+            Kokkos::layout_right,
+            MemorySpace> const derivs2 {};
+    ddc::ChunkSpan<
+            double const,
+            ddc::StridedDiscreteDomain<DDimI1, DDimI2, ddc::Deriv<I1>, ddc::Deriv<I2>>,
+            Kokkos::layout_right,
+            MemorySpace> const mixed_derivs1_2 {};
 
     // Allocate and fill a chunk containing values to be passed as input to spline_builder. Those are values of cosine along interest dimension duplicated along batch dimensions
     ddc::Chunk vals_1d_host_alloc(dom_interpolation, ddc::HostAllocator<double>());

tests/splines/periodic_spline_builder.cpp

@@ -106,8 +106,11 @@ void TestPeriodicSplineBuilderTestIdentity()
             KOKKOS_LAMBDA(DElemX const ix) { yvals(ix) = evaluator(ddc::coordinate(ix)); });
 
     // 6. Create a empty chunk for the derivatives, as they are not used with periodic boundary conditions
-    ddc::ChunkSpan<double const, ddc::StridedDiscreteDomain<DDimX, ddc::Deriv<DimX>>> const
-            derivs {};
+    ddc::ChunkSpan<
+            double const,
+            ddc::StridedDiscreteDomain<DDimX, ddc::Deriv<DimX>>,
+            Kokkos::layout_right,
+            memory_space> const derivs {};
 
     // 7. Finally build the spline by filling `coef`
     spline_builder(coef.span_view(), yvals.span_cview(), derivs);

tests/splines/periodicity_spline_builder.cpp

@@ -149,8 +149,11 @@ void PeriodicitySplineBuilderTest()
     ddc::ChunkSpan const coef = coef_alloc.span_view();
 
     // Instantiate empty chunk of derivatives
-    ddc::ChunkSpan<double const, ddc::StridedDiscreteDomain<DDim<X>, ddc::Deriv<X>>> const
-            derivs {};
+    ddc::ChunkSpan<
+            double const,
+            ddc::StridedDiscreteDomain<DDim<X>, ddc::Deriv<X>>,
+            Kokkos::layout_right,
+            MemorySpace> const derivs {};
 
     // Finally compute the spline by filling `coef`
     spline_builder(coef, vals.span_cview(), derivs.span_cview());