fixing syst shifts

KIT-CMS · Nov 15, 2023 · 524565d · 524565d
1 parent a804bb7
commit 524565d
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/src/ml.cxx b/src/ml.cxx
@@ -156,6 +156,7 @@ namespace sofie {
 
     std::string modelHeaderFile = modelName + std::string(".hxx");
 
+    if (!std::filesystem::exists(modelHeaderFile)) {
   Logger::get("SOFIEGenerator")
     ->debug("generating model code...");
   model.Generate();
@@ -171,9 +172,11 @@ namespace sofie {
   Logger::get("SOFIEGenerator")
     ->debug("compiling model code...");
   CompileModelForRDF(modelHeaderFile, input_vec.size());
-
-  Logger::get("SOFIEGenerator")
-    ->debug("evaluating model code...");
+    }
+    else {
+      Logger::get("SOFIEGenerator")
+	->debug("model already compiled, skipping");
+    }
 
   std::string sofie_func_str = "sofie_functor(rdfslot_, ";
   sofie_func_str += input_vec[0];
@@ -199,7 +202,11 @@ ROOT::RDF::RNode KerasEvaluate(ROOT::RDF::RNode df,
   Logger::get("KerasEvaluate")
     ->debug("finished loading model");
 
-  auto df2 = df.Define(outputname, SOFIEGenerator(input_vec, model, modelFilePath));
+  auto eval_func = SOFIEGenerator(input_vec, model, modelFilePath);
+  Logger::get("KerasEvaluate")
+    ->debug("evaluating model code...");
+
+  auto df2 = df.Define(outputname, eval_func);
 
   return df2;
 
@@ -223,7 +230,11 @@ ROOT::RDF::RNode PyTorchEvaluate(ROOT::RDF::RNode df,
   Logger::get("PyTorchEvaluate")
     ->debug("finished loading model");
 
-  auto df2 = df.Define(outputname, SOFIEGenerator(input_vec, model, modelFilePath));
+  auto eval_func = SOFIEGenerator(input_vec, model, modelFilePath);
+  Logger::get("PyTorchEvaluate")
+    ->debug("evaluating model code...");
+
+  auto df2 = df.Define(outputname, eval_func);
 
   return df2;
 
@@ -245,7 +256,11 @@ ROOT::RDF::RNode PyTorchEvaluate(ROOT::RDF::RNode df,
 //   Logger::get("ONNXEvaluate")
 //     ->debug("finished loading model");
 
-//   auto df2 = df.Define(outputname, SOFIEGenerator(input_vec, model, modelFilePath));
+//   auto eval_func = SOFIEGenerator(input_vec, model, modelFilePath);
+//   Logger::get("ONNXEvaluate")
+//     ->debug("evaluating model code...");
+
+//   auto df2 = df.Define(outputname, eval_func);
 
 //   return df2;