GPU: Fix some compile errors in setups not tested by CI

davidrohr · davidrohr · commit 9d87df011600 · 2020-02-02T14:11:04.000+01:00
diff --git a/GPU/GPUTracking/Base/GPUReconstructionConvert.cxx b/GPU/GPUTracking/Base/GPUReconstructionConvert.cxx
@@ -17,12 +17,12 @@
 #include "GPUO2DataTypes.h"
 #include "GPUDataTypes.h"
 #include "AliHLTTPCRawCluster.h"
-#include "Digit.h"
 #include "GPUParam.h"
 #include <algorithm>
 #include <vector>
 
 #ifdef HAVE_O2HEADERS
+#include "Digit.h"
 #include "DataFormatsTPC/ZeroSuppression.h"
 #include "Headers/RAWDataHeader.h"
 #endif
diff --git a/GPU/GPUTracking/Base/opencl-common/GPUReconstructionOCL.cl b/GPU/GPUTracking/Base/opencl-common/GPUReconstructionOCL.cl
@@ -58,6 +58,9 @@
 #undef assert
 #endif
 #define assert(param)
+#ifndef __OPENCLCPP__
+#define static_assert(...)
+#endif
 
 #include "GPUReconstructionIncludesDevice.h"
 #include "GPUConstantMem.h"
diff --git a/GPU/GPUTracking/Standalone/cmake/config.cmake b/GPU/GPUTracking/Standalone/cmake/config.cmake
@@ -15,7 +15,7 @@ set(BUILD_EVENT_DISPLAY 1)
 set(CONFIG_GL3W 0)
 set(CONFIG_O2 1)
 set(BUILD_DEBUG 0)
-#set(CUDA_GCCBIN gcc-8.3.0)
+#set(CUDA_GCCBIN c++-8.3.0)
 #set(OCL2_GPUTARGET gfx906)
 #set(HIP_AMDGPUTARGET gfx906)
 #set(CUDA_COMPUTETARGET 61)
diff --git a/GPU/TPCFastTransformation/CMakeLists.txt b/GPU/TPCFastTransformation/CMakeLists.txt
@@ -12,7 +12,7 @@ set(MODULE TPCFastTransformation)
 
 set(SRCS
     Spline1D.cxx  
-    Spline2D.cxx  
+    Spline2D.cxx
     SplineHelper1D.cxx
     SplineHelper2D.cxx
     IrregularSpline1D.cxx
diff --git a/GPU/TPCFastTransformation/Spline1D.cxx b/GPU/TPCFastTransformation/Spline1D.cxx
@@ -419,4 +419,4 @@ int Spline1D::test(const bool draw, const bool drawDataPoints)
   return 0;
 }
 
-#endif // GPUCA_GPUCODE
+#endif // GPUCA_GPUCODE
diff --git a/GPU/TPCFastTransformation/SplineHelper1D.cxx b/GPU/TPCFastTransformation/SplineHelper1D.cxx
@@ -13,7 +13,7 @@
 ///
 /// \author  Sergey Gorbunov <sergey.gorbunov@cern.ch>
 
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) && !defined(GPUCA_ALIROOT_LIB)
+#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
 
 #include "SplineHelper1D.h"
 #include "TMath.h"
@@ -42,7 +42,7 @@ std::unique_ptr<float[]> SplineHelper1D::constructParametersClassic(int Ndim, st
 
   /*
     const Spline1D::Knot& knot0 = mSpline.getKnot(i);
-    double x = (u - knot0.u) * knot0.Li; // scaled u    
+    double x = (u - knot0.u) * knot0.Li; // scaled u
     double cS1 = (6 - 12*x)*knot0.Li*knot0.Li;
     double cZ0 = (6*x-4)*knot0.Li;
     double cZ1 = (6*x-2)*knot0.Li;
diff --git a/GPU/TPCFastTransformation/SplineHelper2D.cxx b/GPU/TPCFastTransformation/SplineHelper2D.cxx
@@ -13,7 +13,7 @@
 ///
 /// \author  Sergey Gorbunov <sergey.gorbunov@cern.ch>
 
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) && !defined(GPUCA_ALIROOT_LIB)
+#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
 
 #include "SplineHelper2D.h"
 #include "TMath.h"

Original file line number	Diff line number	Diff line change
`@@ -419,4 +419,4 @@ int Spline1D::test(const bool draw, const bool drawDataPoints)`
`419`	`419`	`return 0;`
`420`	`420`	`}`
`421`	`421`
`422`		`-#endif // GPUCA_GPUCODE`
	`422`	`+#endif // GPUCA_GPUCODE`