Skip to content

Commit c7c204a

Browse files
davidrohrdavidrohr
committed
GPU: Fix macro name
1 parent a487c74 commit c7c204a

9 files changed

Lines changed: 18 additions & 15 deletions

File tree

‎DataFormats/Reconstruction/include/ReconstructionDataFormats/DCA.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef __OPENCL__
1717
#include <array>
1818
#endif
19-
#ifndef ALIGPU_GPUCODE
19+
#ifndef GPUCA_ALIGPUCODE
2020
#include <iosfwd>
2121
#endif
2222

‎DataFormats/Reconstruction/include/ReconstructionDataFormats/PrimaryVertex.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class PrimaryVertex : public Vertex<TimeStampWithError<float, float>>
3636
void setIR(const InteractionRecord& ir) { mIRMin = mIRMax = ir; }
3737
bool hasUniqueIR() const { return !mIRMin.isDummy() && (mIRMin == mIRMax); }
3838

39-
#ifndef ALIGPU_GPUCODE
39+
#ifndef GPUCA_ALIGPUCODE
4040
void print() const;
4141
std::string asString() const;
4242
#endif
@@ -48,7 +48,7 @@ class PrimaryVertex : public Vertex<TimeStampWithError<float, float>>
4848
ClassDefNV(PrimaryVertex, 1);
4949
};
5050

51-
#ifndef ALIGPU_GPUCODE
51+
#ifndef GPUCA_ALIGPUCODE
5252
std::ostream& operator<<(std::ostream& os, const o2::dataformats::PrimaryVertex& v);
5353
#endif
5454

‎DataFormats/Reconstruction/include/ReconstructionDataFormats/Vertex.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
#ifndef ALICEO2_VERTEX_H
1212
#define ALICEO2_VERTEX_H
1313

14+
#include "GPUCommonDef.h"
15+
#include "GPUCommonMath.h"
1416
#include <MathUtils/Cartesian.h>
17+
1518
#include "CommonDataFormat/TimeStamp.h"
1619
#ifndef __OPENCL__
1720
#include <array>
1821
#endif
19-
#ifndef ALIGPU_GPUCODE
22+
#ifndef GPUCA_ALIGPUCODE
2023
#include <iosfwd>
2124
#endif
2225

@@ -42,7 +45,7 @@ class VertexBase
4245
{
4346
}
4447

45-
#ifndef ALIGPU_GPUCODE
48+
#ifndef GPUCA_ALIGPUCODE
4649
void print() const;
4750
std::string asString() const;
4851
#endif
@@ -144,7 +147,7 @@ class Vertex : public VertexBase
144147
ClassDefNV(Vertex, 3);
145148
};
146149

147-
#ifndef ALIGPU_GPUCODE
150+
#ifndef GPUCA_ALIGPUCODE
148151
std::ostream& operator<<(std::ostream& os, const o2::dataformats::VertexBase& v);
149152
#endif
150153

‎DataFormats/Reconstruction/src/DCA.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace o2
1919
namespace dataformats
2020
{
2121

22-
#ifndef ALIGPU_GPUCODE
22+
#ifndef GPUCA_ALIGPUCODE
2323
std::ostream& operator<<(std::ostream& os, const o2::dataformats::DCA& d)
2424
{
2525
// stream itself
@@ -30,7 +30,7 @@ std::ostream& operator<<(std::ostream& os, const o2::dataformats::DCA& d)
3030

3131
void DCA::print() const
3232
{
33-
#ifndef ALIGPU_GPUCODE
33+
#ifndef GPUCA_ALIGPUCODE
3434
std::cout << *this << '\n';
3535
#endif
3636
}

‎DataFormats/Reconstruction/src/PrimaryVertex.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace o2
1818
namespace dataformats
1919
{
2020

21-
#ifndef ALIGPU_GPUCODE
21+
#ifndef GPUCA_ALIGPUCODE
2222

2323
std::string PrimaryVertex::asString() const
2424
{

‎DataFormats/Reconstruction/src/Vertex.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace o2
1717
namespace dataformats
1818
{
1919

20-
#ifndef ALIGPU_GPUCODE
20+
#ifndef GPUCA_ALIGPUCODE
2121

2222
std::string VertexBase::asString() const
2323
{

‎DataFormats/common/include/CommonDataFormat/InteractionRecord.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define ALICEO2_INTERACTIONRECORD_H
1515

1616
#include "GPUCommonRtypes.h"
17-
#ifndef ALIGPU_GPUCODE
17+
#ifndef GPUCA_ALIGPUCODE
1818
#include <iosfwd>
1919
#include <cstdint>
2020
#endif
@@ -246,7 +246,7 @@ struct InteractionRecord {
246246
return InteractionRecord(l % o2::constants::lhc::LHCMaxBunches, l / o2::constants::lhc::LHCMaxBunches);
247247
}
248248

249-
#ifndef ALIGPU_GPUCODE
249+
#ifndef GPUCA_ALIGPUCODE
250250
void print() const;
251251
std::string asString() const;
252252
friend std::ostream& operator<<(std::ostream& stream, InteractionRecord const& ir);
@@ -324,7 +324,7 @@ struct InteractionTimeRecord : public InteractionRecord {
324324
return !((*this) > other);
325325
}
326326

327-
#ifndef ALIGPU_GPUCODE
327+
#ifndef GPUCA_ALIGPUCODE
328328
void print() const;
329329
std::string asString() const;
330330
friend std::ostream& operator<<(std::ostream& stream, InteractionTimeRecord const& ir);

‎DataFormats/common/src/InteractionRecord.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
namespace o2
1515
{
1616

17-
#ifndef ALIGPU_GPUCODE
17+
#ifndef GPUCA_ALIGPUCODE
1818

1919
std::string InteractionRecord::asString() const
2020
{

‎GPU/Common/GPUCommonDef.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
#endif
7575

7676
//Set AliRoot / O2 namespace
77-
#if defined(GPUCA_STANDALONE) || (defined(GPUCA_O2_LIB) && !defined(GPUCA_O2_INTERFACE)) || defined(GPUCA_ALIROOT_LIB) || defined(GPUCA_GPULIBRARY)
77+
#if defined(GPUCA_STANDALONE) || (defined(GPUCA_O2_LIB) && !defined(GPUCA_O2_INTERFACE)) || defined(GPUCA_ALIROOT_LIB) || defined(GPUCA_GPULIBRARY) || defined (GPUCA_GPUCODE)
7878
#define GPUCA_ALIGPUCODE
7979
#endif
8080
#ifdef GPUCA_ALIROOT_LIB

0 commit comments

Comments
 (0)