GPU: support fmt 10.1.1

Author: ktf

GPU/GPUTracking/Base/GPUReconstruction.cxx

@@ -1215,7 +1215,7 @@ bool GPUReconstruction::CheckInstanceAvailable(DeviceType type)
   } else if (type == DeviceType::OCL2) {
     return sLibOCL2->LoadLibrary() == 0;
   } else {
-    GPUError("Error: Invalid device type %u", type);
+    GPUError("Error: Invalid device type %u", (unsigned)type);
     return false;
   }
 }

GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx

@@ -180,13 +180,13 @@ void CalibdEdxTrackTopologyPol::writeToFile(TFile& outf, const char* name) const
 void CalibdEdxTrackTopologyPol::setFromContainer(const CalibdEdxTrackTopologyPolContainer& container)
 {
   if (2 * FFits != container.mCalibPols.size()) {
-    LOGP(warning, fmt::format("wrong number of polynomials stored! this {} container {}", 2 * FFits, container.mCalibPols.size()));
+    LOGP(warning, "wrong number of polynomials stored! this {} container {}", 2 * FFits, container.mCalibPols.size());
     return;
   }
 
   const auto nFacCont = container.mScalingFactorsqMax.size() + container.mScalingFactorsqTot.size();
   if (2 * FFits != nFacCont) {
-    LOGP(warning, fmt::format("wrong number of scaling factors stored! this {} container {}", 2 * FFits, nFacCont));
+    LOGP(warning, "wrong number of scaling factors stored! this {} container {}", 2 * FFits, nFacCont);
     return;
   }
 
@@ -214,7 +214,7 @@ void CalibdEdxTrackTopologyPol::loadFromFile(const char* fileName, const char* n
     setFromContainer(*polTmp);
     delete polTmp;
   } else {
-    LOGP(info, fmt::format("couldnt load object {} from input file", name));
+    LOGP(info, "couldnt load object {} from input file", name);
   }
 }
 

GPU/TPCFastTransformation/MultivariatePolynomial.h

@@ -178,7 +178,7 @@ void MultivariatePolynomial<Dim, Degree, InteractionOnly>::loadFromFile(TFile& i
     delete polTmp;
   } else {
 #ifndef GPUCA_ALIROOT_LIB
-    LOGP(info, fmt::format("couldnt load object {} from input file", name));
+    LOGP(info, "couldnt load object {} from input file", name);
 #endif
   }
 }
@@ -189,19 +189,19 @@ void MultivariatePolynomial<Dim, Degree, InteractionOnly>::setFromContainer(cons
   if constexpr (Dim > 0 && Degree > 0) {
     if (this->getDim() != container.mDim) {
 #ifndef GPUCA_ALIROOT_LIB
-      LOGP(info, fmt::format("wrong number of dimensions! this {} container {}", this->getDim(), container.mDim));
+      LOGP(info, "wrong number of dimensions! this {} container {}", this->getDim(), container.mDim);
 #endif
       return;
     }
     if (this->getDegree() != container.mDegree) {
 #ifndef GPUCA_ALIROOT_LIB
-      LOGP(info, fmt::format("wrong number of degrees! this {} container {}", this->getDegree(), container.mDegree));
+      LOGP(info, "wrong number of degrees! this {} container {}", this->getDegree(), container.mDegree);
 #endif
       return;
     }
     if (this->isInteractionOnly() != container.mInteractionOnly) {
 #ifndef GPUCA_ALIROOT_LIB
-      LOGP(info, fmt::format("InteractionOnly is set for this object to {}, but stored as {} in the container", this->isInteractionOnly(), container.mInteractionOnly));
+      LOGP(info, "InteractionOnly is set for this object to {}, but stored as {} in the container", this->isInteractionOnly(), container.mInteractionOnly);
 #endif
       return;
     }

GPU/TPCFastTransformation/MultivariatePolynomialHelper.cxx

@@ -26,7 +26,7 @@ using namespace GPUCA_NAMESPACE::gpu;
 void MultivariatePolynomialHelper<0, 0, false>::print() const
 {
 #ifndef GPUCA_NO_FMT
-  LOGP(info, getFormula().c_str());
+  LOGP(info, fmt::runtime(getFormula().c_str()));
 #endif
 }
 

GPU/TPCFastTransformation/NDPiecewisePolynomials.h

@@ -317,7 +317,7 @@ void NDPiecewisePolynomials<Dim, Degree, InteractionOnly>::loadFromFile(TFile& i
     delete gridTmp;
   } else {
 #ifndef GPUCA_ALIROOT_LIB
-    LOGP(info, fmt::format("couldnt load object {} from input file", name));
+    LOGP(info, "couldnt load object {} from input file", name);
 #endif
   }
 }
@@ -326,19 +326,19 @@ void NDPiecewisePolynomials<Dim, Degree, InteractionOnly>::setFromContainer(cons
 {
   if (Dim != container.mDim) {
 #ifndef GPUCA_ALIROOT_LIB
-    LOGP(info, fmt::format("wrong number of dimensions! this {} container {}", Dim, container.mDim));
+    LOGP(info, "wrong number of dimensions! this {} container {}", Dim, container.mDim);
 #endif
     return;
   }
   if (Degree != container.mDegree) {
 #ifndef GPUCA_ALIROOT_LIB
-    LOGP(info, fmt::format("wrong number of degrees! this {} container {}", Degree, container.mDegree));
+    LOGP(info, "wrong number of degrees! this {} container {}", Degree, container.mDegree);
 #endif
     return;
   }
   if (InteractionOnly != container.mInteractionOnly) {
 #ifndef GPUCA_ALIROOT_LIB
-    LOGP(info, fmt::format("InteractionOnly is set for this object to {}, but stored as {} in the container", InteractionOnly, container.mInteractionOnly));
+    LOGP(info, "InteractionOnly is set for this object to {}, but stored as {} in the container", InteractionOnly, container.mInteractionOnly);
 #endif
     return;
   }