GPU: Fix some problems with standalone compilation

Author: davidrohr

GPU/GPUTracking/Base/GPUReconstruction.cxx

@@ -257,10 +257,12 @@ int GPUReconstruction::InitPhaseBeforeDevice()
 #ifndef GPUCA_NO_FAST_MATH
     GPUError("Warning, deterministicGPUReconstruction needs GPUCA_NO_FAST_MATH, otherwise results will never be deterministic!");
 #endif
+#ifdef GPUCA_HAVE_O2HEADERS
     mProcessingSettings.overrideClusterizerFragmentLen = TPC_MAX_FRAGMENT_LEN_GPU;
     if (mProcessingSettings.createO2Output > 1) {
       mProcessingSettings.createO2Output = 1;
     }
+#endif
   }
   if (mProcessingSettings.deterministicGPUReconstruction && mProcessingSettings.debugLevel >= 6) {
     mProcessingSettings.nTPCClustererLanes = 1;

GPU/GPUTracking/Merger/GPUTPCGMMergerDump.cxx

@@ -33,7 +33,9 @@
 #include "GPUTPCGMBorderTrack.h"
 #include "GPUReconstruction.h"
 #include "GPUDebugStreamer.h"
+#ifdef GPUCA_HAVE_O2HEADERS
 #include "GPUTrackingRefit.h"
+#endif
 
 using namespace GPUCA_NAMESPACE::gpu;
 using namespace gputpcgmmergertypes;
@@ -234,6 +236,7 @@ const GPUTPCGMBorderTrack& GPUTPCGMMerger::MergedTrackStreamerFindBorderTrack(co
 
 void GPUTPCGMMerger::DebugRefitMergedTrack(const GPUTPCGMMergedTrack& track)
 {
+#ifdef GPUCA_HAVE_O2HEADERS
   GPUTPCGMMergedTrack trk = track;
   GPUTrackingRefit refit;
   ((GPUConstantMem*)GetConstantMem())->ioPtrs.mergedTrackHitStates = ClusterStateExt();
@@ -260,4 +263,5 @@ void GPUTPCGMMerger::DebugRefitMergedTrack(const GPUTPCGMMergedTrack& track)
   } else {
     printf("REFIT ERROR\n");
   }
+#endif
 }

GPU/GPUTracking/SliceTracker/GPUTPCTrackletConstructor.cxx

@@ -24,8 +24,10 @@
 #if !defined(__OPENCL__) || defined(__OPENCLCPP__)
 #include "GPUTPCGlobalTracking.h"
 #include "CorrectionMapsHelper.h"
+#ifdef GPUCA_HAVE_O2HEADERS
 #include "CalibdEdxContainer.h"
-#endif
+#endif // GPUCA_HAVE_O2HEADERS
+#endif // OPENCL1
 #include "GPUParam.inc"
 #include "GPUCommonMath.h"
 
@@ -383,7 +385,7 @@ GPUdic(2, 1) void GPUTPCTrackletConstructor::UpdateTracklet(int /*nBlocks*/, int
         }
       } while (false);
       (void)found;
-#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
+#if defined(GPUCA_HAVE_O2HEADERS) && (!defined(__OPENCL__) || defined(__OPENCLCPP__))
       if (!found && tracker.GetConstantMem()->calibObjects.dEdxCalibContainer) {
         unsigned int pad = CAMath::Float2UIntRn(tracker.Param().tpcGeometry.LinearY2Pad(tracker.ISlice(), iRow, yUncorrected));
         if (pad < tracker.Param().tpcGeometry.NPads(iRow) && tracker.GetConstantMem()->calibObjects.dEdxCalibContainer->isDead(tracker.ISlice(), iRow, pad)) {

GPU/GPUTracking/kernels.cmake

@@ -66,7 +66,7 @@ o2_gpu_add_kernel("GPUTPCGMMergerMergeLoopers, step0"            LB      simple)
 o2_gpu_add_kernel("GPUTPCGMMergerMergeLoopers, step1"            LB      simple)
 o2_gpu_add_kernel("GPUTPCGMMergerMergeLoopers, step2"            LB      simple)
 
-if(NOT ALIGPU_BUILD_TYPE STREQUAL "ALIROOT" OR CONFIG_O2_EXTENSIONS)
+if(ALIGPU_BUILD_TYPE STREQUAL "O2" OR CONFIG_O2_EXTENSIONS)
 o2_gpu_add_kernel("GPUTPCGMO2Output, prepare"                    LB      simple)
 o2_gpu_add_kernel("GPUTPCGMO2Output, sort"                       NO      simple)
 o2_gpu_add_kernel("GPUTPCGMO2Output, output"                     LB      simple)