finish

Author: guitargeek

roofit/roofitcore/inc/RooFit/CodegenContext.h

@@ -203,8 +203,6 @@ class CodegenContext {
    unsigned _indent = 0;
    /// @brief Index to get unique names for temporary variables.
    mutable int _tmpVarIdx = 0;
-   /// @brief A map to keep track of list names as assigned by addResult.
-   std::unordered_map<RooFit::UniqueId<RooAbsCollection>::Value_t, std::string> _listNames;
    std::vector<double> _xlArr;
    std::vector<std::string> _collectedFunctions;
 };

roofit/roofitcore/inc/RooFit/Detail/MathFuncs.h

@@ -812,7 +812,23 @@ double stepFunctionIntegral(double xmin, double xmax, std::size_t nBins, DoubleA
 
 } // namespace RooFit::Detail::MathFuncs
 
+inline void fillFromWorkspace(double *out, std::size_t n, double const *wksp, double const *idx)
+{
+   for (std::size_t i = 0; i < n; ++i) {
+      out[i] += wksp[static_cast<int>(idx[i])];
+   }
+}
+
 namespace clad::custom_derivatives {
+
+inline void fillFromWorkspace_pullback(double *, std::size_t n, double const *, double const *idx, double *d_out,
+                                std::size_t *, double *d_wksp, double *)
+{
+   for (std::size_t i = 0; i < n; ++i) {
+      d_wksp[static_cast<int>(idx[i])] += d_out[i];
+   }
+}
+
 namespace RooFit::Detail::MathFuncs {
 
 // Clad can't generate the pullback for binNumber because of the
@@ -826,6 +842,7 @@ void binNumber_pullback(Types...)
 }
 
 } // namespace RooFit::Detail::MathFuncs
+
 } // namespace clad::custom_derivatives
 
 #endif

roofit/roofitcore/src/RooFit/CodegenContext.cxx

@@ -220,25 +220,24 @@ std::string CodegenContext::buildArg(RooAbsCollection const &in, std::string con
       return "nullptr";
    }
 
-   auto it = _listNames.find(in.uniqueId().value());
-   if (it != _listNames.end())
-      return it->second;
-
    std::string savedName = getTmpVarName();
    bool canSaveOutside = true;
 
+   std::vector<double> indices;
+   indices.reserve(in.size());
+
    std::stringstream declStrm;
-   declStrm << arrayType << " " << savedName << "[]{";
+   declStrm << arrayType << " " << savedName << "[" << in.size() << "]{};\n";
    for (const auto arg : in) {
-      declStrm << getResult(*arg) << ",";
+      getResult(*arg); // fill the result cache
+      indices.push_back(_nodeNames.at(arg->namePtr()));
       canSaveOutside = canSaveOutside && isScopeIndependent(arg);
    }
-   declStrm.seekp(-1, declStrm.cur);
-   declStrm << "};\n";
+
+   declStrm << "fillFromWorkspace(" << savedName << ", " << in.size() << ", wksp, " << buildArg(indices) << ");\n";
 
    addToCodeBody(declStrm.str(), canSaveOutside);
 
-   _listNames.insert({in.uniqueId().value(), savedName});
    return savedName;
 }