Skip to content

Commit 58f2995

Browse files
vkuceradavidrohr
authored andcommitted
Apply git clang-format to GPU.
Some unreasonable changes reverted.
1 parent 4a88c93 commit 58f2995

19 files changed

+52
-54
lines changed

GPU/Common/GPUCommonDefAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,5 +228,5 @@
228228
#define get_group_id(dim) iBlock
229229
#endif
230230

231-
// clang-format on
231+
// clang-format on
232232
#endif

GPU/GPUTracking/Base/GPUReconstruction.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,12 @@ class GPUReconstruction
322322
GPUConstantMem* mDeviceConstantMem = nullptr;
323323

324324
// Settings
325-
GPUSettingsEvent mEventSettings; // Event Parameters
326-
GPUSettingsDeviceBackend mDeviceBackendSettings; // Processing Parameters (at constructor level)
327-
GPUSettingsProcessing mProcessingSettings; // Processing Parameters (at init level)
328-
GPUOutputControl mOutputControl; // Controls the output of the individual components
329-
GPUOutputControl mInputControl; // Prefefined input memory location for reading standalone dumps
330-
std::unique_ptr<GPUMemorySizeScalers> mMemoryScalers; // Scalers how much memory will be needed
325+
GPUSettingsEvent mEventSettings; // Event Parameters
326+
GPUSettingsDeviceBackend mDeviceBackendSettings; // Processing Parameters (at constructor level)
327+
GPUSettingsProcessing mProcessingSettings; // Processing Parameters (at init level)
328+
GPUOutputControl mOutputControl; // Controls the output of the individual components
329+
GPUOutputControl mInputControl; // Prefefined input memory location for reading standalone dumps
330+
std::unique_ptr<GPUMemorySizeScalers> mMemoryScalers; // Scalers how much memory will be needed
331331

332332
RecoStepField mRecoSteps = RecoStep::AllRecoSteps;
333333
RecoStepField mRecoStepsGPU = RecoStep::AllRecoSteps;

GPU/GPUTracking/DataCompression/GPUTPCCompressionTrackModel.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ class GPUTPCCompressionTrackModel
102102
#endif
103103

104104
protected:
105-
106105
#ifdef GPUCA_COMPRESSION_TRACK_MODEL_MERGER
107106
GPUTPCGMPropagator mProp;
108107
GPUTPCGMTrackParam mTrk;

GPU/GPUTracking/Global/GPUChainTracking.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ class GPUChainTracking : public GPUChain, GPUReconstructionHelpers::helperDelega
244244
std::unique_ptr<GPUTPCClusterStatistics> mCompressionStatistics;
245245

246246
// Ptr to detector / calibration objects
247-
std::unique_ptr<TPCFastTransform> mTPCFastTransformU; // Global TPC fast transformation object
248-
std::unique_ptr<TPCPadGainCalib> mTPCPadGainCalibU; // TPC gain calibration and cluster finder parameters
249-
std::unique_ptr<TPCdEdxCalibrationSplines> mdEdxSplinesU; // TPC dEdx calibration splines
250-
std::unique_ptr<o2::base::MatLayerCylSet> mMatLUTU; // Material Lookup Table
251-
std::unique_ptr<o2::trd::GeometryFlat> mTRDGeometryU; // TRD Geometry
247+
std::unique_ptr<TPCFastTransform> mTPCFastTransformU; // Global TPC fast transformation object
248+
std::unique_ptr<TPCPadGainCalib> mTPCPadGainCalibU; // TPC gain calibration and cluster finder parameters
249+
std::unique_ptr<TPCdEdxCalibrationSplines> mdEdxSplinesU; // TPC dEdx calibration splines
250+
std::unique_ptr<o2::base::MatLayerCylSet> mMatLUTU; // Material Lookup Table
251+
std::unique_ptr<o2::trd::GeometryFlat> mTRDGeometryU; // TRD Geometry
252252

253253
std::unique_ptr<o2::tpc::ClusterNativeAccess> mClusterNativeAccess;
254254

GPU/GPUTracking/Interface/GPUO2InterfaceConfiguration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace tpc
4545
{
4646
class TrackTPC;
4747
class Digit;
48-
}
48+
} // namespace tpc
4949
namespace gpu
5050
{
5151
class TPCFastTransform;

GPU/GPUTracking/Merger/GPUTPCGMMerger.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ class GPUTPCGMMerger : public GPUProcessor
231231
unsigned short mMemoryResOutputO2Clus;
232232
unsigned short mMemoryResOutputO2MC;
233233

234-
int mNClusters; // Total number of incoming clusters (from slice tracks)
235-
GPUTPCGMMergedTrack* mOutputTracks; //* array of output merged tracks
234+
int mNClusters; // Total number of incoming clusters (from slice tracks)
235+
GPUTPCGMMergedTrack* mOutputTracks; //* array of output merged tracks
236236
GPUTPCGMSliceTrack* mSliceTrackInfos; //* additional information for slice tracks
237237
int* mSliceTrackInfoIndex;
238238
GPUTPCGMMergedTrackHit* mClusters;

GPU/GPUTracking/Refit/GPUTrackingRefit.cxx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ static constexpr int kIGNORE_ENDS = 3;
4646
// End IgnoreErrors
4747

4848
#ifndef GPUCA_GPUCODE
49-
void GPUTrackingRefitProcessor::InitializeProcessor() {}
49+
void GPUTrackingRefitProcessor::InitializeProcessor()
50+
{
51+
}
5052

5153
void GPUTrackingRefitProcessor::RegisterMemoryAllocation()
5254
{

GPU/GPUTracking/SliceTracker/GPUTPCNeighboursFinder.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ class GPUTPCNeighboursFinder : public GPUKernelTemplate
3535
public:
3636
MEM_CLASS_PRE()
3737
struct GPUSharedMemory {
38-
int mNHits; // n hits
39-
float mUpDx; // x distance to the next row
40-
float mDnDx; // x distance to the previous row
41-
float mUpTx; // normalized x distance to the next row
42-
float mDnTx; // normalized x distance to the previous row
43-
int mIRow; // row number
44-
int mIRowUp; // next row number
45-
int mIRowDn; // previous row number
38+
int mNHits; // n hits
39+
float mUpDx; // x distance to the next row
40+
float mDnDx; // x distance to the previous row
41+
float mUpTx; // normalized x distance to the next row
42+
float mDnTx; // normalized x distance to the previous row
43+
int mIRow; // row number
44+
int mIRowUp; // next row number
45+
int mIRowDn; // previous row number
4646
#if GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP > 0
4747
float mA1[GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP][GPUCA_GET_THREAD_COUNT(GPUCA_LB_GPUTPCNeighboursFinder)];
4848
float mA2[GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP][GPUCA_GET_THREAD_COUNT(GPUCA_LB_GPUTPCNeighboursFinder)];

GPU/GPUTracking/SliceTracker/GPUTPCRow.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ class GPUTPCRow
6060
friend class GPUTPCNeighboursFinder;
6161
friend class GPUTPCStartHitsFinder;
6262

63-
int mNHits; // number of hits
64-
float mX; // X coordinate of the row
65-
float mMaxY; // maximal Y coordinate of the row
63+
int mNHits; // number of hits
64+
float mX; // X coordinate of the row
65+
float mMaxY; // maximal Y coordinate of the row
6666
MEM_LG(GPUTPCGrid)
6767
mGrid; // grid of hits
6868

GPU/GPUTracking/SliceTracker/GPUTPCTracker.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ class GPUTPCTracker : public GPUProcessor
9393
StructGPUParameters gpuParameters; // GPU parameters
9494
};
9595

96-
9796
#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
9897
GPUhdi() GPUglobalref() const GPUTPCClusterData* ClusterData() const
9998
{

0 commit comments

Comments
 (0)