Move alpaka header to interface

cms-sw · Mar 8, 2024 · 0146963 · 0146963
1 parent b138ff1
commit 0146963
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/MagneticField/ParametrizedEngine/BuildFile.xml b/MagneticField/ParametrizedEngine/BuildFile.xml
@@ -2,6 +2,8 @@
 <use name="FWCore/ParameterSet"/>
 <use name="MagneticField/Engine"/>
 <use name="MagneticField/UniformEngine"/>
+<use name="HeterogeneousCore/AlpakaInterface"/>
+<flags ALPAKA_BACKENDS="1"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/...paka/ParabolicParametrizedMagneticField.h → ...paka/ParabolicParametrizedMagneticField.h b/...paka/ParabolicParametrizedMagneticField.h → ...paka/ParabolicParametrizedMagneticField.h
@@ -6,7 +6,7 @@
 #define DataFormats_EgammaReco_plugins_alpaka_MagneticFieldParabolicPortable_h
 
 #include <Eigen/Core>
-#include "MagneticField/ParametrizedEngine/plugins/ParabolicParametrizedMagneticField.h"
+#include "MagneticField/ParametrizedEngine/interface/ParabolicParametrizedMagneticField.h"
 
 using Vector3f = Eigen::Matrix<float, 3, 1>;
 
@@ -35,7 +35,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
 
     template <typename V3>
     ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE float MagneticFieldAtPoint(V3 vec) {
-      Parameters p;
       return B0Z(vec) * Kr(vec);
     }
 

diff --git a/MagneticField/ParametrizedEngine/plugins/BuildFile.xml b/MagneticField/ParametrizedEngine/plugins/BuildFile.xml
@@ -1,13 +1,9 @@
-<use name="alpaka"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="MagneticField/Engine"/>
 <use name="MagneticField/Records"/>
 <use name="MagneticField/ParametrizedEngine"/>
 <use name="CondFormats/RunInfo"/>
-<use name="HeterogeneousCore/AlpakaCore"/>
-<use name="HeterogeneousCore/AlpakaInterface"/>
-<flags ALPAKA_BACKENDS="1"/>
 <library file="*.cc" name="MagneticFieldParametrizedEnginePlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/MagneticField/ParametrizedEngine/test/testParabolicParametrizedMagneticField.cc b/MagneticField/ParametrizedEngine/test/testParabolicParametrizedMagneticField.cc
@@ -0,0 +1,10 @@
+#include <cassert>
+#include <Eigen/Core>
+#include "MagneticField/ParametrizedEngine/interface/alpaka/ParabolicParametrizedMagneticField.h"
+
+using Vector3f = Eigen::Matrix<float, 3, 1>;
+using namespace MagneticFieldParabolicPortable
+
+Vector3f position{1, 1, 1};
+
+assert(MagneticFieldAtPoint(position) == B0Z(position) * Kr(position))