GPU: Remove ITS traits completely from standalone version

Author: davidrohr

GPU/GPUTracking/Base/GPUReconstruction.cxx

@@ -55,6 +55,8 @@
 #include "GPUO2InterfaceConfiguration.h"
 #endif
 
+#include "GPUReconstructionIncludesITS.h"
+
 namespace GPUCA_NAMESPACE
 {
 namespace gpu

GPU/GPUTracking/Base/GPUReconstructionIncludes.h

@@ -34,8 +34,6 @@
 #include "AliHLTSystem.h"
 #endif
 
-#include "GPUReconstructionIncludesITS.h"
-
 #define RANDOM_ERROR
 //#define RANDOM_ERROR || rand() % 500 == 1
 

GPU/GPUTracking/Base/GPUReconstructionIncludesDevice.h

@@ -105,23 +105,6 @@ using namespace GPUCA_NAMESPACE::gpu;
 #include "GPUTrackingRefit.cxx"
 #include "GPUTrackingRefitKernel.cxx"
 
-#if !defined(GPUCA_O2_LIB) && defined(__HIPCC__) && !defined(GPUCA_NO_ITS_TRAITS) && !defined(GPUCA_GPUCODE_GENRTC)
-#include "VertexerTraitsHIP.hip.cxx"
-#include "ContextHIP.hip.cxx"
-#include "DeviceStoreVertexerHIP.hip.cxx"
-#include "ClusterLinesHIP.hip.cxx"
-#include "UtilsHIP.hip.cxx"
-#elif !defined(GPUCA_O2_LIB) && defined(__CUDACC__) && !defined(GPUCA_NO_ITS_TRAITS) && !defined(GPUCA_GPUCODE_GENRTC)
-#include "TrackerTraitsNV.cu"
-#include "VertexerTraitsGPU.cu"
-#include "Context.cu"
-#include "Stream.cu"
-#include "DeviceStoreNV.cu"
-#include "DeviceStoreVertexerGPU.cu"
-#include "ClusterLinesGPU.cu"
-#include "Utils.cu"
-#endif // !defined(GPUCA_O2_LIB) && defined(__CUDACC__) && !defined(GPUCA_NO_ITS_TRAITS)
-
 #endif // GPUCA_HAVE_O2HEADERS
 #endif // (!defined(__OPENCL__) || defined(__OPENCLCPP__)) && !defined(GPUCA_ALIROOT_LIB)
 

GPU/GPUTracking/Base/GPUReconstructionIncludesITS.h

@@ -15,32 +15,42 @@
 #ifndef GPURECONSTRUCTIONINCLDUESITS_H
 #define GPURECONSTRUCTIONINCLDUESITS_H
 
-#if defined(GPUCA_HAVE_O2HEADERS) && !defined(GPUCA_NO_ITS_TRAITS)
+#if defined(GPUCA_HAVE_O2HEADERS) && !defined(GPUCA_STANDALONE)
 #include "ITStracking/TrackerTraits.h"
 #include "ITStracking/VertexerTraits.h"
+#include "ITStracking/TimeFrame.h"
+#if defined(__CUDACC__) || defined(__HIPCC__)
+#include "ITStrackingGPU/TrackerTraitsGPU.h"
+#include "ITStrackingGPU/VertexerTraitsGPU.h"
+#include "ITStrackingGPU/TimeFrameGPU.h"
+#endif
 #else
-namespace o2
+namespace o2::its
 {
-namespace its
+class VertexerTraits
 {
+};
 class TrackerTraits
 {
 };
-class TrackerTraitsCPU : public TrackerTraits
+class TimeFrame
 {
 };
-class VertexerTraits
+class VertexerTraitsGPU : public VertexerTraits
 {
 };
-class TimeFrame
+template <int NLayers = 7>
+class TrackerTraitsGPU : public TrackerTraits
 {
 };
-} // namespace its
-} // namespace o2
-#if defined(GPUCA_HAVE_O2HEADERS)
-#include "ITStracking/Road.h"
-#include "ITStracking/Cluster.h"
-#endif
+namespace gpu
+{
+template <int NLayers = 7>
+class TimeFrameGPU : public TimeFrame
+{
+};
+} // namespace gpu
+} // namespace o2::its
 #endif
 
 #endif

GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu

@@ -36,29 +36,7 @@ __global__ void dummyInitKernel(void*)
 {
 }
 
-#if defined(GPUCA_HAVE_O2HEADERS) && !defined(GPUCA_NO_ITS_TRAITS)
-#include "ITStrackingGPU/TrackerTraitsGPU.h"
-#include "ITStrackingGPU/VertexerTraitsGPU.h"
-#include "ITStrackingGPU/TimeFrameGPU.h"
-#else
-namespace o2::its
-{
-class VertexerTraitsGPU : public VertexerTraits
-{
-};
-template <int NLayers = 7>
-class TrackerTraitsGPU : public TrackerTraits
-{
-};
-namespace gpu
-{
-template <int NLayers = 7>
-class TimeFrameGPU : public TimeFrame
-{
-};
-} // namespace gpu
-} // namespace o2::its
-#endif
+#include "GPUReconstructionIncludesITS.h"
 
 GPUReconstructionCUDABackend::GPUReconstructionCUDABackend(const GPUSettingsDeviceBackend& cfg) : GPUReconstructionDeviceBase(cfg, sizeof(GPUReconstructionDeviceBase))
 {

GPU/GPUTracking/Base/hip/GPUReconstructionHIP.hip

@@ -46,28 +46,7 @@ __global__ void gGPUConstantMemBuffer_dummy(int* p) { *p = *(int*)&gGPUConstantM
 
 __global__ void dummyInitKernel(void*) {}
 
-#if defined(GPUCA_HAVE_O2HEADERS) && !defined(GPUCA_NO_ITS_TRAITS)
-#include "ITStrackingGPU/VertexerTraitsGPU.h"
-#include "ITStrackingGPU/TrackerTraitsGPU.h"
-#else
-namespace o2::its
-{
-class VertexerTraitsGPU : public VertexerTraits
-{
-};
-template <int NLayers = 7>
-class TrackerTraitsGPU : public TrackerTraits
-{
-};
-namespace gpu
-{
-template <int NLayers = 7>
-class TimeFrameGPU : public TimeFrame
-{
-};
-} // namespace gpu
-} // namespace o2::its
-#endif
+#include "GPUReconstructionIncludesITS.h"
 
 class GPUDebugTiming
 {

GPU/GPUTracking/Global/GPUChainITS.cxx

@@ -13,9 +13,9 @@
 /// \author David Rohr
 
 #include "GPUChainITS.h"
-#include "GPUReconstructionIncludesITS.h"
 #include "DataFormatsITS/TrackITS.h"
 #include "ITStracking/ExternalAllocator.h"
+#include "GPUReconstructionIncludesITS.h"
 #include <algorithm>
 
 using namespace GPUCA_NAMESPACE::gpu;
@@ -83,7 +83,7 @@ o2::its::TimeFrame* GPUChainITS::GetITSTimeframe()
   if (mITSTimeFrame == nullptr) {
     mRec->GetITSTraits(nullptr, nullptr, &mITSTimeFrame);
   }
-#if defined(GPUCA_HAVE_O2HEADERS) && !defined(GPUCA_NO_ITS_TRAITS) // Do not access ITS traits related classes if not compiled in standalone version
+#if !defined(GPUCA_STANDALONE)
   if (mITSTimeFrame->mIsGPU) {
     auto doFWExtAlloc = [this](size_t size) -> void* { return rec()->AllocateUnmanagedMemory(size, GPUMemoryResource::MEMORY_GPU); };
 

GPU/GPUTracking/Standalone/CMakeLists.txt

@@ -122,14 +122,6 @@ endif()
 if(CONFIG_O2_EXTENSIONS)
   add_definitions(-DGPUCA_HAVE_O2HEADERS)
   find_package(Microsoft.GSL REQUIRED HINTS "$ENV{MS_GSL_ROOT}/share/cmake")
-  if(CONFIG_O2_ITS_TRAITS)
-    if(NOT CONFIG_ROOT)
-      message(FATAL_ERROR "Can not build ITS traits without ROOT")
-    endif()
-    find_package(Boost REQUIRED)
-  else()
-    add_definitions(-DGPUCA_NO_ITS_TRAITS)
-  endif()
 endif()
 
 if(CONFIG_FMT)

GPU/GPUTracking/Standalone/cmake/config.cmake

@@ -10,7 +10,6 @@ set(CONFIG_VC 1)
 set(CONFIG_FMT 1)
 set(CONFIG_ROOT 1)
 set(CONFIG_O2_EXTENSIONS 1)
-set(CONFIG_O2_ITS_TRAITS 0)
 set(BUILD_EVENT_DISPLAY 1)
 set(BUILD_EVENT_DISPLAY_FREETYPE 1)
 set(BUILD_EVENT_DISPLAY_VULKAN 1)

GPU/GPUTracking/Standalone/tools/rtc/rtcsource.sh

@@ -9,7 +9,7 @@ nvcc -std=c++17 -gencode arch=compute_75,code=sm_75 -E \
   -I$HOME/alice/O2/DataFormats/Detectors/TPC/include -I$HOME/alice/O2/Detectors/Base/include -I$HOME/alice/O2/Detectors/Base/src -I$HOME/alice/O2/Common/MathUtils/include -I$HOME/alice/O2/DataFormats/Headers/include \
   -I$HOME/alice/O2/Detectors/TRD/base/include -I$HOME/alice/O2/Detectors/TRD/base/src -I$HOME/alice/O2/Detectors/ITSMFT/ITS/tracking/include -I$HOME/alice/O2/Detectors/ITSMFT/ITS/tracking/cuda/include -I$HOME/alice/O2/Common/Constants/include \
   -I$HOME/alice/O2/DataFormats/common/include -I$HOME/alice/O2/DataFormats/Detectors/TRD/include -I$HOME/alice/O2/Detectors/Raw/include \
-  -DGPUCA_HAVE_O2HEADERS -DGPUCA_TPC_GEOMETRY_O2 -DGPUCA_STANDALONE -DGPUCA_NO_ITS_TRAITS -DGPUCA_GPUCODE_GENRTC \
+  -DGPUCA_HAVE_O2HEADERS -DGPUCA_TPC_GEOMETRY_O2 -DGPUCA_STANDALONE -DGPUCA_GPUCODE_GENRTC \
   ~/alice/O2/GPU/GPUTracking/Base/cuda/GPUReconstructionCUDArtc.cu \
 | sed '1,/^# 1 ".*GPUReconstructionCUDArtcPre.h" 1$/d' \
 >> source.cu