GPU: Switch to modern C++ nested namespace style

Author: davidrohr

GPU/GPUTracking/Base/GPUConstantMem.h

@@ -34,9 +34,7 @@
 #include "GPUKernelDebugOutput.h"
 #endif
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 struct GPUConstantMem {
   GPUParam param;
@@ -90,14 +88,11 @@ union GPUConstantMemCopyable {
 #if defined(GPUCA_GPUCODE)
 static constexpr size_t gGPUConstantMemBufferSize = (sizeof(GPUConstantMem) + sizeof(uint4) - 1);
 #endif
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 #if defined(GPUCA_HAS_GLOBAL_SYMBOL_CONSTANT_MEM) && !defined(GPUCA_GPUCODE_HOSTONLY)
 GPUconstant() o2::gpu::GPUConstantMemCopyable gGPUConstantMemBuffer;
 #endif // GPUCA_HAS_GLOBAL_SYMBOL_CONSTANT_MEM
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 
 // Must be placed here, to avoid circular header dependency
@@ -120,7 +115,6 @@ GPUdi() void GPUProcessor::raiseError(uint32_t code, uint32_t param1, uint32_t p
   GetConstantMem()->errorCodes.raiseError(code, param1, param2, param3);
 }
 
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif

GPU/GPUTracking/Base/GPUGeneralKernels.h

@@ -32,9 +32,7 @@
 #define GPUCA_CUB cub
 #endif
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 struct GPUConstantMem;
 
@@ -110,8 +108,7 @@ class GPUitoa : public GPUKernelTemplate
   GPUd() static void Thread(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUsharedref() GPUSharedMemory& smem, processorType& processors, GPUglobalref() int32_t* ptr, uint64_t size);
 };
 
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #undef GPUCA_CUB
 

GPU/GPUTracking/Base/GPUKernelDebugOutput.h

@@ -19,9 +19,7 @@
 #include "GPUProcessor.h"
 #ifdef GPUCA_KERNEL_DEBUGGER_OUTPUT
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 
 class GPUKernelDebugOutput : public GPUProcessor
@@ -75,8 +73,7 @@ class GPUKernelDebugOutput : public GPUProcessor
   mutable int32_t* mDebugOutMemory;
 };
 
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif
 #endif

GPU/GPUTracking/Base/GPUMemoryResource.h

@@ -18,9 +18,7 @@
 #include "GPUCommonDef.h"
 #include "GPUProcessor.h"
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 
 struct GPUMemoryReuse {
@@ -103,7 +101,6 @@ class GPUMemoryResource
   int32_t mReuse;
   MemoryType mType;
 };
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif

GPU/GPUTracking/Base/GPUParam.h

@@ -31,9 +31,7 @@ using Propagator = PropagatorImpl<float>;
 } // namespace o2::base
 #endif
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 struct GPUSettingsRec;
 struct GPUSettingsGTP;
@@ -114,7 +112,6 @@ struct GPUParam : public internal::GPUParam_t<GPUSettingsRec, GPUSettingsParam>
   GPUd() bool rejectEdgeClusterByY(float uncorrectedY, int32_t iRow, float trackSigmaY) const;
 };
 
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif

GPU/GPUTracking/Base/GPUParam.inc

@@ -19,9 +19,7 @@
 #include "GPUTPCGMMergedTrackHit.h"
 #include "GPUTPCClusterOccupancyMap.h"
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 
 GPUdi() void GPUParam::Sector2Global(int32_t iSector, float x, float y, float z, float* X, float* Y, float* Z) const
@@ -223,7 +221,6 @@ GPUdi() bool GPUParam::rejectEdgeClusterByY(float uncorrectedY, int32_t iRow, fl
   return CAMath::Abs(uncorrectedY) > (tpcGeometry.NPads(iRow) - 1) * 0.5f * tpcGeometry.PadWidth(iRow) + rec.tpc.rejectEdgeClustersMargin + trackSigmaY * rec.tpc.rejectEdgeClustersSigmaMargin;
 }
 
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif

GPU/GPUTracking/Base/GPUParamRTC.h

@@ -18,9 +18,7 @@
 #include "GPUParam.h"
 #include <string>
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 namespace gpu_rtc
 {
@@ -38,7 +36,6 @@ struct GPUParamRTC : public internal::GPUParam_t<gpu_rtc::GPUSettingsRec, gpu_rt
   static std::string generateRTCCode(const GPUParam& param, bool useConstexpr);
 };
 
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif

GPU/GPUTracking/Base/GPUProcessor.h

@@ -23,9 +23,7 @@
 #include <algorithm>
 #endif
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 struct GPUTrackingInOutPointers;
 class GPUReconstruction;
@@ -157,7 +155,6 @@ class GPUProcessor
 
   friend class GPUTPCNeighboursFinder;
 };
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif

GPU/GPUTracking/Base/GPUReconstruction.cxx

@@ -44,9 +44,7 @@
 
 #include "GPUReconstructionIncludesITS.h"
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 struct GPUReconstructionPipelineQueue {
   uint32_t op = 0; // For now, 0 = process, 1 = terminate
@@ -63,8 +61,7 @@ struct GPUReconstructionPipelineContext {
   std::condition_variable cond;
   bool terminate = false;
 };
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 using namespace o2::gpu;
 

GPU/GPUTracking/Base/GPUReconstruction.h

@@ -34,19 +34,14 @@
 #include "GPUTPCSectorOutput.h"
 #include "GPULogging.h"
 
-namespace o2
-{
-namespace its
+namespace o2::its
 {
 class TrackerTraits;
 class VertexerTraits;
 class TimeFrame;
-} // namespace its
-} // namespace o2
+} // namespace o2::its
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 class GPUChain;
 struct GPUMemorySizeScalers;
@@ -483,7 +478,6 @@ inline void GPUReconstruction::SetupGPUProcessor(T* proc, bool allocate)
   }
 }
 
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif