[tmva][sofie] Improve handling of dynamic parameters in Session constructor

Store the list of Dim parameter names in  a vector to keep the order used to generate the code and have an order list of parameters in the Session constructor

Author: lmoneta

tmva/sofie/inc/TMVA/RModel.hxx

@@ -25,8 +25,8 @@ private:
    std::unordered_map<std::string, InitializedTensor> fInitializedTensors;
    std::unordered_map<std::string, TensorInfo> fIntermediateTensorInfos;
    std::unordered_map<std::string, DynamicTensorInfo> fDynamicTensorInfos;
-   std::unordered_map<std::string, std::string>
-      fShapeParams; // parameters defining the dynamic shape (e.g. batch size), store also its default value
+   std::unordered_map<std::string, std::string> fShapeParams; // parameters defining the dynamic shape (e.g. batch size), store also its default value
+   std::vector<std::string> fDimShapeNames; // parameter names used to define the shapes
    std::vector<std::string> fOutputTensorNames;
    std::vector<std::string> fInputTensorNames; // input tensor names using ONNX order
 

tmva/sofie/src/RModel.cxx

@@ -244,6 +244,8 @@ void RModel::AddDynamicTensor(std::string tensor_name, ETensorType type, std::ve
             // register it
             if (d.dim != size_t(-1)) {
               fShapeParams[d.param] = std::to_string(d.dim);
+              // add also in teh vector list (used to keep the order)
+              fDimShapeNames.push_back(d.param);
             }
          }
       }
@@ -446,8 +448,12 @@ void RModel::Initialize(const std::map<std::string, size_t> & inputParams, bool
       else {
          // store the found parametric shape parameters
          for (auto &d : input.second.shape) {
-            if (d.isParam)
-               fShapeParams[d.param] = std::to_string(d.dim);
+            if (d.isParam) {
+               if (fShapeParams.count(d.param) == 0) {
+                  fDimShapeNames.push_back(d.param);
+                  fShapeParams[d.param] = std::to_string(d.dim);
+               }
+            }
          }
       }
    }
@@ -864,10 +870,10 @@ void RModel::GenerateSessionCode()
       }
       // add initialization of shape parameters
       // assume all parameters are of type size_t
-      if (!fShapeParams.empty()) {
-         for (auto &p : fShapeParams) {
+      if (!fDimShapeNames.empty()) {
+         for (auto &p : fDimShapeNames) {
             fGC += ",\n";
-            fGC += "        size_t " + p.first + " = " + p.second;
+            fGC += "        size_t " + p + " = " + fShapeParams[p];
          }
       }
       fGC += ") {\n";