Merge pull request #4 from SCOREC/multi-slice-cab-factory

Fixed issue with vectorLength, removed it from test file

Author: HazelCullom

src/SliceWrapper.hpp

@@ -26,10 +26,12 @@ using namespace Cabana;
 
 template <class ExecutionSpace, class MemorySpace, class... Ts>
 class CabSliceFactory {
-  static constexpr int vecLen = Impl::PerformanceTraits<ExecutionSpace>::vector_length/8;
   using TypeTuple = std::tuple<Ts...>;
   using DeviceType = Kokkos::Device<ExecutionSpace, MemorySpace>;
   using DataTypes = Cabana::MemberTypes<Ts...>;
+public:
+  static constexpr int vecLen = Cabana::AoSoA<DataTypes, DeviceType>::vector_length;
+private:
   using soa_t = SoA<DataTypes, vecLen>;
 
   template <class T, int stride>
@@ -47,7 +49,7 @@ class CabSliceFactory {
   template <std::size_t index>
   auto makeSliceCab() {
     using type = std::tuple_element_t<index, TypeTuple>;
-    const int stride = (vecLen * sizeof(soa_t)) / (4 * sizeof(type));
+    const int stride = sizeof(soa_t) / sizeof(type);
     auto slice = Cabana::slice<index>(aosoa);
     return wrapper_slice_t< type, stride >(std::move(slice));
   }

test/SliceWrapper.cpp

@@ -2,7 +2,6 @@
 
 int main(int argc, char* argv[]) {
   // AoSoA parameters
-  const int vecLen = 4;
   int num_tuples = 10;
 
   Kokkos::ScopeGuard scope_guard(argc, argv);
@@ -20,7 +19,7 @@ int main(int argc, char* argv[]) {
   auto slice_wrapper3 = cabSliceFactory.makeSliceCab<3>();
 
   // simd_parallel_for setup
-  Cabana::SimdPolicy<vecLen, ExecutionSpace> simd_policy(0, num_tuples);
+  Cabana::SimdPolicy<cabSliceFactory.vecLen, ExecutionSpace> simd_policy(0, num_tuples);
 
   // kernel that reads and writes
   auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a) {