GPU: Fixes for some compiler warnings and for compilation of GPU standalone benchmark

davidrohr · davidrohr · commit dc2dc1febe49 · 2022-01-18T12:58:24.000+01:00
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxContainer.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxContainer.h
@@ -16,6 +16,7 @@
 #ifndef ALICEO2_TPC_CALIBDEDXCONTAINER_H_
 #define ALICEO2_TPC_CALIBDEDXCONTAINER_H_
 
+#include "GPUCommonRtypes.h"
 #include "GPUCommonDef.h"
 #include "GPUCommonMath.h"
 #include "DataFormatsTPC/CalibdEdxCorrection.h"
@@ -121,7 +122,7 @@ class CalibdEdxContainer : public o2::gpu::FlatObject
   CalibdEdxTrackTopologyPol* mCalibTrackTopologyPol{nullptr};       ///< calibration for the track topology correction (polynomial)
   CalibdEdxCorrection mCalibResidualdEdx;                           ///< calibration for the residual dE/dx correction
 
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
+#if !defined(GPUCA_GPUCODE)
   /// \return returns size of the CalibdEdxTrackTopologyPol class
   std::size_t sizeOfCalibdEdxTrackTopologyPol() const { return alignSize(sizeof(CalibdEdxTrackTopologyPol), FlatObject::getClassAlignmentBytes()); }
 
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxTrackTopologyPol.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxTrackTopologyPol.h
@@ -15,6 +15,7 @@
 #ifndef ALICEO2_TPC_CalibdEdxTrackTopologyPol_H_
 #define ALICEO2_TPC_CalibdEdxTrackTopologyPol_H_
 
+#include "GPUCommonRtypes.h"
 #include "GPUCommonDef.h"
 #ifndef GPUCA_ALIGPUCODE
 #include <string_view>
diff --git a/DataFormats/Detectors/TPC/src/CalibdEdxContainer.cxx b/DataFormats/Detectors/TPC/src/CalibdEdxContainer.cxx
@@ -15,7 +15,6 @@
 #include "DataFormatsTPC/CalibdEdxContainer.h"
 
 #if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
-#include "Rtypes.h"
 #include "TFile.h"
 #include "GPUCommonLogger.h"
 #endif
diff --git a/DataFormats/Detectors/TPC/src/CalibdEdxTrackTopologySpline.cxx b/DataFormats/Detectors/TPC/src/CalibdEdxTrackTopologySpline.cxx
@@ -59,6 +59,7 @@ CalibdEdxTrackTopologySpline& CalibdEdxTrackTopologySpline::operator=(const Cali
   return *this;
 }
 
+#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) // code invisible on GPU and in the standalone compilation
 void CalibdEdxTrackTopologySpline::recreate(const int nKnots[])
 {
   /// Default constructor
@@ -89,6 +90,7 @@ void CalibdEdxTrackTopologySpline::recreate(const int nKnots[])
     mCalibSplinesqTot[i].moveBufferTo(mFlatBufferPtr + offsets2[i]);
   }
 }
+#endif
 
 void CalibdEdxTrackTopologySpline::cloneFromObject(const CalibdEdxTrackTopologySpline& obj, char* newFlatBufferPtr)
 {
diff --git a/GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx b/GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx
@@ -322,6 +322,8 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger* GPUrestrict() merger, int iT
           if (merger->GetConstantMem()->ioPtrs.clustersNative == nullptr) {
             qtot = clustersXYZ[ihit].amp;
             qmax = 0;
+            relPad = 0;
+            relTime = 0;
           } else {
             const ClusterNative& cl = merger->GetConstantMem()->ioPtrs.clustersNative->clustersLinear[clusters[ihit].num];
             qtot = cl.qTot;
diff --git a/GPU/GPUTracking/Standalone/CMakeLists.txt b/GPU/GPUTracking/Standalone/CMakeLists.txt
@@ -191,6 +191,8 @@ if(CONFIG_O2_EXTENSIONS)
   target_sources(standalone_support PRIVATE
                ${O2_DIR}/Common/Field/src/MagFieldFast.cxx
                ${O2_DIR}/DataFormats/Detectors/TPC/src/CompressedClusters.cxx
+               ${O2_DIR}/DataFormats/Detectors/TPC/src/CalibdEdxContainer.cxx
+               ${O2_DIR}/DataFormats/Detectors/TPC/src/CalibdEdxTrackTopologySpline.cxx
                ${O2_DIR}/DataFormats/simulation/src/MCCompLabel.cxx
                ${O2_DIR}/DataFormats/Reconstruction/src/TrackParametrization.cxx
                ${O2_DIR}/DataFormats/Reconstruction/src/TrackParametrizationWithError.cxx
@@ -243,7 +245,7 @@ if(CONFIG_ROOT)
                              ROOT::Tree)
 endif()
 if(CONFIG_O2_EXTENSIONS)
-  target_link_libraries(standalone_support PUBLIC Microsoft.GSL::GSL)
+  target_link_libraries(standalone_support PUBLIC Microsoft.GSL::GSL TPCFastTransformation)
 endif()
 
 if(CONFIG_VC)
diff --git a/GPU/TPCFastTransformation/SplineSpec.h b/GPU/TPCFastTransformation/SplineSpec.h
@@ -295,7 +295,7 @@ class SplineSpec<DataT, XdimT, YdimT, 0> : public SplineContainer<DataT>
     const auto maxYdimTmp = SplineUtil::getMaxNdim<XdimT>(mYdim);
     const auto maxYdim = maxYdimTmp.get();
 
-    const auto nParameters = 1 << (2 * nXdim);         //total Nr of Parameters necessary for one interpolation
+    // const auto nParameters = 1 << (2 * nXdim);         //total Nr of Parameters necessary for one interpolation
     const auto nKnotParametersPerY = 1 << nXdim;       // Nr of Parameters per Knot per Y dimension
     const auto nKnotParameters = (1 << nXdim) * nYdim; // Nr of Parameters per Knot
 

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ CalibdEdxTrackTopologySpline& CalibdEdxTrackTopologySpline::operator=(const Cali`
`59`	`59`	`return *this;`
`60`	`60`	`}`
`61`	`61`
	`62`	`+#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) // code invisible on GPU and in the standalone compilation`
`62`	`63`	`void CalibdEdxTrackTopologySpline::recreate(const int nKnots[])`
`63`	`64`	`{`
`64`	`65`	`/// Default constructor`
`@@ -89,6 +90,7 @@ void CalibdEdxTrackTopologySpline::recreate(const int nKnots[])`
`89`	`90`	`mCalibSplinesqTot[i].moveBufferTo(mFlatBufferPtr + offsets2[i]);`
`90`	`91`	`}`
`91`	`92`	`}`
	`93`	`+#endif`
`92`	`94`
`93`	`95`	`void CalibdEdxTrackTopologySpline::cloneFromObject(const CalibdEdxTrackTopologySpline& obj, char* newFlatBufferPtr)`
`94`	`96`	`{`