Clean up and fixing tests for headers

cms-sw · Nov 29, 2023 · 7611f3f · 7611f3f
1 parent 9213301
commit 7611f3f
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 241 deletions.
diff --git a/CondFormats/SiPixelObjects/interface/alpaka/SiPixelMappingUtilities.h b/CondFormats/SiPixelObjects/interface/alpaka/SiPixelMappingUtilities.h
@@ -6,6 +6,7 @@
 #include "CondFormats/SiPixelObjects/interface/SiPixelMappingLayout.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE {
 
@@ -49,4 +50,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     }
   };
 }  // namespace ALPAKA_ACCELERATOR_NAMESPACE
-#endif  //CondFormats_SiPixelObjects_interface_alpaka_SiPixelMappingUtilities_h
+#endif  //CondFormats_SiPixelObjects_interface_alpaka_SiPixelMappingUtilities_h
diff --git a/DataFormats/Vertex/interface/ZVertexDefinitions.h b/DataFormats/Vertex/interface/ZVertexDefinitions.h
@@ -1,6 +1,8 @@
 #ifndef DataFormats_Vertex_ZVertexDefinitions_h
 #define DataFormats_Vertex_ZVertexDefinitions_h
 
+#include <cstdint>
+
 namespace zVertex {
 
   constexpr uint32_t MAXTRACKS = 32 * 1024;

diff --git a/DataFormats/Vertex/interface/alpaka/ZVertexUtilities.h b/DataFormats/Vertex/interface/alpaka/ZVertexUtilities.h
@@ -1,6 +1,6 @@
 #ifndef DataFormats_Vertex_ZVertexUtilities_h
 #define DataFormats_Vertex_ZVertexUtilities_h
-
+#include <alpaka/alpaka.hpp>
 #include "DataFormats/Vertex/interface/ZVertexLayout.h"
 #include "DataFormats/Vertex/interface/ZVertexDefinitions.h"
 

diff --git a/RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforDevice.h b/RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforDevice.h
@@ -1,6 +1,7 @@
 #ifndef RecoLocalTracker_SiPixelRecHits_interface_pixelCPEforDevice_h
 #define RecoLocalTracker_SiPixelRecHits_interface_pixelCPEforDevice_h
 
+#include <algorithm>
 #include <cassert>
 #include <cmath>
 #include <cstdint>

diff --git a/RecoTracker/PixelTrackFitting/interface/alpaka/PixelNtupletsFitter.h b/RecoTracker/PixelTrackFitting/interface/alpaka/PixelNtupletsFitter.h
diff --git a/RecoTracker/PixelTrackFitting/interface/alpaka/RiemannFit.h b/RecoTracker/PixelTrackFitting/interface/alpaka/RiemannFit.h
@@ -2,9 +2,10 @@
 #define RecoPixelVertexing_PixelTrackFitting_interface_RiemannFit_h
 #include <alpaka/alpaka.hpp>
 #include "RecoTracker/PixelTrackFitting/interface/alpaka/FitUtils.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/traits.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE {
-  using namespace cms::alpakatools;
+
   namespace riemannFit {
     using namespace ::riemannFit;
     /*!  Compute the Radiation length in the uniform hypothesis

diff --git a/RecoTracker/PixelTrackFitting/plugins/BuildFile.xml b/RecoTracker/PixelTrackFitting/plugins/BuildFile.xml
@@ -8,18 +8,3 @@
   <use name="HeterogeneousCore/CUDACore"/>
   <flags EDM_PLUGIN="1"/>
 </library>
-
-<library file="alpaka/*.cc" name="RecoPixelVertexingPixelTrackFittingPluginsPortable">
-  <use name="alpaka"/>
-  <use name="DataFormats/TrackSoA"/>
-  <use name="DataFormats/TrackingRecHit"/>
-  <use name="DataFormats/TrackingRecHitSoA"/>
-  <use name="Geometry/Records"/>
-  <use name="RecoTracker/PixelTrackFitting"/>
-  <use name="HeterogeneousCore/AlpakaCore"/>
-  <use name="HeterogeneousCore/AlpakaInterface"/>
-  <!-- Some modules have only been alpakified for compatibility, we only need their
-   CPU serial version -->
-  <flags ALPAKA_BACKENDS="serial"/>
-  <flags EDM_PLUGIN="1"/>
-</library>
diff --git a/RecoTracker/PixelTrackFitting/plugins/alpaka/PixelNtupletsFitterAlpaka.dev.cc b/RecoTracker/PixelTrackFitting/plugins/alpaka/PixelNtupletsFitterAlpaka.dev.cc
diff --git a/RecoTracker/PixelTrackFitting/plugins/alpaka/PixelNtupletsFitterProducerAlpaka.cc b/RecoTracker/PixelTrackFitting/plugins/alpaka/PixelNtupletsFitterProducerAlpaka.cc
diff --git a/RecoTracker/PixelTrackFitting/src/alpaka/classes_serial.h b/RecoTracker/PixelTrackFitting/src/alpaka/classes_serial.h
diff --git a/RecoTracker/PixelTrackFitting/src/alpaka/classes_serial_def.xml b/RecoTracker/PixelTrackFitting/src/alpaka/classes_serial_def.xml