fixes and workaround

- shared memory: fix type deduction

Author: psychocoderHPC

include/picongpu/plugins/openPMD/openPMDWriter.hpp

@@ -58,6 +58,7 @@
 #include <pmacc/mappings/simulation/GridController.hpp>
 #include <pmacc/mappings/simulation/SubGrid.hpp>
 #include <pmacc/math/Vector.hpp>
+#include <pmacc/meta/AllCombinations.hpp>
 #include <pmacc/particles/IdProvider.def>
 #include <pmacc/particles/frame_types.hpp>
 #include <pmacc/particles/memory/buffers/MallocMCBuffer.hpp>
@@ -258,7 +259,7 @@ make sure that environment variable OPENPMD_BP_BACKEND is not set to ADIOS1.
                 pmacc::mp_at<T_TupleVector, pmacc::mp_int<1>>>;
 
             using AllParticlesTimesAllFilters
-                = AllCombinations<FileOutputParticles, particles::filter::AllParticleFilters>;
+                = pmacc::AllCombinations<FileOutputParticles, particles::filter::AllParticleFilters>;
 
             using AllSpeciesFilter = pmacc::mp_transform<CreateSpeciesFilter, AllParticlesTimesAllFilters>;
 

include/pmacc/math/vector/compile-time/Int.hpp

@@ -44,33 +44,8 @@ namespace pmacc
              * default parameter is used to distinguish between values given by
              * the user and unset values.
              */
-            template<
-                int x = traits::limits::Max<int>::value,
-                int y = traits::limits::Max<int>::value,
-                int z = traits::limits::Max<int>::value>
-            struct Int
-                : public CT::Vector<
-                      std::integral_constant<int, x>,
-                      std::integral_constant<int, y>,
-                      std::integral_constant<int, z>>
-            {
-            };
-
-            template<>
-            struct Int<> : public CT::Vector<>
-            {
-            };
-
-            template<int x>
-            struct Int<x> : public CT::Vector<std::integral_constant<int, x>>
-            {
-            };
-
-            template<int x, int y>
-            struct Int<x, y> : public CT::Vector<std::integral_constant<int, x>, std::integral_constant<int, y>>
-            {
-            };
-
+            template<int... T_values>
+            using Int = CT::Vector<std::integral_constant<int, T_values>...>;
 
             template<int dim, int val>
             struct make_Int;

include/pmacc/memory/boxes/SharedBox.hpp

@@ -28,6 +28,27 @@
 
 namespace pmacc
 {
+    namespace detail
+    {
+        template<typename T_Vector, typename T_TYPE>
+        HDINLINE auto& subscript(T_TYPE* p, int const idx, std::integral_constant<uint32_t, 1>)
+        {
+            return p[idx];
+        }
+
+        template<typename T_Vector, typename T_TYPE>
+        HDINLINE auto* subscript(T_TYPE* p, int const idx, std::integral_constant<uint32_t, 2>)
+        {
+            return p + idx * T_Vector::x::value;
+        }
+
+        template<typename T_Vector, typename T_TYPE>
+        HDINLINE auto* subscript(T_TYPE* p, int const idx, std::integral_constant<uint32_t, 3>)
+        {
+            return p + idx * (T_Vector::x::value * T_Vector::y::value);
+        }
+    } // namespace detail
+
     /** create shared memory on gpu
      *
      * @tparam T_TYPE type of memory objects
@@ -52,16 +73,16 @@ namespace pmacc
 
         HDINLINE SharedBox(SharedBox const&) = default;
 
-        HDINLINE decltype(auto) operator[](const int idx) const
+        using ReducedType1D = T_TYPE&;
+        using ReducedType2D = SharedBox<T_TYPE, typename math::CT::shrinkTo<T_Vector,1>::type, T_id>;
+        using ReducedType3D = SharedBox<T_TYPE, typename math::CT::shrinkTo<T_Vector,2>::type, T_id>;
+        using ReducedType
+            = std::conditional_t<Dim == 1, ReducedType1D, std::conditional_t<Dim == 2, ReducedType2D, ReducedType3D>>;
+
+        HDINLINE ReducedType operator[](const int idx) const
         {
-            if constexpr(Dim == 1)
-                return fixedPointer[idx];
-            else if constexpr(Dim == 2)
-                return SharedBox<T_TYPE, math::CT::Int<T_Vector::x::value>, T_id>{
-                    fixedPointer + idx * T_Vector::x::value};
-            else if constexpr(Dim == 3)
-                return SharedBox<T_TYPE, math::CT::Int<T_Vector::x::value, T_Vector::y::value>, T_id>{
-                    fixedPointer + idx * (T_Vector::x::value * T_Vector::y::value)};
+            ///@todo(bgruber): inline and replace this by if constexpr in C++17
+            return {detail::subscript<T_Vector>(fixedPointer, idx, std::integral_constant<uint32_t, T_dim>{})};
         }
 
         /*!return the first value in the box (list)