[tmva][sofie] Apply fixes after rebaseing to master olha profiler branch

Fix also a compiler warning due to the name of ROperator.

Author: lmoneta

tmva/sofie/inc/TMVA/ROperator.hxx

@@ -39,8 +39,8 @@ public:
    //virtual void Forward_blas() = 0;
    virtual ~ROperator(){}
 
-   std::string name = "UnnamedOperator";
-   const std::string &GetOperatorName() { return name; };
+   std::string fName = "UnnamedOperator";
+   const std::string & Name() const { return fName; };
 
 protected:
 

tmva/sofie/src/RModelProfiler.cxx

@@ -142,14 +142,14 @@ void RModelProfiler::Generate()
 
    for (size_t op_idx = 0; op_idx < fModel.fOperators.size(); ++op_idx) {
       const auto& op = fModel.fOperators[op_idx];
-      gc += "   // -- Profiling for operator " + op->name + " --\n";
+      gc += "   // -- Profiling for operator " + op->Name() + " --\n";
       gc += "   tp_start = std::chrono::steady_clock::now();\n\n";
 
       // Add the actual operator inference code
       gc += op->Generate(std::to_string(op_idx));
 
       // Add the code to stop the timer and store the result
-      gc += "\n   fProfilingResults[\"" + op->name + "\"].push_back(\n";
+      gc += "\n   fProfilingResults[\"" + op->Name() + "\"].push_back(\n";
       gc += "      std::chrono::duration_cast<std::chrono::duration<double, std::micro>>(\n";
       gc += "         std::chrono::steady_clock::now() - tp_start).count());\n\n";
    }
@@ -159,7 +159,7 @@ void RModelProfiler::Generate()
    for (std::string const &name : fModel.GetOutputTensorNames()) {
       bool isIntermediate = fModel.fIntermediateTensorInfos.count(name) > 0;
       std::string n = isIntermediate ? std::to_string(ConvertShapeToLength(fModel.GetTensorShape(name)))
-                                     : ConvertDynamicShapeToLength(fModel.GetDynamicTensorShape(name));
+                                     : ConvertDimShapeToLength(fModel.GetDynamicTensorShape(name));
       gc += "   FillOutput(tensor_" + name + ", output_tensor_" + name + ", " + n + ");\n";
    }
 

tmva/sofie_parsers/src/RModelParser_ONNX.cxx

@@ -800,9 +800,9 @@ void RModelParser_ONNX::ParseONNXGraph(RModel & rmodel, const onnx::GraphProto &
          continue;
       }
       const auto &nodeproto = graph.node(nodesOrder[i]);
-      op->name = nodeproto.name();
-      if (op->name.empty()) {
-          op->name = op_type + "_" + std::to_string(i);
+      op->fName = nodeproto.name();
+      if (op->fName.empty()) {
+          op->fName = op_type + "_" + std::to_string(i);
       }
 
       rmodel.AddOperator(std::move(op), node_order_exec++);