GPU: Can load GPUSettingsList.h - like structs from multiple files

Author: davidrohr

GPU/GPUTracking/CMakeLists.txt

@@ -120,6 +120,7 @@ set(HDRS_INSTALL
     Base/GPUReconstructionIncludesITS.h
     Base/GPUReconstructionKernelMacros.h
     Base/GPUReconstructionCPUKernels.h
+    Base/GPUStdSystemHeaders.h
     DataCompression/GPUTPCClusterRejection.h
     DataCompression/GPUTPCCompressionKernels.inc
     DataCompression/TPCClusterDecompressionCore.inc
@@ -156,6 +157,7 @@ set(HDRS_INSTALL
     SectorTracker/GPUTPCMCInfo.h
     SectorTracker/GPUTPCTracklet.h
     SectorTracker/GPUTPCTrackLinearisation.h
+    SectorTracker/GPUTPCRow.h
     TPCConvert/GPUTPCConvertImpl.h
     TRDTracking/GPUTRDGeometry.h
     TRDTracking/GPUTRDSpacePoint.h
@@ -165,6 +167,7 @@ set(HDRS_INSTALL
     TRDTracking/GPUTRDTrackPoint.h
     TRDTracking/GPUTRDTrackPoint.h
     DataTypes/GPUTPCGMPolynomialField.h
+    DataTypes/GPUSettingsParam.h
 )
 
 set(SRCS_NO_CINT ${SRCS_NO_CINT} display/GPUDisplayInterface.cxx)

GPU/GPUTracking/DataTypes/GPUSettingsParam.h

@@ -0,0 +1,21 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file GPUSettingsParam.h
+/// \author David Rohr
+
+// clang-format off
+
+// Derrived parameters used in GPUParam
+BeginHiddenConfig(GPUSettingsParam, param)
+AddVariableRTC(continuousTracking, int8_t, 0) // Continuous tracking, estimate bz and errors for abs(z) = 125cm during seeding
+AddVariableRTC(dodEdx, int8_t, 0)             // Do dEdx computation
+EndConfig()

GPU/GPUTracking/Definitions/GPUSettingsList.h

@@ -19,20 +19,13 @@
 // Create plain-C struct for GPU code.
 // Create static constexpr with default values for GPU run time compilation
 
-#include "GPUCommonDef.h"
+#ifdef BeginConfig // File should not be included without defining the macros, but rootcling will do for dictionary generation
 #ifndef GPUSETTINGS_H
 #error Please include GPUSettings.h!
 #endif
 
 // clang-format off
 
-#ifdef QCONFIG_INSTANCE
-using namespace o2::gpu;
-#endif
-#ifdef BeginNamespace // File should not be included without defining the macros, but rootcling will do for dictionary generation
-BeginNamespace(o2)
-BeginNamespace(gpu)
-
 // Settings concerning the reconstruction, stored as parameters in GPU constant memory
 // There must be no bool in here, use int8_t, as sizeof(bool) is compiler dependent and fails on GPUs!!!!!!
 // Split in different blocks for global and per Detector
@@ -719,14 +712,4 @@ EndConfig()
 #endif // !GPUCA_STANDALONE
 #endif // !GPUCA_GPUCODE_DEVICE
 
-// Derrived parameters used in GPUParam
-BeginHiddenConfig(GPUSettingsParam, param)
-AddVariableRTC(continuousTracking, int8_t, 0) // Continuous tracking, estimate bz and errors for abs(z) = 125cm during seeding
-AddVariableRTC(dodEdx, int8_t, 0)             // Do dEdx computation
-EndConfig()
-
-EndNamespace() // gpu
-EndNamespace() // o2
-#endif // #ifdef BeginNamespace
-
-  // clang-format on
+#endif // #ifndef __CLING__

GPU/GPUTracking/display/CMakeLists.txt

@@ -170,7 +170,8 @@ if(GPUCA_EVENT_DISPLAY_WAYLAND)
   set_property(SOURCE frontend/GPUDisplayFrontendWayland.cxx frontend/GPUDisplayFrontendWaylandEv.cxx ${WAYLAND_PROTOCOL_SOURCES} APPEND PROPERTY OBJECT_DEPENDS ${WAYLAND_PROTOCOL_HEADERS})
   set_property(SOURCE frontend/GPUDisplayFrontendWayland.cxx frontend/GPUDisplayFrontendWaylandEv.cxx APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/xdg-gen/)
 
-  set(SRCS_NO_H ${SRCS_NO_H} frontend/GPUDisplayFrontendWayland.cxx frontend/GPUDisplayFrontendWaylandEv.cxx ${WAYLAND_PROTOCOL_SOURCES})
+  set(SRCS ${SRCS} frontend/GPUDisplayFrontendWayland.cxx)
+  set(SRCS_NO_H ${SRCS_NO_H} frontend/GPUDisplayFrontendWaylandEv.cxx ${WAYLAND_PROTOCOL_SOURCES})
 endif()
 
 if(X11_FOUND)

GPU/GPUTracking/qconfigoptions.h

@@ -14,4 +14,9 @@
 
 #include "GPUSettings.h" // Usually we are included from GPUSettings.h, so this doesn't do anything.
                          // But ROOT or qconfig.cpp will include us directly, so load the settings first.
+
+// clang-format off
+BeginNamespace(o2::gpu)
 #include "GPUSettingsList.h"
+#include "GPUSettingsParam.h"
+EndNamespace() // o2::gpu

GPU/GPUTracking/utils/qconfig_internal.h

@@ -208,6 +208,7 @@ void qConfigPrint(const T& qconfig_tmp_object, const std::string& blockName); //
 // End QCONFIG_PRINT
 #elif defined(QCONFIG_INSTANCE)
 #define BeginNamespace(name) \
+  using namespace name;      \
   namespace name             \
   {
 #define EndNamespace() }