GPU: Simplify some type_traits use, get rid of ::values and ::type

Author: davidrohr

GPU/GPUTracking/Base/cuda/GPUReconstructionCUDAInternals.h

@@ -79,7 +79,7 @@ class GPUDebugTiming
   bool mDo;
 };
 
-static_assert(std::is_convertible<cudaEvent_t, void*>::value, "CUDA event type incompatible to deviceEvent");
+static_assert(std::is_convertible_v<cudaEvent_t, void*>, "CUDA event type incompatible to deviceEvent");
 
 } // namespace o2::gpu
 

GPU/GPUTracking/Base/opencl/GPUReconstructionOCL.cxx

@@ -18,7 +18,7 @@
 
 #include <map>
 
-static_assert(std::is_convertible<cl_event, void*>::value, "OpenCL event type incompatible to deviceEvent");
+static_assert(std::is_convertible_v<cl_event, void*>, "OpenCL event type incompatible to deviceEvent");
 
 #define GPUErrorReturn(...) \
   {                         \

GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx

@@ -235,7 +235,7 @@ int64_t GPUTPCGMMerger::GetTrackLabelA(const S& trk) const
 {
   GPUTPCGMSectorTrack* sectorTrack = nullptr;
   int32_t nClusters = 0;
-  if constexpr (std::is_same<S, GPUTPCGMBorderTrack&>::value) {
+  if constexpr (std::is_same_v<S, GPUTPCGMBorderTrack&>) {
     sectorTrack = &mSectorTrackInfos[trk.TrackID()];
     nClusters = sectorTrack->OrigTrack()->NHits();
   } else {
@@ -244,7 +244,7 @@ int64_t GPUTPCGMMerger::GetTrackLabelA(const S& trk) const
   auto acc = GPUTPCTrkLbl<false, GPUTPCTrkLbl_ret>(resolveMCLabels<T>(GetConstantMem()->ioPtrs.clustersNative ? GetConstantMem()->ioPtrs.clustersNative->clustersMCTruth : nullptr, GetConstantMem()->ioPtrs.mcLabelsTPC), 0.5f);
   for (int32_t i = 0; i < nClusters; i++) {
     int32_t id;
-    if constexpr (std::is_same<S, GPUTPCGMBorderTrack&>::value) {
+    if constexpr (std::is_same_v<S, GPUTPCGMBorderTrack&>) {
       const GPUTPCTracker& tracker = GetConstantMem()->tpcTrackers[sectorTrack->Sector()];
       const GPUTPCHitId& ic = tracker.TrackHits()[sectorTrack->OrigTrack()->FirstHitID() + i];
       id = tracker.Data().ClusterDataIndex(tracker.Data().Row(ic.RowIndex()), ic.HitIndex()) + GetConstantMem()->ioPtrs.clustersNative->clusterOffset[sectorTrack->Sector()][0];

GPU/GPUTracking/qa/GPUQAHelper.h

@@ -48,7 +48,7 @@ class GPUTPCTrkLbl
   }
   inline void addLabel(uint32_t elementId)
   {
-    if constexpr (std::is_same<T, AliHLTTPCClusterMCWeight>::value) {
+    if constexpr (std::is_same_v<T, AliHLTTPCClusterMCWeight>) {
       for (uint32_t i = 0; i < sizeof(mClusterLabels[elementId]) / sizeof(mClusterLabels[elementId].fClusterID[0]); i++) {
         const auto& element = mClusterLabels[elementId].fClusterID[i];
         if (element.fMCID >= 0) {
@@ -101,7 +101,7 @@ class GPUTPCTrkLbl
         }
       }
       auto& bestLabel = mLabels[bestLabelNum].first;
-      if constexpr (std::is_same<T, AliHLTTPCClusterMCWeight>::value && WEIGHT) {
+      if constexpr (std::is_same_v<T, AliHLTTPCClusterMCWeight> && WEIGHT) {
         *labelWeight = bestLabel.fWeight;
         *totalWeight = mTotalWeight;
         *maxCount = bestLabelCount;
@@ -147,7 +147,7 @@ struct GPUTPCTrkLbl_ret {
 template <bool WEIGHT = false, class U = void, class T, template <class> class S, typename... Args>
 static inline auto GPUTPCTrkLbl(const S<T>* x, Args... args)
 {
-  if constexpr (std::is_same<U, void>::value) {
+  if constexpr (std::is_same_v<U, void>) {
     return internal::GPUTPCTrkLbl<WEIGHT, T, S<T>>(x, args...);
   } else {
     return internal::GPUTPCTrkLbl<WEIGHT, T, S<T>, U>(x, args...);
@@ -159,7 +159,7 @@ static inline auto GPUTPCTrkLbl(const AliHLTTPCClusterMCLabel* x, Args... args)
 {
   using S = AliHLTTPCClusterMCLabel;
   using T = AliHLTTPCClusterMCWeight;
-  if constexpr (std::is_same<U, void>::value) {
+  if constexpr (std::is_same_v<U, void>) {
     return internal::GPUTPCTrkLbl<WEIGHT, T, S>(x, args...);
   } else {
     return internal::GPUTPCTrkLbl<WEIGHT, T, S, U>(x, args...);

GPU/GPUTracking/utils/bitfield.h

@@ -93,7 +93,7 @@ class bitfield
   }
 
 #if !defined(GPUCA_GPUCODE_DEVICE)
-  static_assert(std::is_integral<S>::value, "Storage type non integral");
+  static_assert(std::is_integral_v<S>, "Storage type non integral");
   static_assert(sizeof(S) >= sizeof(T), "Storage type has insufficient capacity");
 #endif
 

GPU/GPUTracking/utils/qconfig.cxx

@@ -126,7 +126,7 @@ static inline int32_t qAddOptionMainTupleElem(qConfigSettings<typename qSettings
   qConfigSettings<T> settings = settingsTup;
   return (qAddOptionType<T>(settings, ref, i, argv, argc, def));
 }
-template <typename T, int32_t index = 0, int32_t left = std::tuple_size<T>::value>
+template <typename T, int32_t index = 0, int32_t left = std::tuple_size_v<T>>
 struct qAddOptionMainTupleStruct {
   static inline int32_t qAddOptionMainTuple(qConfigSettings<typename qSettingsType<T>::settingsType> settings, T& tup, int32_t& i, const char** argv, const int argc)
   {
@@ -157,13 +157,13 @@ struct qConfigType {
   // Recursive handling of additional settings
   static inline void qProcessSetting(qConfigSettings<T>& settings, qmin_t<T> minval)
   {
-    static_assert(!std::is_same<T, bool>::value, "min option not supported for boolean settings");
+    static_assert(!std::is_same_v<T, bool>, "min option not supported for boolean settings");
     settings.checkMin = true;
     settings.min = minval.v;
   }
   static inline void qProcessSetting(qConfigSettings<T>& settings, qmax_t<T> maxval)
   {
-    static_assert(!std::is_same<T, bool>::value, "max option not supported for boolean settings");
+    static_assert(!std::is_same_v<T, bool>, "max option not supported for boolean settings");
     settings.checkMax = true;
     settings.max = maxval.v;
   }
@@ -244,7 +244,7 @@ struct qConfigType {
   static inline void qConfigHelpOption(const char* name, const char* type, const char* def, const char* optname, char optnameshort, const char* preopt, char preoptshort, int32_t optionType, const char* help, Args&&... args)
   {
     auto settings = qConfigGetSettings(args...);
-    const bool boolType = optionType != 1 && std::is_same<T, bool>::value;
+    const bool boolType = optionType != 1 && std::is_same_v<T, bool>;
     const char* arguments = settings.doSet ? " (" : (settings.doDefault || optionType == 1 || boolType) ? " [arg] (" : optionType == 2 ? " [...] (" : " arg (";
     char argBuffer[4] = {0};
     uint32_t argBufferPos = 0;