GPU: Make TrackPar / TrackParCov compile for GPU

Author: davidrohr

Common/MathUtils/include/MathUtils/Utils.h

@@ -108,11 +108,12 @@ GPUdi() void sincos(float ang, float& s, float& c)
 {
   detail::sincos<float>(ang, s, c);
 }
-
+#ifndef __OPENCL__
 GPUdi() void sincosd(double ang, double& s, double& c)
 {
   detail::sincos<double>(ang, s, c);
 }
+#endif
 
 GPUdi() void rotateZ(float xL, float yL, float& xG, float& yG, float snAlp, float csAlp)
 {

Common/MathUtils/include/MathUtils/detail/IntervalXY.h

@@ -18,6 +18,7 @@
 
 #include "GPUCommonDef.h"
 #include "GPUCommonRtypes.h"
+#include "GPUCommonMath.h"
 #ifndef GPUCA_GPUCODE_DEVICE
 #include <cmath>
 #include <tuple>
@@ -205,7 +206,7 @@ GPUdi() void IntervalXY<T>::setEdges(T x0, T y0, T x1, T y1)
 
 #ifndef GPUCA_GPUCODE_DEVICE
 template <typename T>
-GPUdi() std::tuple<T, T> IntervalXY<T>::eval(T t) const
+std::tuple<T, T> IntervalXY<T>::eval(T t) const
 {
   return {mX + t * mDx, mY + t * mDY};
 }
@@ -214,7 +215,8 @@ GPUdi() std::tuple<T, T> IntervalXY<T>::eval(T t) const
 template <typename T>
 GPUdi() void IntervalXY<T>::eval(T t, T& x, T& y) const
 {
-  std::tie(x, y) = eval(t);
+  x = mX + t * mDx;
+  y = mY + t * mDY;
 }
 
 template <typename T>
@@ -269,11 +271,11 @@ GPUdi() bool IntervalXY<T>::circleCrossParam(const CircleXY<T>& circle, T& t) co
   if (det < 0.f) {
     return false;
   }
-  det = std::sqrt(det);
+  det = gpu::CAMath::Sqrt(det);
   const T t0 = -b - det;
   const T t1 = -b + det;
   // select the one closer to [0:1] interval
-  t = (std::fabs(t0 - 0.5f) < std::fabs(t1 - 0.5f)) ? t0 : t1;
+  t = (gpu::CAMath::Abs(t0 - 0.5f) < gpu::CAMath::Abs(t1 - 0.5f)) ? t0 : t1;
   return true;
 }
 
@@ -282,8 +284,9 @@ GPUdi() bool IntervalXY<T>::seenByLine(const IntervalXY<T>& other, T eps) const
 {
   T a, b, c; // find equation of the line a*x+b*y+c = 0
   other.getLineCoefs(a, b, c);
-  const auto [x0, y0] = eval(-eps);
-  const auto [x1, y1] = eval(1.f + eps);
+  T x0, y0, x1, y1;
+  eval(-eps, x0, y0);
+  eval(1.f + eps, x0, y0);
 
   return (a * x0 + b * y0 + c) * (a * x1 + b * y1 + c) < 0;
 }
@@ -296,7 +299,7 @@ GPUdi() bool IntervalXY<T>::lineCrossParam(const IntervalXY<T>& other, T& t) con
   const T dx = other.getX0() - mX;
   const T dy = other.getY0() - mY;
   const T det = -mDx * other.getY0() + mDY * other.getX0();
-  if (std::fabs(det) < eps) {
+  if (gpu::CAMath::Abs(det) < eps) {
     return false; // parallel
   }
   t = (-dx * other.getY0() + dy * other.getX0()) / det;

Common/MathUtils/include/MathUtils/detail/trigonometric.h

@@ -107,17 +107,24 @@ inline void bringToPMPiGen(T& phi)
   phi = toPMPiGen<T>(phi);
 }
 
+#ifdef __OPENCL__ // TODO: get rid of that stupid workaround for OpenCL template address spaces
 template <typename T>
-GPUhdi() void sincos(T ang, GPUgeneric() T& s, GPUgeneric() T& c)
+GPUhdi() void sincos(T ang, float& s, float& c)
+{
+  return o2::gpu::GPUCommonMath::SinCos(ang, s, c);
+}
+#else
+template <typename T>
+GPUhdi() void sincos(T ang, T& s, T& c)
 {
   return o2::gpu::GPUCommonMath::SinCos(ang, s, c);
 }
-
 template <>
-GPUhdi() void sincos(double ang, GPUgeneric() double& s, GPUgeneric() double& c)
+GPUhdi() void sincos(double ang, double& s, double& c)
 {
   return o2::gpu::GPUCommonMath::SinCosd(ang, s, c);
 }
+#endif
 
 #ifndef GPUCA_GPUCODE_DEVICE
 

DataFormats/Reconstruction/include/ReconstructionDataFormats/DCA.h

@@ -11,12 +11,11 @@
 #ifndef ALICEO2_DCA_H
 #define ALICEO2_DCA_H
 
+#include "GPUCommonDef.h"
 #include "GPUCommonRtypes.h"
+#include "GPUCommonArray.h"
 
-#ifndef __OPENCL__
-#include <array>
-#endif
-#ifndef GPUCA_ALIGPUCODE
+#ifndef GPUCA_GPUCODE_DEVICE
 #include <iosfwd>
 #endif
 
@@ -32,14 +31,14 @@ class DCA
 {
 
  public:
-  DCA() = default;
+  GPUdDefault() DCA() = default;
 
-  DCA(float y, float z, float syy = 0.f, float syz = 0.f, float szz = 0.f)
+  GPUd() DCA(float y, float z, float syy = 0.f, float syz = 0.f, float szz = 0.f)
   {
     set(y, z, syy, syz, szz);
   }
 
-  void set(float y, float z, float syy, float syz, float szz)
+  GPUd() void set(float y, float z, float syy, float syz, float szz)
   {
     mY = y;
     mZ = z;
@@ -48,30 +47,32 @@ class DCA
     mCov[2] = szz;
   }
 
-  void set(float y, float z)
+  GPUd() void set(float y, float z)
   {
     mY = y;
     mZ = z;
   }
 
-  auto getY() const { return mY; }
-  auto getZ() const { return mZ; }
-  auto getSigmaY2() const { return mCov[0]; }
-  auto getSigmaYZ() const { return mCov[1]; }
-  auto getSigmaZ2() const { return mCov[2]; }
-  const auto& getCovariance() const { return mCov; }
+  GPUd() auto getY() const { return mY; }
+  GPUd() auto getZ() const { return mZ; }
+  GPUd() auto getSigmaY2() const { return mCov[0]; }
+  GPUd() auto getSigmaYZ() const { return mCov[1]; }
+  GPUd() auto getSigmaZ2() const { return mCov[2]; }
+  GPUd() const auto& getCovariance() const { return mCov; }
 
   void print() const;
 
  private:
   float mY = 0.f;
   float mZ = 0.f;
-  std::array<float, 3> mCov; ///< s2y, syz, s2z
+  gpu::gpustd::array<float, 3> mCov; ///< s2y, syz, s2z
 
   ClassDefNV(DCA, 1);
 };
 
+#ifndef GPUCA_GPUCODE_DEVICE
 std::ostream& operator<<(std::ostream& os, const DCA& d);
+#endif
 
 } // namespace dataformats
 } // namespace o2

DataFormats/Reconstruction/include/ReconstructionDataFormats/PID.h

@@ -15,6 +15,7 @@
 #ifndef ALICEO2_track_PID_H_
 #define ALICEO2_track_PID_H_
 
+#include "GPUCommonDef.h"
 #include "GPUCommonRtypes.h"
 #include "CommonConstants/PhysicsConstants.h"
 
@@ -99,44 +100,46 @@ class PID
   static constexpr ID NIDsTot = pid_constants::NIDsTot; ///< total number of defined IDs
   static_assert(NIDsTot == LastExt + 1, "Incorrect NIDsTot, please update!");
 
-  PID() = default;
-  PID(ID id) : mID(id) {}
-  PID(const char* name);
-  PID(const PID& src) = default;
-  PID& operator=(const PID& src) = default;
+  GPUdDefault() PID() = default;
+  GPUd() PID(ID id) : mID(id) {}
+  GPUd() PID(const char* name);
+  GPUdDefault() PID(const PID& src) = default;
+  GPUdDefault() PID& operator=(const PID& src) = default;
 
-  ID getID() const { return mID; }
-  operator ID() const { return getID(); }
+  GPUd() ID getID() const { return mID; }
+  GPUd() operator ID() const { return getID(); }
 
-  float getMass() const { return getMass(mID); }
-  float getMass2Z() const { return getMass2Z(mID); }
-  int getCharge() const { return getCharge(mID); }
+  GPUd() float getMass() const { return getMass(mID); }
+  GPUd() float getMass2Z() const { return getMass2Z(mID); }
+  GPUd() int getCharge() const { return getCharge(mID); }
 
-  static float getMass(ID id) { return pid_constants::sMasses[id]; }
-  static float getMass2(ID id) { return pid_constants::sMasses2[id]; }
-  static float getMass2Z(ID id) { return pid_constants::sMasses2Z[id]; }
-  static int getCharge(ID id) { return pid_constants::sCharges[id]; }
+  GPUd() static float getMass(ID id) { return pid_constants::sMasses[id]; }
+  GPUd() static float getMass2(ID id) { return pid_constants::sMasses2[id]; }
+  GPUd() static float getMass2Z(ID id) { return pid_constants::sMasses2Z[id]; }
+  GPUd() static int getCharge(ID id) { return pid_constants::sCharges[id]; }
 #ifndef GPUCA_GPUCODE_DEVICE
-  const char* getName() const
+  GPUd() const char* getName() const
   {
     return getName(mID);
   }
-  static const char* getName(ID id) { return pid_constants::sNames[id]; }
+  GPUd() static const char* getName(ID id) { return pid_constants::sNames[id]; }
 #endif
 
  private:
   ID mID = Pion;
 
   // are 2 strings equal ? (trick from Giulio)
-  inline static constexpr bool sameStr(char const* x, char const* y)
+  GPUdi() static constexpr bool sameStr(char const* x, char const* y)
   {
     return !*x && !*y ? true : /* default */ (*x == *y && sameStr(x + 1, y + 1));
   }
 
-  inline static constexpr ID nameToID(char const* name, ID id)
+#ifndef GPUCA_GPUCODE_DEVICE
+  GPUdi() static constexpr ID nameToID(char const* name, ID id)
   {
-    return id > LastExt ? id : sameStr(name, sNames[id]) ? id : nameToID(name, id + 1);
+    return id > LastExt ? id : sameStr(name, pid_constants::sNames[id]) ? id : nameToID(name, id + 1);
   }
+#endif
 
   ClassDefNV(PID, 2);
 };