Merge 7c8e343 into sapling-pr-archive-ktf

Author: ktf

.github/workflows/reports.yml

@@ -17,12 +17,12 @@ jobs:
     if: github.repository == 'AliceO2Group/AliceO2'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.10
       uses: actions/setup-python@v5
       with:
         python-version: '3.10'
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       name: Configure pip caching
       with:
         path: ~/.cache/pip

CCDB/include/CCDB/CcdbApi.h

@@ -388,7 +388,7 @@ class CcdbApi //: public DatabaseInterface
   static bool removeSemaphore(std::string const& name, bool remove = false);
   static void removeLeakingSemaphores(std::string const& basedir, bool remove = false);
 
-  void loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders = nullptr) const;
+  void loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders = nullptr, bool fetchLocalMetaData = true) const;
   void loadFileToMemory(o2::pmr::vector<char>& dest, std::string const& path,
                         std::map<std::string, std::string> const& metadata, long timestamp,
                         std::map<std::string, std::string>* headers, std::string const& etag,

CCDB/src/CcdbApi.cxx

@@ -1989,7 +1989,7 @@ bool CcdbApi::loadLocalContentToMemory(o2::pmr::vector<char>& dest, std::string&
 {
   if (url.find("alien:/", 0) != std::string::npos) {
     std::map<std::string, std::string> localHeaders;
-    loadFileToMemory(dest, url, &localHeaders);
+    loadFileToMemory(dest, url, &localHeaders, false);
     auto it = localHeaders.find("Error");
     if (it != localHeaders.end() && it->second == "An error occurred during retrieval") {
       return false;
@@ -2001,7 +2001,7 @@ bool CcdbApi::loadLocalContentToMemory(o2::pmr::vector<char>& dest, std::string&
     std::string path = url.substr(7);
     if (std::filesystem::exists(path)) {
       std::map<std::string, std::string> localHeaders;
-      loadFileToMemory(dest, url, &localHeaders);
+      loadFileToMemory(dest, url, &localHeaders, o2::utils::Str::endsWith(path, ".root"));
       auto it = localHeaders.find("Error");
       if (it != localHeaders.end() && it->second == "An error occurred during retrieval") {
         return false;
@@ -2013,7 +2013,7 @@ bool CcdbApi::loadLocalContentToMemory(o2::pmr::vector<char>& dest, std::string&
   return false;
 }
 
-void CcdbApi::loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders) const
+void CcdbApi::loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& path, std::map<std::string, std::string>* localHeaders, bool fetchLocalMetaData) const
 {
   // Read file to memory as vector. For special case of the locally cached file retriev metadata stored directly in the file
   constexpr size_t MaxCopySize = 0x1L << 25;
@@ -2061,7 +2061,7 @@ void CcdbApi::loadFileToMemory(o2::pmr::vector<char>& dest, const std::string& p
     totalread += nread;
   } while (nread == (long)MaxCopySize);
 
-  if (localHeaders) {
+  if (localHeaders && fetchLocalMetaData) {
     TMemFile memFile("name", const_cast<char*>(dest.data()), dest.size(), "READ");
     auto storedmeta = (std::map<std::string, std::string>*)extractFromTFile(memFile, TClass::GetClass("std::map<std::string, std::string>"), CCDBMETA_ENTRY);
     if (storedmeta) {

Detectors/ITSMFT/ITS/tracking/src/TrackingInterface.cxx

@@ -120,17 +120,15 @@ void ITSTrackingInterface::initialise()
   for (auto& params : trackParams) {
     params.CorrType = o2::base::PropagatorImpl<float>::MatCorrType::USEMatCorrLUT;
   }
-
   // adjust pT settings to actual mag. field
   for (size_t ip = 0; ip < trackParams.size(); ip++) {
     auto& param = trackParams[ip];
+    param.TrackletMinPt *= bFactor;
     for (int ilg = trackConf.MaxTrackLenght; ilg >= trackConf.MinTrackLenght; ilg--) {
       int lslot = trackConf.MaxTrackLenght - ilg;
       param.MinPt[lslot] *= bFactor;
-      param.TrackletMinPt *= bFactor;
     }
   }
-
   mTracker->setParameters(trackParams);
   mVertexer->setParameters(vertParams);
 }

Framework/AnalysisSupport/src/DataInputDirector.cxx

@@ -387,18 +387,53 @@ int DataInputDescriptor::findDFNumber(int file, std::string dfName)
   return it - dfList.begin();
 }
 
+struct CalculateDelta {
+  CalculateDelta(uint64_t& target)
+    : mTarget(target)
+  {
+    start = uv_hrtime();
+  }
+  ~CalculateDelta()
+  {
+    if (!active) {
+      return;
+    }
+    O2_SIGNPOST_ACTION(reader_memory_dump, [](void*) {
+      void (*dump_)(const char*);
+      if (void* sym = dlsym(nullptr, "igprof_dump_now")) {
+        dump_ = __extension__(void (*)(const char*)) sym;
+        if (dump_) {
+          std::string filename = fmt::format("reader-memory-dump-{}.gz", uv_hrtime());
+          dump_(filename.c_str());
+        }
+      }
+    });
+    mTarget += (uv_hrtime() - start);
+  }
+
+  void deactivate() {
+    active = false;
+  }
+
+  bool active = true;
+  uint64_t& mTarget;
+  uint64_t start;
+  uint64_t stop;
+};
+
 bool DataInputDescriptor::readTree(DataAllocator& outputs, header::DataHeader dh, int counter, int numTF, std::string treename, size_t& totalSizeCompressed, size_t& totalSizeUncompressed)
 {
-  auto ioStart = uv_hrtime();
-
+  CalculateDelta t(mIOTime);
   auto folder = getFileFolder(counter, numTF);
   if (!folder.filesystem()) {
+    t.deactivate();
     return false;
   }
 
   auto rootFS = std::dynamic_pointer_cast<TFileFileSystem>(folder.filesystem());
 
   if (!rootFS) {
+    t.deactivate();
     throw std::runtime_error(fmt::format(R"(Not a TFile filesystem!)"));
   }
   // FIXME: Ugly. We should detect the format from the treename, good enough for now.
@@ -420,6 +455,7 @@ bool DataInputDescriptor::readTree(DataAllocator& outputs, header::DataHeader dh
   // FIXME: we should distinguish between an actually missing object and one which has a non compatible
   // format.
   if (!format) {
+    t.deactivate();
     LOGP(debug, "Could not find tree {}. Trying in parent file.", fullpath.path());
     auto parentFile = getParentFile(counter, numTF, treename);
     if (parentFile != nullptr) {
@@ -460,19 +496,6 @@ bool DataInputDescriptor::readTree(DataAllocator& outputs, header::DataHeader dh
   f2b->setLabel(treename.c_str());
   f2b->fill(datasetSchema, format);
 
-  mIOTime += (uv_hrtime() - ioStart);
-
-  O2_SIGNPOST_ACTION(reader_memory_dump, [](void*) {
-    void (*dump_)(const char*);
-    if (void* sym = dlsym(nullptr, "igprof_dump_now")) {
-      dump_ = __extension__(void (*)(const char*)) sym;
-      if (dump_) {
-        std::string filename = fmt::format("reader-memory-dump-{}.gz", uv_hrtime());
-        dump_(filename.c_str());
-      }
-    }
-  });
-
   return true;
 }
 
@@ -820,7 +843,8 @@ bool DataInputDirector::readTree(DataAllocator& outputs, header::DataHeader dh,
     treename = aod::datamodel::getTreeName(dh);
   }
 
-  return didesc->readTree(outputs, dh, counter, numTF, treename, totalSizeCompressed, totalSizeUncompressed);
+  auto result = didesc->readTree(outputs, dh, counter, numTF, treename, totalSizeCompressed, totalSizeUncompressed);
+  return result;
 }
 
 void DataInputDirector::closeInputFiles()

GPU/Common/GPUCommonMath.h

@@ -82,6 +82,7 @@ class GPUCommonMath
   GPUd() static int32_t Float2IntRn(float x);
   GPUd() static float Modf(float x, float y);
   GPUd() static bool Finite(float x);
+  GPUd() static bool IsNaN(float x);
   GPUd() static uint32_t Clz(uint32_t val);
   GPUd() static uint32_t Popcount(uint32_t val);
 
@@ -224,7 +225,8 @@ GPUdi() float GPUCommonMath::Floor(float x) { return CHOICE(floorf(x), floorf(x)
 #ifdef GPUCA_NO_FAST_MATH
 GPUdi() float GPUCommonMath::Round(float x) { return CHOICE(roundf(x), roundf(x), round(x)); }
 GPUdi() int32_t GPUCommonMath::Float2IntRn(float x) { return (int32_t)Round(x); }
-GPUdi() bool GPUCommonMath::Finite(float x) { return CHOICE(std::isfinite(x), isfinite(x), true); }
+GPUdi() bool GPUCommonMath::Finite(float x) { return CHOICE(std::isfinite(x), isfinite(x), true); } // Fixme: fix these 2 for OpenCL
+GPUdi() bool GPUCommonMath::IsNaN(float x) { return CHOICE(std::isnan(x), isnan(x), false); }
 GPUhdi() float GPUCommonMath::Sqrt(float x) { return CHOICE(sqrtf(x), (float)sqrt((double)x), sqrt(x)); }
 GPUdi() float GPUCommonMath::ATan(float x) { return CHOICE((float)atan((double)x), (float)atan((double)x), atan(x)); }
 GPUhdi() float GPUCommonMath::ATan2(float y, float x) { return CHOICE((float)atan2((double)y, (double)x), (float)atan2((double)y, (double)x), atan2(y, x)); }

GPU/GPUTracking/ITS/GPUITSFitterKernels.cxx

@@ -22,7 +22,7 @@
 #include "ITStracking/Cell.h"
 #include "CommonConstants/MathConstants.h"
 
-#ifdef CA_DEBUG
+#if defined(CA_DEBUG) && !defined(GPUCA_GPUCODE_DEVICE)
 #include <cstdio>
 #endif
 

prodtests/full-system-test/dpl-workflow.sh

@@ -259,7 +259,8 @@ if [[ $GPUTYPE == "HIP" ]]; then
     TIMESLICEOFFSET=$(($GPU_FIRST_ID + ($NUMAGPUIDS != 0 ? ($NGPUS * $NUMAID) : 0)))
     GPU_CONFIG+=" --environment \"ROCR_VISIBLE_DEVICES={timeslice${TIMESLICEOFFSET}}\""
   fi
-  [[ "${EPN_NODE_MI100:-}" != "1" ]] && export HSA_NO_SCRATCH_RECLAIM=1
+  [[ ${EPN_NODE_MI100:-} != "1" ]] && export HSA_NO_SCRATCH_RECLAIM=1
+  [[ $EPNSYNCMODE == 1 && ${EPN_NODE_MI100:-} == "1" ]] && GPU_CONFIG_KEY+="GPU_proc.serializeGPU=3;"
   #export HSA_TOOLS_LIB=/opt/rocm/lib/librocm-debug-agent.so.2
 else
   GPU_CONFIG_KEY+="GPU_proc.deviceNum=-2;"