GPU: Do not allow any constructors that will use FlatObject in GPU code, were anyway not used but could create dangerous symbols

Author: davidrohr

Detectors/Base/include/DetectorsBase/MatLayerCyl.h

@@ -54,9 +54,11 @@ class MatLayerCyl : public o2::gpu::FlatObject
                              Within = 0,
                              Above = 1 };
 
+#ifndef GPUCA_GPUCODE
   MatLayerCyl();
   MatLayerCyl(const MatLayerCyl& src) CON_DELETE;
   ~MatLayerCyl() CON_DEFAULT;
+#endif
 
 #ifndef GPUCA_ALIGPUCODE // this part is unvisible on GPU version
   MatLayerCyl(float rMin, float rMax, float zHalfSpan, float dzMin, float drphiMin);

Detectors/Base/include/DetectorsBase/MatLayerCylSet.h

@@ -51,9 +51,11 @@ class MatLayerCylSet : public o2::gpu::FlatObject
 {
 
  public:
+#ifndef GPUCA_GPUCODE
   MatLayerCylSet() CON_DEFAULT;
   ~MatLayerCylSet() CON_DEFAULT;
   MatLayerCylSet(const MatLayerCylSet& src) CON_DELETE;
+#endif
 
   GPUd() const MatLayerCylSetLayout* get() const { return reinterpret_cast<const MatLayerCylSetLayout*>(mFlatBufferPtr); }
   GPUd() MatLayerCylSetLayout* get() { return reinterpret_cast<MatLayerCylSetLayout*>(mFlatBufferPtr); }

Detectors/Base/src/MatLayerCyl.cxx

@@ -23,10 +23,12 @@
 using namespace o2::base;
 using flatObject = o2::gpu::FlatObject;
 
+#ifndef GPUCA_GPUCODE
 //________________________________________________________________________________
 MatLayerCyl::MatLayerCyl() : mNZBins(0), mNPhiBins(0), mNPhiSlices(0), mZHalf(0.f), mRMin2(0.f), mRMax2(0.f), mDZ(0.f), mDZInv(0.f), mDPhi(0.f), mDPhiInv(0.f), mPhiBin2Slice(nullptr), mSliceCos(nullptr), mSliceSin(nullptr), mCells(nullptr)
 {
 }
+#endif
 
 #ifndef GPUCA_ALIGPUCODE // this part is unvisible on GPU version
 //________________________________________________________________________________

Detectors/TRD/base/include/TRDBase/GeometryFlat.h

@@ -34,7 +34,7 @@ class Geometry;
 class GeometryFlat : public o2::gpu::FlatObject, public GeometryBase
 {
  public:
-#ifndef GPUCA_GPUCODE_DEVICE
+#ifndef GPUCA_GPUCODE
   GeometryFlat() = default;
   GeometryFlat(const GeometryFlat& v) : FlatObject(), GeometryBase()
   {

GPU/GPUTracking/DataTypes/CalibdEdxContainer.h

@@ -60,7 +60,9 @@ class CalibdEdxContainer : public o2::gpu::FlatObject
 {
  public:
   /// Default constructor: creates an empty uninitialized object
+#ifndef GPUCA_GPUCODE
   CalibdEdxContainer() CON_DEFAULT;
+#endif
 
   /// Copy constructor: disabled to avoid ambiguity. Use cloneFromObject() instead
   CalibdEdxContainer(const CalibdEdxContainer&) CON_DELETE;

GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.h

@@ -53,13 +53,12 @@ class CalibdEdxTrackTopologyPol : public o2::gpu::FlatObject
   /// \param fileName name of the input file containing the object
   /// \parma name name of the object
   CalibdEdxTrackTopologyPol(std::string_view fileName, std::string_view name = "CalibdEdxTrackTopologyPol") { loadFromFile(fileName.data(), name.data()); };
-#endif
-
   /// Default constructor: creates an empty uninitialized object
   CalibdEdxTrackTopologyPol() CON_DEFAULT;
 
   /// destructor
   ~CalibdEdxTrackTopologyPol() CON_DEFAULT;
+#endif
 
 #ifdef GPUCA_HAVE_O2HEADERS
   /// \return returns the track topology correction

GPU/Utils/FlatObject.h

@@ -178,10 +178,14 @@ class FlatObject
   /// _____________  Constructors / destructors __________________________
 
   /// Default constructor / destructor
-  FlatObject() CON_DEFAULT;
+#ifndef GPUCA_GPUCODE
+  FlatObject() CON_DEFAULT; // No object derrived from FlatObject should be created on the GPU
   ~FlatObject();
   FlatObject(const FlatObject&) CON_DELETE;
   FlatObject& operator=(const FlatObject&) CON_DELETE;
+#else
+  FlatObject() CON_DELETE;
+#endif
 
  protected:
   /// _____________  Memory alignment  __________________________