cleanup to support unit tests

- remove unused trait `GetDataBoxType` - cleanup include to avoid pulling full PIConGPU within shape tests - cleanup includes in simulation_types.hpp and simulation_defines.hpp
ComputationalRadiationPhysics · Oct 25, 2023 · 14b3641 · 14b3641
1 parent f19898f
commit 14b3641
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 54 deletions.
diff --git a/include/picongpu/param/precision.param b/include/picongpu/param/precision.param
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include <picongpu/simulation_types.hpp>
 
 namespace picongpu
 {

diff --git a/include/picongpu/particles/Particles.hpp b/include/picongpu/particles/Particles.hpp
@@ -249,14 +249,6 @@ namespace picongpu
         }
     };
 
-    namespace traits
-    {
-        template<typename T_Name, typename T_Attributes, typename T_Flags>
-        struct GetDataBoxType<picongpu::Particles<T_Name, T_Attributes, T_Flags>>
-        {
-            using type = typename picongpu::Particles<T_Name, T_Attributes, T_Flags>::ParticlesBoxType;
-        };
-    } // namespace traits
 } // namespace picongpu
 
 namespace pmacc

diff --git a/include/picongpu/particles/shapes/CIC.hpp b/include/picongpu/particles/shapes/CIC.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 

diff --git a/include/picongpu/particles/shapes/Counter.hpp b/include/picongpu/particles/shapes/Counter.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 

diff --git a/include/picongpu/particles/shapes/NGP.hpp b/include/picongpu/particles/shapes/NGP.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 

diff --git a/include/picongpu/particles/shapes/PCS.hpp b/include/picongpu/particles/shapes/PCS.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 

diff --git a/include/picongpu/particles/shapes/PQS.hpp b/include/picongpu/particles/shapes/PQS.hpp
@@ -19,7 +19,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 

diff --git a/include/picongpu/particles/shapes/TSC.hpp b/include/picongpu/particles/shapes/TSC.hpp
@@ -20,7 +20,8 @@
 
 #pragma once
 
-#include "picongpu/simulation_defines.hpp"
+#include <pmacc/attribute/FunctionSpecifier.hpp>
+#include <pmacc/memory/Array.hpp>
 
 #include <cstdint>
 

diff --git a/include/picongpu/simulation_defines.hpp b/include/picongpu/simulation_defines.hpp
@@ -26,11 +26,13 @@
 #include <pmacc/types.hpp>
 #include <picongpu/simulation_types.hpp>
 #include "pmacc_renamings.hpp"
+#include "picongpu/traits/GetMargin.hpp"
 
 
 namespace picongpu
 {
     using namespace pmacc;
+    using namespace picongpu::traits;
 }
 
 /* IMPORTANT we need to use #include <...> for local files

diff --git a/include/picongpu/simulation_types.hpp b/include/picongpu/simulation_types.hpp
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "picongpu/traits/GetDataBoxType.hpp"
-#include "picongpu/traits/GetMargin.hpp"
 #include "version.hpp"
 
 #include <pmacc/algorithms/PromoteType.hpp>
@@ -56,6 +54,5 @@ namespace picongpu
 
     using namespace pmacc::algorithms::promoteType;
     using namespace pmacc::traits;
-    using namespace picongpu::traits;
 
 } // namespace picongpu
diff --git a/include/picongpu/traits/GetDataBoxType.hpp b/include/picongpu/traits/GetDataBoxType.hpp
diff --git a/include/picongpu/unitless/precision.unitless b/include/picongpu/unitless/precision.unitless
@@ -19,8 +19,9 @@
 
 #pragma once
 
-#include <pmacc/math/Vector.hpp>
+#include "picongpu/param/dimension.param"
 
+#include <pmacc/math/Vector.hpp>
 
 namespace picongpu
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
     #pragma once
+    #include <picongpu/simulation_types.hpp>
     namespace picongpu
     {
@@ Expand Down @@