Feat: movde error names to GPUErrors.h

Author: ariedel-cern

Detectors/TPC/qc/include/TPCQC/GPUErrorQA.h

@@ -54,15 +54,15 @@ class GPUErrorQA
   void resetHistograms();
 
   /// return histograms
-  const std::unordered_map<std::string, std::unique_ptr<TH1>>& getMapHist() const { return mMapHist; };
+  const std::unordered_map<std::string, std::unique_ptr<TH1>>& getMapHist() const { return mMapHist; }
 
   /// Dump results to a file
   void dumpToFile(std::string filename);
 
  private:
   std::unordered_map<std::string, std::unique_ptr<TH1>> mMapHist;
 
-  ClassDefNV(GPUErrorQA, 1);
+  ClassDefNV(GPUErrorQA, 2);
 };
 } // namespace o2::tpc::qc
 

Detectors/TPC/qc/src/GPUErrorQA.cxx

@@ -17,7 +17,7 @@
 
 // o2 includes
 #include "TPCQC/GPUErrorQA.h"
-#include "GPUDefMacros.h"
+#include "GPUErrors.h"
 
 ClassImp(o2::tpc::qc::GPUErrorQA);
 
@@ -28,21 +28,13 @@ void GPUErrorQA::initializeHistograms()
 {
   TH1::AddDirectory(false);
 
-  // get gpu error names
-  // copied from GPUErrors.h
-  static std::unordered_map<uint32_t, const char*> errorNames = {
-#define GPUCA_ERROR_CODE(num, name, ...) {num, GPUCA_M_STR(name)},
-#include "GPUErrorCodes.h"
-#undef GPUCA_ERROR_CODE
-  };
-
   // 1D histogram counting all reported errors
-  mMapHist["ErrorCounter"] = std::make_unique<TH1I>("ErrorCounter", "ErrorCounter", errorNames.size(), -0.5, errorNames.size() - 0.5);
+  mMapHist["ErrorCounter"] = std::make_unique<TH1I>("ErrorCounter", "ErrorCounter", o2::gpu::errorNames.size(), -0.5, o2::gpu::errorNames.size() - 0.5);
   mMapHist["ErrorCounter"]->GetXaxis()->SetTitle("Error Codes");
   mMapHist["ErrorCounter"]->GetYaxis()->SetTitle("Entries");
   // for convienence, label each bin with the error name
   for (size_t bin = 1; bin < mMapHist["ErrorCounter"]->GetNbinsX(); bin++) {
-    auto const& it = errorNames.find(bin);
+    auto const& it = o2::gpu::errorNames.find(bin);
     mMapHist["ErrorCounter"]->GetXaxis()->SetBinLabel(bin, it->second);
   }
 }
@@ -68,7 +60,7 @@ void GPUErrorQA::dumpToFile(const std::string filename)
   auto f = std::unique_ptr<TFile>(TFile::Open(filename.data(), "recreate"));
   TObjArray arr;
   arr.SetName("GPUErrorQA_Hists");
-  for (const auto& [name, hist] : mMapHist) {
+  for ([[maybe_unused]] const auto& [name, hist] : mMapHist) {
     arr.Add(hist.get());
   }
   arr.Write(arr.GetName(), TObject::kSingleKey);

GPU/GPUTracking/Global/GPUErrors.cxx

@@ -36,7 +36,6 @@ GPUd() void GPUErrors::raiseError(uint32_t code, uint32_t param1, uint32_t param
 #ifndef GPUCA_GPUCODE
 
 #include <cstring>
-#include <unordered_map>
 
 uint32_t GPUErrors::getMaxErrors()
 {
@@ -48,12 +47,6 @@ void GPUErrors::clear()
   memset(mErrors, 0, GPUCA_MAX_ERRORS * sizeof(*mErrors));
 }
 
-static std::unordered_map<uint32_t, const char*> errorNames = {
-#define GPUCA_ERROR_CODE(num, name, ...) {num, GPUCA_M_STR(name)},
-#include "GPUErrorCodes.h"
-#undef GPUCA_ERROR_CODE
-};
-
 bool GPUErrors::printErrors(bool silent, uint64_t mask)
 {
   bool retVal = 0;

GPU/GPUTracking/Global/GPUErrors.h

@@ -16,10 +16,18 @@
 #define GPUERRORS_H
 
 #include "GPUCommonDef.h"
+#include "GPUDefMacros.h"
+#include <unordered_map>
 
 namespace o2::gpu
 {
 
+static std::unordered_map<uint32_t, const char*> errorNames = {
+#define GPUCA_ERROR_CODE(num, name, ...) {num, GPUCA_M_STR(name)},
+#include "GPUErrorCodes.h"
+#undef GPUCA_ERROR_CODE
+};
+
 class GPUErrors
 {
  public: