ITS: cleanup unused GPU code

Author: f3sch

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cell.h

@@ -29,22 +29,6 @@ namespace o2::its
 class Cell final
 {
  public:
-  GPUhdDefault() Cell() = default;
-  GPUhd() Cell(const int firstClusterIndex, const int secondClusterIndex, const int thirdClusterIndex,
-               const int firstTrackletIndex, const int secondTrackletIndex)
-    : mFirstClusterIndex(firstClusterIndex),
-      mSecondClusterIndex(secondClusterIndex),
-      mThirdClusterIndex(thirdClusterIndex),
-      mFirstTrackletIndex(firstTrackletIndex),
-      mSecondTrackletIndex(secondTrackletIndex),
-      mLevel(1) {}
-  GPUhdDefault() Cell(const Cell&) = default;
-  GPUhdDefault() Cell(Cell&&) = default;
-  GPUhdDefault() ~Cell() = default;
-
-  GPUhdDefault() Cell& operator=(const Cell&) = default;
-  GPUhdDefault() Cell& operator=(Cell&&) noexcept = default;
-
   GPUhd() int getFirstClusterIndex() const { return mFirstClusterIndex; };
   GPUhd() int getSecondClusterIndex() const { return mSecondClusterIndex; };
   GPUhd() int getThirdClusterIndex() const { return mThirdClusterIndex; };

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Constants.h

@@ -31,11 +31,6 @@ constexpr int UnusedIndex{-1};
 constexpr float Resolution{0.0005f};
 constexpr float Radl = 9.36f; // Radiation length of Si [cm]
 constexpr float Rho = 2.33f;  // Density of Si [g/cm^3]
-namespace its                 // to be removed
-{
-constexpr int UnusedIndex{-1};
-constexpr float Resolution{0.0005f};
-} // namespace its
 } // namespace o2::its::constants
 
 #endif /* TRACKINGITSU_INCLUDE_CONSTANTS_H_ */

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Road.h

@@ -45,23 +45,22 @@ class Road final
   GPUhd() void resetRoad()
   {
     for (int i = 0; i < maxRoadSize; i++) {
-      mCellIds[i] = constants::its::UnusedIndex;
+      mCellIds[i] = constants::UnusedIndex;
     }
     mRoadSize = 0;
   }
 
   GPUhd() void addCell(int cellLayer, int cellId)
   {
-    if (mCellIds[cellLayer] == constants::its::UnusedIndex) {
+    if (mCellIds[cellLayer] == constants::UnusedIndex) {
       ++mRoadSize;
     }
 
     mCellIds[cellLayer] = cellId;
   }
 
  private:
-  int mCellIds[maxRoadSize]{constants::its::UnusedIndex};
-  // int mLabel;
+  int mCellIds[maxRoadSize]{constants::UnusedIndex};
   unsigned char mRoadSize{0};
   bool mIsFakeRoad{false};
 };

GPU/GPUTracking/Base/GPUConstantMem.h

@@ -26,7 +26,6 @@
 #include "GPUTPCConvert.h"
 #include "GPUTPCCompression.h"
 #include "GPUTPCDecompression.h"
-#include "GPUITSFitter.h"
 #include "GPUTPCClusterFinder.h"
 #include "GPUTrackingRefit.h"
 
@@ -50,7 +49,6 @@ struct GPUConstantMem {
   GPUTRDTrackerGPU trdTrackerGPU;
   GPUTRDTracker trdTrackerO2;
   GPUTPCClusterFinder tpcClusterer[GPUCA_NSECTORS];
-  GPUITSFitter itsFitter;
   GPUTrackingRefitProcessor trackingRefit;
   GPUTrackingInOutPointers ioPtrs;
   GPUCalibObjectsConst calibObjects;

GPU/GPUTracking/CMakeLists.txt

@@ -173,8 +173,6 @@ set(SRCS_NO_CINT ${SRCS_NO_CINT} display/GPUDisplayInterface.cxx)
 
 set(SRCS_NO_CINT ${SRCS_NO_CINT}
     Global/GPUChainITS.cxx
-    ITS/GPUITSFitter.cxx
-    ITS/GPUITSFitterKernels.cxx
     dEdx/GPUdEdx.cxx
     TPCConvert/GPUTPCConvert.cxx
     TPCConvert/GPUTPCConvertKernel.cxx
@@ -220,7 +218,6 @@ set(SRCS_NO_H ${SRCS_NO_H}
     TPCClusterFinder/GPUTPCClusterFinderDump.cxx)
 
 set(HDRS_INSTALL ${HDRS_INSTALL}
-                  ITS/GPUITSTrack.h
                   TPCClusterFinder/CfArray2D.h
                   TPCClusterFinder/CfConsts.h
                   TPCClusterFinder/CfFragment.h
@@ -298,7 +295,6 @@ set(INCDIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/SectorTracker
     ${CMAKE_CURRENT_SOURCE_DIR}/TPCConvert
     ${CMAKE_CURRENT_SOURCE_DIR}/dEdx
-    ${CMAKE_CURRENT_SOURCE_DIR}/ITS
     ${CMAKE_CURRENT_SOURCE_DIR}/TRDTracking
     ${CMAKE_CURRENT_SOURCE_DIR}/qa
     ${CMAKE_CURRENT_SOURCE_DIR}/Global

GPU/GPUTracking/Definitions/GPUDefParametersConstants.h

@@ -32,7 +32,6 @@
 // Default maximum numbers
 #define GPUCA_MAX_CLUSTERS           ((size_t)     1024 * 1024 * 1024) // Maximum number of TPC clusters
 #define GPUCA_MAX_TRD_TRACKLETS      ((size_t)             128 * 1024) // Maximum number of TRD tracklets
-#define GPUCA_MAX_ITS_FIT_TRACKS     ((size_t)              96 * 1024) // Max number of tracks for ITS track fit
 #define GPUCA_MEMORY_SIZE            ((size_t) 6 * 1024 * 1024 * 1024) // Size of memory allocated on Device
 #define GPUCA_HOST_MEMORY_SIZE       ((size_t) 1 * 1024 * 1024 * 1024) // Size of memory allocated on Host
 #define GPUCA_GPU_STACK_SIZE         ((size_t)               8 * 1024) // Stack size per GPU thread

GPU/GPUTracking/Definitions/GPUDefParametersDefaults.h

@@ -438,9 +438,6 @@
   #ifndef GPUCA_LB_GPUTPCGMO2Output_output
     #define GPUCA_LB_GPUTPCGMO2Output_output 256
   #endif
-  #ifndef GPUCA_LB_GPUITSFitterKernels
-    #define GPUCA_LB_GPUITSFitterKernels 256
-  #endif
   #ifndef GPUCA_LB_GPUTPCStartHitsFinder
     #define GPUCA_LB_GPUTPCStartHitsFinder 256
   #endif

GPU/GPUTracking/Global/GPUChainITS.cxx

@@ -44,22 +44,7 @@ GPUChainITS::~GPUChainITS()
   mITSVertexerTraits.reset();
 }
 
-GPUChainITS::GPUChainITS(GPUReconstruction* rec, uint32_t maxTracks) : GPUChain(rec), mMaxTracks(maxTracks) {}
-
-void GPUChainITS::RegisterPermanentMemoryAndProcessors() { mRec->RegisterGPUProcessor(&processors()->itsFitter, GetRecoStepsGPU() & RecoStep::ITSTracking); }
-
-void GPUChainITS::RegisterGPUProcessors()
-{
-  if (GetRecoStepsGPU() & RecoStep::ITSTracking) {
-    mRec->RegisterGPUDeviceProcessor(&processorsShadow()->itsFitter, &processors()->itsFitter);
-  }
-}
-
-void GPUChainITS::MemorySize(size_t& gpuMem, size_t& pageLockedHostMem)
-{
-  gpuMem = mMaxTracks * sizeof(GPUITSTrack) + GPUCA_MEMALIGN;
-  pageLockedHostMem = gpuMem;
-}
+GPUChainITS::GPUChainITS(GPUReconstruction* rec) : GPUChain(rec) {}
 
 int32_t GPUChainITS::Init() { return 0; }
 

GPU/GPUTracking/Global/GPUChainITS.h

@@ -29,32 +29,31 @@ class GPUFrameworkExternalAllocator;
 
 namespace o2::gpu
 {
-class GPUChainITS : public GPUChain
+class GPUChainITS final : public GPUChain
 {
   friend class GPUReconstruction;
 
  public:
   ~GPUChainITS() override;
-  void RegisterPermanentMemoryAndProcessors() override;
-  void RegisterGPUProcessors() override;
   int32_t Init() override;
   int32_t PrepareEvent() override;
   int32_t Finalize() override;
   int32_t RunChain() override;
-  void MemorySize(size_t& gpuMem, size_t& pageLockedHostMem) override;
+
+  void RegisterPermanentMemoryAndProcessors() final {};
+  void RegisterGPUProcessors() final {};
+  void MemorySize(size_t&, size_t&) final {};
 
   o2::its::TrackerTraits<7>* GetITSTrackerTraits();
   o2::its::VertexerTraits* GetITSVertexerTraits();
   o2::its::TimeFrame<7>* GetITSTimeframe();
 
  protected:
-  GPUChainITS(GPUReconstruction* rec, uint32_t maxTracks = GPUCA_MAX_ITS_FIT_TRACKS);
+  GPUChainITS(GPUReconstruction* rec);
   std::unique_ptr<o2::its::TrackerTraits<7>> mITSTrackerTraits;
   std::unique_ptr<o2::its::VertexerTraits> mITSVertexerTraits;
   std::unique_ptr<o2::its::TimeFrame<7>> mITSTimeFrame;
   std::unique_ptr<o2::its::GPUFrameworkExternalAllocator> mFrameworkAllocator;
-
-  uint32_t mMaxTracks;
 };
 } // namespace o2::gpu