GPU: Fix some protections for AliRoot compilation

davidrohr · davidrohr · commit cd082dc3e339 · 2020-02-25T02:49:59.000+01:00
diff --git a/GPU/Common/GPUCommonAlgorithm.h b/GPU/Common/GPUCommonAlgorithm.h
@@ -16,8 +16,9 @@
 
 #include "GPUCommonDef.h"
 
-#if !defined(GPUCA_GPUCODE_DEVICE)
-//#include <algorithm>
+#if !defined(GPUCA_GPUCODE_DEVICE) && (!defined __cplusplus || __cplusplus < 201402L)
+#include <algorithm>
+#define GPUCA_ALGORITHM_FALLBACK
 #endif
 
 // ----------------------------- SORTING -----------------------------
@@ -71,6 +72,7 @@ namespace GPUCA_NAMESPACE
 namespace gpu
 {
 
+#ifndef GPUCA_ALGORITHM_FALLBACK
 template <typename I>
 GPUdi() void GPUCommonAlgorithm::IterSwap(I a, I b) noexcept
 {
@@ -196,6 +198,7 @@ GPUdi() void GPUCommonAlgorithm::QuickSort(I f, I l) noexcept
 {
   QuickSort(f, l, [](auto&& x, auto&& y) { return x < y; });
 }
+#endif
 
 typedef GPUCommonAlgorithm CAAlgo;
 
@@ -218,13 +221,21 @@ namespace gpu
 template <class T>
 GPUdi() void GPUCommonAlgorithm::sort(T* begin, T* end)
 {
+#ifdef GPUCA_ALGORITHM_FALLBACK
+  std::sort(begin, end);
+#else
   QuickSort(begin, end, [](auto&& x, auto&& y) { return x < y; });
+#endif
 }
 
 template <class T, class S>
 GPUdi() void GPUCommonAlgorithm::sort(T* begin, T* end, const S& comp)
 {
+#ifdef GPUCA_ALGORITHM_FALLBACK
+  std::sort(begin, end, comp);
+#else
   QuickSort(begin, end, comp);
+#endif
 }
 
 template <class T>
diff --git a/GPU/GPUTracking/Base/GPUReconstructionIncludesDevice.h b/GPU/GPUTracking/Base/GPUReconstructionIncludesDevice.h
@@ -41,7 +41,7 @@ using namespace GPUCA_NAMESPACE::gpu;
 #include "GPUTPCStartHitsSorter.cxx"
 #include "GPUTPCTrackletConstructor.cxx"
 
-#if (!defined(__OPENCL__) || defined(__OPENCLCPP__)) && !defined(GPUCA_ALIROOT_LIB)
+#if !defined(GPUCA_OPENCL1) && !defined(GPUCA_ALIROOT_LIB)
 // Files for TPC Merger
 #include "GPUTPCGMMergerGPU.cxx"
 #include "GPUTPCGMMerger.h"
diff --git a/GPU/GPUTracking/Base/GPUReconstructionKernels.h b/GPU/GPUTracking/Base/GPUReconstructionKernels.h
@@ -23,7 +23,7 @@ GPUCA_KRNL((GPUTPCTrackletConstructor, singleSlice       ), (single, REG, (GPUCA
 GPUCA_KRNL((GPUTPCTrackletConstructor, allSlices         ), (single, REG, (GPUCA_THREAD_COUNT_CONSTRUCTOR, GPUCA_BLOCK_COUNT_CONSTRUCTOR_MULTIPLIER)), (), ())
 GPUCA_KRNL((GPUTPCTrackletSelector                       ), (both, REG, (GPUCA_THREAD_COUNT_SELECTOR, GPUCA_BLOCK_COUNT_SELECTOR_MULTIPLIER)), (), ())
 GPUCA_KRNL((GPUMemClean16                                ), (simple, REG, (GPUCA_THREAD_COUNT, 1)), (, GPUPtr1(void*, ptr), unsigned long size), (, GPUPtr2(void*, ptr), size))
-#ifndef GPUCA_OPENCL1
+#if !defined(GPUCA_OPENCL1) && (!defined(GPUCA_ALIROOT_LIB) || !defined(GPUCA_GPUCODE))
 GPUCA_KRNL((GPUTPCGMMergerTrackFit                       ), (simple, REG, (GPUCA_THREAD_COUNT_FIT, 1)), (), ())
 #ifdef HAVE_O2HEADERS
 GPUCA_KRNL((GPUTRDTrackerGPU                             ), (simple, REG, (GPUCA_THREAD_COUNT_TRD, 1)), (), ())
diff --git a/GPU/GPUTracking/Base/opencl-common/GPUReconstructionOCL.cl b/GPU/GPUTracking/Base/opencl-common/GPUReconstructionOCL.cl
@@ -60,24 +60,21 @@
 #define assert(param)
 #ifndef __OPENCLCPP__
 #define static_assert(...)
+#define GPUCA_OPENCL1
 #endif
 
 #include "GPUReconstructionIncludesDevice.h"
 #include "GPUConstantMem.h"
 
 // if (gpu_mem != pTracker.GPUParametersConst()->gpumem) return; //TODO!
 
-#ifndef __OPENCLCPP__
-#define GPUCA_OPENCL1
-#endif
 #define GPUCA_KRNL(x_class, x_attributes, x_arguments, x_forward) GPUCA_KRNL_WRAP(GPUCA_KRNL_LOAD_, x_class, x_attributes, x_arguments, x_forward)
 #define GPUCA_KRNL_LOAD_single(x_class, x_attributes, x_arguments, x_forward) GPUCA_KRNLGPU_SINGLE(x_class, x_attributes, x_arguments, x_forward)
 #define GPUCA_KRNL_LOAD_multi(x_class, x_attributes, x_arguments, x_forward) GPUCA_KRNLGPU_MULTI(x_class, x_attributes, x_arguments, x_forward)
 #define GPUCA_CONSMEM_PTR GPUglobal() char *gpu_mem, GPUconstant() MEM_CONSTANT(GPUConstantMem) * pConstant,
 #define GPUCA_CONSMEM *pConstant
 #include "GPUReconstructionKernels.h"
 #undef GPUCA_KRNL
-#undef GPUCA_OPENCL1
 #undef GPUCA_KRNL_LOAD_single
 #undef GPUCA_KRNL_LOAD_multi
 
diff --git a/GPU/GPUTracking/Global/GPUChainTracking.cxx b/GPU/GPUTracking/Global/GPUChainTracking.cxx
@@ -719,6 +719,7 @@ void GPUChainTracking::ConvertRun2RawToNative()
 
 void GPUChainTracking::ConvertZSEncoder(bool zs12bit)
 {
+#ifdef HAVE_O2HEADERS
   GPUTrackingInOutZS* tmp;
   GPUReconstructionConvert::RunZSEncoder(mIOPtrs.tpcPackedDigits, tmp, param(), zs12bit);
   mIOPtrs.tpcZS = tmp;
@@ -731,6 +732,7 @@ void GPUChainTracking::ConvertZSEncoder(bool zs12bit)
       }
     }
   }
+#endif
 }
 
 void GPUChainTracking::ConvertZSFilter(bool zs12bit)

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,9 @@`
`16`	`16`
`17`	`17`	`#include "GPUCommonDef.h"`
`18`	`18`
`19`		`-#if !defined(GPUCA_GPUCODE_DEVICE)`
`20`		`-//#include <algorithm>`
	`19`	`+#if !defined(GPUCA_GPUCODE_DEVICE) && (!defined __cplusplus \|\| __cplusplus < 201402L)`
	`20`	`+#include <algorithm>`
	`21`	`+#define GPUCA_ALGORITHM_FALLBACK`
`21`	`22`	`#endif`
`22`	`23`
`23`	`24`	`// ----------------------------- SORTING -----------------------------`
`@@ -71,6 +72,7 @@ namespace GPUCA_NAMESPACE`
`71`	`72`	`namespace gpu`
`72`	`73`	`{`
`73`	`74`
	`75`	`+#ifndef GPUCA_ALGORITHM_FALLBACK`
`74`	`76`	`template <typename I>`
`75`	`77`	`GPUdi() void GPUCommonAlgorithm::IterSwap(I a, I b) noexcept`
`76`	`78`	`{`
`@@ -196,6 +198,7 @@ GPUdi() void GPUCommonAlgorithm::QuickSort(I f, I l) noexcept`
`196`	`198`	`{`
`197`	`199`	`QuickSort(f, l, [](auto&& x, auto&& y) { return x < y; });`
`198`	`200`	`}`
	`201`	`+#endif`
`199`	`202`
`200`	`203`	`typedef GPUCommonAlgorithm CAAlgo;`
`201`	`204`
`@@ -218,13 +221,21 @@ namespace gpu`
`218`	`221`	`template <class T>`
`219`	`222`	`GPUdi() void GPUCommonAlgorithm::sort(T* begin, T* end)`
`220`	`223`	`{`
	`224`	`+#ifdef GPUCA_ALGORITHM_FALLBACK`
	`225`	`+ std::sort(begin, end);`
	`226`	`+#else`
`221`	`227`	`QuickSort(begin, end, [](auto&& x, auto&& y) { return x < y; });`
	`228`	`+#endif`
`222`	`229`	`}`
`223`	`230`
`224`	`231`	`template <class T, class S>`
`225`	`232`	`GPUdi() void GPUCommonAlgorithm::sort(T* begin, T* end, const S& comp)`
`226`	`233`	`{`
	`234`	`+#ifdef GPUCA_ALGORITHM_FALLBACK`
	`235`	`+ std::sort(begin, end, comp);`
	`236`	`+#else`
`227`	`237`	`QuickSort(begin, end, comp);`
	`238`	`+#endif`
`228`	`239`	`}`
`229`	`240`
`230`	`241`	`template <class T>`
Original file line number	Diff line number	Diff line change
`@@ -719,6 +719,7 @@ void GPUChainTracking::ConvertRun2RawToNative()`
`719`	`719`
`720`	`720`	`void GPUChainTracking::ConvertZSEncoder(bool zs12bit)`
`721`	`721`	`{`
	`722`	`+#ifdef HAVE_O2HEADERS`
`722`	`723`	`GPUTrackingInOutZS* tmp;`
`723`	`724`	`GPUReconstructionConvert::RunZSEncoder(mIOPtrs.tpcPackedDigits, tmp, param(), zs12bit);`
`724`	`725`	`mIOPtrs.tpcZS = tmp;`
`@@ -731,6 +732,7 @@ void GPUChainTracking::ConvertZSEncoder(bool zs12bit)`
`731`	`732`	`}`
`732`	`733`	`}`
`733`	`734`	`}`
	`735`	`+#endif`
`734`	`736`	`}`
`735`	`737`
`736`	`738`	`void GPUChainTracking::ConvertZSFilter(bool zs12bit)`