Skip to content

Commit 6c8aabb

Browse files
davidrohrdavidrohr
committed
GPU: Prepend some more macros with GPUCA_
1 parent 97c913b commit 6c8aabb

File tree

62 files changed

+130
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+130
-130
lines changed

‎GPU/Common/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
3434
$<INSTALL_INTERFACE:include/GPU>)
3535

3636
target_compile_definitions(${targetName} PRIVATE GPUCA_O2_LIB
37-
GPUCA_TPC_GEOMETRY_O2 HAVE_O2HEADERS)
37+
GPUCA_TPC_GEOMETRY_O2 GPUCA_HAVE_O2HEADERS)
3838

3939
# cuda test, only compile if CUDA
4040
if(CUDA_ENABLED)

‎GPU/GPUTracking/Base/GPUConstantMem.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class GPUTRDTracker_t
4242
#endif
4343

4444
// Dummies for stuff not suppored in legacy code, or for what requires O2 headers while not available
45-
#if defined(GPUCA_NOCOMPAT_ALLCINT) && (!defined(GPUCA_GPULIBRARY) || !defined(GPUCA_ALIROOT_LIB)) && defined(HAVE_O2HEADERS)
45+
#if defined(GPUCA_NOCOMPAT_ALLCINT) && (!defined(GPUCA_GPULIBRARY) || !defined(GPUCA_ALIROOT_LIB)) && defined(GPUCA_HAVE_O2HEADERS)
4646
#include "GPUTPCConvert.h"
4747
#include "GPUTPCCompression.h"
4848
#include "GPUITSFitter.h"

‎GPU/GPUTracking/Base/GPUParam.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ using namespace GPUCA_NAMESPACE::gpu;
2828
#endif
2929
#include <cstring>
3030
#include <tuple>
31-
#ifdef HAVE_O2HEADERS
31+
#ifdef GPUCA_HAVE_O2HEADERS
3232
#include "DetectorsBase/Propagator.h"
3333
#endif
3434

@@ -257,7 +257,7 @@ static_assert(sizeof(GPUParam) % alignof(GPUConstantMem) == 0 && sizeof(GPUParam
257257
o2::base::Propagator* GPUParam::GetDefaultO2Propagator(bool useGPUField) const
258258
{
259259
o2::base::Propagator* prop = nullptr;
260-
#ifdef HAVE_O2HEADERS
260+
#ifdef GPUCA_HAVE_O2HEADERS
261261
if (useGPUField == false) {
262262
throw std::runtime_error("o2 propagator withouzt gpu field unsupported");
263263
}

‎GPU/GPUTracking/Base/GPUParam.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
/// \file GPUParam.inc
1212
/// \author David Rohr, Sergey Gorbunov
1313

14-
#ifndef GPUPARAM_INC
15-
#define GPUPARAM_INC
14+
#ifndef GPU_GPUPARAM_INC_H
15+
#define GPU_GPUPARAM_INC_H
1616

1717
#include "GPUParam.h"
1818
#include "GPUTPCGMMergedTrackHit.h"

‎GPU/GPUTracking/Base/GPUReconstruction.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ GPUReconstruction::GPUReconstruction(const GPUSettingsDeviceBackend& cfg) : mHos
100100
mMemoryScalers.reset(new GPUMemorySizeScalers);
101101
for (unsigned int i = 0; i < NSLICES; i++) {
102102
processors()->tpcTrackers[i].SetSlice(i); // TODO: Move to a better place
103-
#ifdef HAVE_O2HEADERS
103+
#ifdef GPUCA_HAVE_O2HEADERS
104104
processors()->tpcClusterer[i].mISlice = i;
105105
#endif
106106
}
@@ -202,7 +202,7 @@ int GPUReconstruction::Init()
202202

203203
int GPUReconstruction::InitPhaseBeforeDevice()
204204
{
205-
#ifndef HAVE_O2HEADERS
205+
#ifndef GPUCA_HAVE_O2HEADERS
206206
mRecoSteps.setBits(RecoStep::ITSTracking, false);
207207
mRecoSteps.setBits(RecoStep::TRDTracking, false);
208208
mRecoSteps.setBits(RecoStep::TPCConversion, false);

‎GPU/GPUTracking/Base/GPUReconstructionCPU.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#ifdef GPUCA_NOCOMPAT
3535
#include "GPUTPCGMMergerGPU.h"
3636
#endif
37-
#ifdef HAVE_O2HEADERS
37+
#ifdef GPUCA_HAVE_O2HEADERS
3838
#include "GPUITSFitterKernels.h"
3939
#include "GPUTPCConvertKernel.h"
4040
#include "GPUTPCCompressionKernels.h"

‎GPU/GPUTracking/Base/GPUReconstructionConvert.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <algorithm>
2828
#include <vector>
2929

30-
#ifdef HAVE_O2HEADERS
30+
#ifdef GPUCA_HAVE_O2HEADERS
3131
#include "clusterFinderDefs.h"
3232
#include "DataFormatsTPC/ZeroSuppression.h"
3333
#include "DataFormatsTPC/Constants.h"
@@ -43,7 +43,7 @@ using namespace o2::tpc::constants;
4343

4444
void GPUReconstructionConvert::ConvertNativeToClusterData(o2::tpc::ClusterNativeAccess* native, std::unique_ptr<GPUTPCClusterData[]>* clusters, unsigned int* nClusters, const TPCFastTransform* transform, int continuousMaxTimeBin)
4545
{
46-
#ifdef HAVE_O2HEADERS
46+
#ifdef GPUCA_HAVE_O2HEADERS
4747
memset(nClusters, 0, NSLICES * sizeof(nClusters[0]));
4848
unsigned int offset = 0;
4949
for (unsigned int i = 0; i < NSLICES; i++) {
@@ -82,7 +82,7 @@ void GPUReconstructionConvert::ConvertNativeToClusterData(o2::tpc::ClusterNative
8282

8383
void GPUReconstructionConvert::ConvertRun2RawToNative(o2::tpc::ClusterNativeAccess& native, std::unique_ptr<ClusterNative[]>& nativeBuffer, const AliHLTTPCRawCluster** rawClusters, unsigned int* nRawClusters)
8484
{
85-
#ifdef HAVE_O2HEADERS
85+
#ifdef GPUCA_HAVE_O2HEADERS
8686
memset((void*)&native, 0, sizeof(native));
8787
for (unsigned int i = 0; i < NSLICES; i++) {
8888
for (unsigned int j = 0; j < nRawClusters[i]; j++) {
@@ -114,7 +114,7 @@ void GPUReconstructionConvert::ConvertRun2RawToNative(o2::tpc::ClusterNativeAcce
114114

115115
int GPUReconstructionConvert::GetMaxTimeBin(const ClusterNativeAccess& native)
116116
{
117-
#ifdef HAVE_O2HEADERS
117+
#ifdef GPUCA_HAVE_O2HEADERS
118118
float retVal = 0;
119119
for (unsigned int i = 0; i < NSLICES; i++) {
120120
for (unsigned int j = 0; j < GPUCA_ROW_COUNT; j++) {
@@ -133,7 +133,7 @@ int GPUReconstructionConvert::GetMaxTimeBin(const ClusterNativeAccess& native)
133133

134134
int GPUReconstructionConvert::GetMaxTimeBin(const GPUTrackingInOutDigits& digits)
135135
{
136-
#ifdef HAVE_O2HEADERS
136+
#ifdef GPUCA_HAVE_O2HEADERS
137137
float retVal = 0;
138138
for (unsigned int i = 0; i < NSLICES; i++) {
139139
for (unsigned int k = 0; k < digits.nTPCDigits[i]; k++) {
@@ -150,7 +150,7 @@ int GPUReconstructionConvert::GetMaxTimeBin(const GPUTrackingInOutDigits& digits
150150

151151
int GPUReconstructionConvert::GetMaxTimeBin(const GPUTrackingInOutZS& zspages)
152152
{
153-
#ifdef HAVE_O2HEADERS
153+
#ifdef GPUCA_HAVE_O2HEADERS
154154
float retVal = 0;
155155
for (unsigned int i = 0; i < NSLICES; i++) {
156156
int firstHBF = zspages.slice[i].count[0] ? o2::raw::RDHUtils::getHeartBeatOrbit(*(const o2::header::RAWDataHeader*)zspages.slice[i].zsPtr[0][0]) : 0;
@@ -193,7 +193,7 @@ void GPUReconstructionConvert::ZSstreamOut(unsigned short* bufIn, unsigned int&
193193
lenIn = 0;
194194
}
195195

196-
#ifdef HAVE_O2HEADERS
196+
#ifdef GPUCA_HAVE_O2HEADERS
197197
void GPUReconstructionConvert::ZSfillEmpty(void* ptr, int shift, unsigned int feeId, int orbit)
198198
{
199199
o2::header::RAWDataHeader* rdh = (o2::header::RAWDataHeader*)ptr;
@@ -573,7 +573,7 @@ void GPUReconstructionConvert::RunZSEncoderCreateMeta(const unsigned long long i
573573

574574
void GPUReconstructionConvert::RunZSFilter(std::unique_ptr<o2::tpc::Digit[]>* buffers, const o2::tpc::Digit* const* ptrs, size_t* nsb, const size_t* ns, const GPUParam& param, bool zs12bit, float threshold)
575575
{
576-
#ifdef HAVE_O2HEADERS
576+
#ifdef GPUCA_HAVE_O2HEADERS
577577
for (unsigned int i = 0; i < NSLICES; i++) {
578578
if (buffers[i].get() != ptrs[i] || nsb != ns) {
579579
throw std::runtime_error("Not owning digits");

‎GPU/GPUTracking/Base/GPUReconstructionIncludesDevice.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ using namespace GPUCA_NAMESPACE::gpu;
5252
#include "GPUTPCSliceData.cxx"
5353
#include "GPUTPCCreateSliceData.cxx"
5454

55-
#if defined(HAVE_O2HEADERS)
55+
#if defined(GPUCA_HAVE_O2HEADERS)
5656
// Files for propagation with material
5757
#include "MatLayerCylSet.cxx"
5858
#include "MatLayerCyl.cxx"
@@ -121,7 +121,7 @@ using namespace GPUCA_NAMESPACE::gpu;
121121
#include "Utils.cu"
122122
#endif // !defined(GPUCA_O2_LIB) && defined(__CUDACC__) && !defined(GPUCA_NO_ITS_TRAITS)
123123

124-
#endif // HAVE_O2HEADERS
124+
#endif // GPUCA_HAVE_O2HEADERS
125125
#endif // (!defined(__OPENCL__) || defined(__OPENCLCPP__)) && !defined(GPUCA_ALIROOT_LIB)
126126

127127
#endif // GPURECONSTRUCTIONINCLUDESDEVICE_H

‎GPU/GPUTracking/Base/GPUReconstructionIncludesITS.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef GPURECONSTRUCTIONINCLDUESITS_H
1515
#define GPURECONSTRUCTIONINCLDUESITS_H
1616

17-
#if defined(HAVE_O2HEADERS) && !defined(GPUCA_NO_ITS_TRAITS)
17+
#if defined(GPUCA_HAVE_O2HEADERS) && !defined(GPUCA_NO_ITS_TRAITS)
1818
#include "ITStracking/TrackerTraitsCPU.h"
1919
#include "ITStracking/VertexerTraits.h"
2020
#else
@@ -33,7 +33,7 @@ class VertexerTraits
3333
};
3434
} // namespace its
3535
} // namespace o2
36-
#if defined(HAVE_O2HEADERS)
36+
#if defined(GPUCA_HAVE_O2HEADERS)
3737
#include "ITStracking/Road.h"
3838
#include "ITStracking/Cluster.h"
3939
#endif

‎GPU/GPUTracking/Base/GPUReconstructionKernels.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ GPUCA_KRNL_LB((GPUTPCGMMergerFinalize, step2 ), (simple), (), ())
6060
GPUCA_KRNL_LB((GPUTPCGMMergerMergeLoopers, step0 ), (simple), (), ())
6161
GPUCA_KRNL_LB((GPUTPCGMMergerMergeLoopers, step1 ), (simple), (), ())
6262
GPUCA_KRNL_LB((GPUTPCGMMergerMergeLoopers, step2 ), (simple), (), ())
63-
#ifdef HAVE_O2HEADERS
63+
#ifdef GPUCA_HAVE_O2HEADERS
6464
GPUCA_KRNL_LB((GPUTPCGMO2Output, prepare ), (simple), (), ())
6565
GPUCA_KRNL(( GPUTPCGMO2Output, sort ), (simple), (), ())
6666
GPUCA_KRNL_LB((GPUTPCGMO2Output, output ), (simple), (), ())

0 commit comments

Comments
 (0)