JSON workflow creation with value caching for speed

Author: henricasanova

wrench/file.py

@@ -24,7 +24,7 @@ class File(SimulationItem):
     WRENCH File class
     """
 
-    def __init__(self, simulation: Simulation, name: str) -> None:
+    def __init__(self, simulation: Simulation, name: str, size: number = None) -> None:
         """
         Constructor
 
@@ -34,7 +34,7 @@ def __init__(self, simulation: Simulation, name: str) -> None:
         :type name: str
         """
         super().__init__(simulation, name)
-        self.size = None
+        self.size = size
 
     def get_size(self) -> int:
         """

wrench/simulation.py

@@ -7,6 +7,7 @@
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 
+import sys
 import atexit
 import json
 import pathlib
@@ -262,7 +263,7 @@ def add_file(self, name: str, size: int) -> File:
 
         response = r.json()
         if response["wrench_api_request_success"]:
-            new_file = File(self, name)
+            new_file = File(self, name, size)
             self.files[name] = new_file
             return new_file
         raise WRENCHException(response["failure_cause"])
@@ -509,20 +510,35 @@ def create_workflow_from_json(self, json_object: json, reference_flop_rate: str,
                 "ignore_avg_cpu": ignore_avg_cpu,
                 "show_warnings": show_warnings}
 
+        sys.stderr.write("HERE\n")
+
         r = self.__send_request_to_daemon(requests.post, f"{self.daemon_url}/{self.simid}/createWorkflowFromJSON",
                                           json_data=data)
         response = r.json()
 
         # Create the workflow
         workflow = Workflow(self, response["workflow_name"])
 
+        sys.stderr.write("CREATING TASKS\n")
         # Create the tasks
-        for task_name in response["tasks"]:
-            workflow.tasks[task_name] = Task(self, workflow, task_name)
+        for task_spec in response["tasks"]:
+            task_name = task_spec["name"]
+            task_flops = task_spec["flops"]
+            task_min_num_cores = task_spec["min_num_cores"]
+            task_max_num_cores = task_spec["max_num_cores"]
+            task_memory = task_spec["memory"]
+            workflow.tasks[task_name] = Task(self, workflow, task_name, task_flops, task_min_num_cores, task_max_num_cores, task_memory)
+
 
         # Create the files
-        for file_name in response["files"]:
-            self.files[file_name] = File(self, file_name)
+        sys.stderr.write("CREATING FILES\n")
+        print(response["files"])
+        for file_spec in response["files"]:
+            file_name = file_spec["name"]
+            file_size = file_spec["size"]
+            sys.stderr.write(f"---> {file_name}: {file_size}\n")
+            self.files[file_name] = File(self, file_name, file_size)
+        sys.stderr.write("CREATED FILES\n")
 
         return workflow
 
@@ -1572,7 +1588,7 @@ def _workflow_create_task(self, workflow: Workflow, name: str, flops: float, min
 
         response = r.json()
         if response["wrench_api_request_success"]:
-            workflow.tasks[name] = Task(self, workflow, name)
+            workflow.tasks[name] = Task(self, workflow, name, flops, min_num_cores, max_num_cores, memory)
             return workflow.tasks[name]
         raise WRENCHException(response["failure_cause"])
 

wrench/task.py

@@ -28,7 +28,11 @@ class Task(SimulationItem):
     WRENCH Task class
     """
 
-    def __init__(self, simulation: Simulation, workflow: Workflow, name: str) -> None:
+    def __init__(self, simulation: Simulation, workflow: Workflow, name: str,
+                 flops: flops = None,
+                 min_num_cores:  number = None,
+                 max_num_cores: number = None,
+                 memory: number = None) -> None:
         """
         Constructor
         :param simulation: simulation object
@@ -40,10 +44,10 @@ def __init__(self, simulation: Simulation, workflow: Workflow, name: str) -> Non
         """
         self.workflow = workflow
         super().__init__(simulation, name)
-        self.flops = None
-        self.min_num_cores = None
-        self.max_num_cores = None
-        self.memory = None
+        self.flops = flops
+        self.min_num_cores = min_num_cores
+        self.max_num_cores = max_num_cores
+        self.memory = memory
         self.input_files = None
         self.output_files = None