refactor Seq meta algorithms

Author: bernhardmgruber

include/picongpu/fields/incidentField/Solver.hpp

@@ -35,7 +35,7 @@
 #include <pmacc/mappings/kernel/AreaMapping.hpp>
 #include <pmacc/math/Vector.hpp>
 #include <pmacc/meta/ForEach.hpp>
-#include <pmacc/meta/conversion/MakeSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 #include <pmacc/traits/IsBaseTemplateOf.hpp>
 
 #include <algorithm>

include/picongpu/fields/incidentField/Traits.hpp

@@ -24,7 +24,7 @@
 #include "picongpu/fields/MaxwellSolver/DispersionRelationSolver.hpp"
 
 #include <pmacc/algorithms/math/defines/pi.hpp>
-#include <pmacc/meta/conversion/MakeSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 #include <pmacc/meta/conversion/Unique.hpp>
 
 #include <cstdint>

include/picongpu/param/fileOutput.param

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <pmacc/meta/conversion/MakeSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 
 /* some forward declarations we need */
 #include "picongpu/fields/Fields.def"

include/picongpu/param/speciesAttributes.param

@@ -40,7 +40,7 @@
 #include <pmacc/identifier/alias.hpp>
 #include <pmacc/identifier/identifier.hpp>
 #include <pmacc/identifier/value_identifier.hpp>
-#include <pmacc/meta/conversion/MakeSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 #include <pmacc/particles/IdProvider.def>
 #include <pmacc/particles/Identifier.hpp>
 

include/picongpu/param/speciesDefinition.param

@@ -38,7 +38,7 @@
 
 #include <pmacc/identifier/value_identifier.hpp>
 #include <pmacc/meta/String.hpp>
-#include <pmacc/meta/conversion/MakeSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 #include <pmacc/particles/Identifier.hpp>
 #include <pmacc/particles/traits/FilterByFlag.hpp>
 

include/picongpu/particles/Manipulate.hpp

@@ -25,7 +25,7 @@
 #include "picongpu/particles/manipulators/manipulators.def"
 
 #include <pmacc/meta/ForEach.hpp>
-#include <pmacc/meta/conversion/ToSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 #include <pmacc/particles/algorithm/CallForEach.hpp>
 #include <pmacc/particles/meta/FindByNameOrType.hpp>
 
@@ -134,7 +134,7 @@ namespace picongpu
             uint32_t T_area = CORE + BORDER>
         inline void manipulate(uint32_t const currentStep)
         {
-            using SpeciesSeq = typename pmacc::ToSeq<T_Species>::type;
+            using SpeciesSeq = pmacc::ToSeq<T_Species>;
             using Functor
                 = Manipulate<T_Manipulator, boost::mpl::_1, T_Filter, std::integral_constant<uint32_t, T_area>>;
             pmacc::meta::ForEach<SpeciesSeq, Functor> forEach;
@@ -155,7 +155,7 @@ namespace picongpu
             typename T_Filter = filter::All>
         inline void manipulate(uint32_t const currentStep, T_AreaMapperFactory const& areaMapperFactory)
         {
-            using SpeciesSeq = typename pmacc::ToSeq<T_Species>::type;
+            using SpeciesSeq = pmacc::ToSeq<T_Species>;
             using Functor = Manipulate<T_Manipulator, boost::mpl::_1, T_Filter>;
             pmacc::meta::ForEach<SpeciesSeq, Functor> forEach;
             forEach(currentStep, areaMapperFactory);

include/picongpu/particles/collision/Collider.hpp

@@ -28,7 +28,7 @@
 #include <pmacc/meta/accessors/First.hpp>
 #include <pmacc/meta/accessors/Second.hpp>
 #include <pmacc/meta/conversion/ApplyGuard.hpp>
-#include <pmacc/meta/conversion/ToSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 
 
 namespace picongpu
@@ -66,7 +66,7 @@ namespace picongpu
             {
                 void operator()(std::shared_ptr<DeviceHeap> const& deviceHeap, uint32_t currentStep)
                 {
-                    using SpeciesPairList = typename pmacc::ToSeq<typename T_Collider::SpeciesPairs>::type;
+                    using SpeciesPairList = pmacc::ToSeq<typename T_Collider::SpeciesPairs>;
                     constexpr size_t numPairs = pmacc::mp_size<SpeciesPairList>::value;
                     std::make_index_sequence<numPairs> index{};
                     detail::CallColliderForAPair<SpeciesPairList, T_Collider, colliderId>{}(

include/picongpu/particles/particleToGrid/ComputeGridValuePerFrame.def

@@ -41,7 +41,7 @@
 #include "picongpu/particles/traits/GetShape.hpp"
 #include "picongpu/plugins/misc/SpeciesFilter.hpp"
 
-#include <pmacc/meta/conversion/ToSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 
 #include <boost/mpl/placeholders.hpp>
 
@@ -193,7 +193,7 @@ namespace picongpu
             struct CreateEligible
             {
                 // wrap single arguments to sequence
-                using SeqSpecies = typename pmacc::ToSeq<T_SeqSpecies>::type;
+                using SeqSpecies = pmacc::ToSeq<T_SeqSpecies>;
                 using FilteredAttribute = FilteredDerivedAttribute<T_DerivedAttribute, T_Filter>;
 
                 using type = typename traits::GenerateSolversIfSpeciesEligible<

include/picongpu/particles/traits/GenerateSolversIfSpeciesEligible.hpp

@@ -21,7 +21,7 @@
 
 #include "picongpu/particles/traits/SpeciesEligibleForSolver.hpp"
 
-#include <pmacc/meta/conversion/ToSeq.hpp>
+#include <pmacc/meta/conversion/Seq.hpp>
 
 #include <boost/mpl/apply.hpp>
 
@@ -54,7 +54,7 @@ namespace picongpu
             struct GenerateSolversIfSpeciesEligible
             {
                 // wrap single arguments to sequence
-                using SeqSpecies = typename pmacc::ToSeq<T_SeqSpecies>::type;
+                using SeqSpecies = pmacc::ToSeq<T_SeqSpecies>;
 
                 // unspecialized solver
                 using Solver = T_Solver;

include/picongpu/plugins/BinEnergyParticles.hpp

@@ -212,8 +212,7 @@ namespace picongpu
             // find all valid filter for the current used species
             template<typename T>
             using Op = typename particles::traits::GenerateSolversIfSpeciesEligible<T, ParticlesType>::type;
-            using EligibleFilters =
-                typename MakeSeqFromNestedSeq<pmacc::mp_transform<Op, particles::filter::AllParticleFilters>>::type;
+            using EligibleFilters = pmacc::mp_flatten<pmacc::mp_transform<Op, particles::filter::AllParticleFilters>>;
 
             //! periodicity of computing the particle energy
             plugins::multi::Option<std::string> notifyPeriod = {"period", "enable plugin [for each n-th step]"};