swift/t with flowcept

Author: rafaelfsilva

wfcommons/wfbench/translator/swift_t.py

@@ -77,7 +77,7 @@ def translate(self, output_folder: pathlib.Path) -> None:
         in_count = 0
         self.output_folder = output_folder
         self.cpu_benchmark = output_folder.joinpath("./bin/cpu-benchmark").absolute()
-        self.script = f"string fs = sprintf(flowcept_start, \"{self.workflow.workflow_id}\", \"{self.workflow.name}\");\nstring fss = python_persist(fs);\n\n" if self.workflow.workflow_id else ""
+        self.script = f"string fs = sprintf(flowcept_start, \"{self.workflow.workflow_id}\");\nstring fss = python_persist(fs);\n\n" if self.workflow.workflow_id else ""
         self.script += "string root_in_files[];\n"
 
         for task_name in self.root_task_names:
@@ -103,9 +103,8 @@ def translate(self, output_folder: pathlib.Path) -> None:
 
         # flowcept end
         if self.workflow.workflow_id:
-            self.script += f"int dep_{self.cmd_counter} = {self.last_file};\n" \
-                            f"string fc_stop = sprintf(flowcept_stop, dep_{self.cmd_counter});\n" \
-                            "python_persist(fc_stop);"
+            self.script += f"string fc = sprintf(flowcept, \"{self.workflow.workflow_id}\", \"{self.workflow.name}\", \"{self.last_file}\");\n" \
+                            "python_persist(fc);\n"
 
         run_workflow_code = self._merge_codelines("templates/swift_t_templates/workflow.swift", self.script)
 
@@ -169,7 +168,6 @@ def _add_tasks(self, category: str) -> None:
                 prefix = ""
 
                 for file in task.output_files:
-                    out_file = file.file_id
                     file_size = file.size
 
                 for file in task.input_files:
@@ -225,15 +223,14 @@ def _add_tasks(self, category: str) -> None:
                 f"  string of_{self.cmd_counter} = sprintf(\"0%s\", co_{self.cmd_counter});\n" \
                 f"  {category}__out[i] = string2int(of_{self.cmd_counter});\n" \
                 "}\n\n"
-            self.last_file = f"{category}__out[{num_tasks - 1}]"
-            
+            self.last_file = f"{self.output_folder.absolute()}/data/{category}_{num_tasks - 1}_output.txt"
         else:
+            self.last_file = f"{self.output_folder.absolute()}/data/{category}_0_output.txt"
             args = args.replace(
-                ", of", f", \"{self.output_folder.absolute()}/data/{category}_0_output.txt\"").replace("[i]", "[0]")
+                ", of", f", \"{self.last_file}\"").replace("[i]", "[0]")
             self.script += f"string cmd_{self.cmd_counter} = sprintf(command, \"{self.cpu_benchmark}\", \"{category}\", {args});\n" \
                 f"string co_{self.cmd_counter} = python_persist(cmd_{self.cmd_counter});\n" \
                 f"string of_{self.cmd_counter} = sprintf(\"0%s\", co_{self.cmd_counter});\n" \
                 f"{category}__out[0] = string2int(of_{self.cmd_counter});\n\n"
-            self.last_file = f"{category}__out[0]"
 
         self.cmd_counter += 1

wfcommons/wfbench/translator/templates/swift_t_templates/workflow.swift

@@ -4,24 +4,55 @@ import python;
 import string;
 import unix;
 
-global const string flowcept_start = 
+global const string flowcept_start =
 """
+import time
 workflow_id = "%s"
+time.sleep(30)
+""";
+
+global const string flowcept =
+"""
+import logging
+import os.path
+import subprocess
+import time
 from flowcept.flowcept_api.flowcept_controller import Flowcept
-flowcept_agent = Flowcept(workflow_id=workflow_id, workflow_name="%s", bundle_exec_id=workflow_id)
+
+logging.basicConfig(
+    level=logging.INFO,
+    format="[WfBench][%%(asctime)s][%%(levelname)s] %%(message)s",
+    datefmt="%%H:%%M:%%S",
+    handlers=[logging.StreamHandler()]
+)
+
+workflow_id = "%s"
+workflow_name = "%s"
+file_path = "%s"
+
+logging.info("Flowcept Starting")
+flowcept_agent = Flowcept(workflow_id=workflow_id, workflow_name=workflow_name, bundle_exec_id=workflow_id)
 
 try:
     flowcept_agent.start()
 except Exception:
     import traceback
     traceback.print_exc()
-""";
 
-global const string flowcept_stop = 
-"""
-import time
-dep = %i
-time.sleep(240)
+while not os.path.exists(file_path):
+    time.sleep(1)
+
+if os.path.isfile(file_path):
+    time.sleep(240)
+    try:
+        flowcept_agent.stop()
+    except Exception:
+        import traceback
+        traceback.print_exc()
+else:
+    raise ValueError(f"{file_path} is not a file!")
+
+logging.info("Flowcept Completed")
 """;
 
 string command = 
@@ -195,7 +226,6 @@ logging.info(f"Benchmark {task_name} completed!")
 if 'workflow_id':
     fc_task.end()
     fc.stop()
-    time.sleep(1)
 """;
 
 # Generated code goes here