fixing bug on addWorkflow

Author: ksatzke

ManagementService/python/addWorkflow.py

@@ -41,7 +41,7 @@ def handle(value, sapi):
         wf["endpoints"] = []
         wf["gpu_usage"] = None
         if "gpu_usage" in workflow:
-            wf["gpu_usage"] = workflow["gpu_usage"]
+            wf["gpu_usage"] = str(workflow["gpu_usage"])
 
         wf["id"] = hashlib.md5(str(uuid.uuid4()).encode()).hexdigest()
 

deploy/helm/microfunctions/values.yaml

@@ -141,6 +141,7 @@ nginx:
   # Please use --set nginx.managementService to specify the FQDN that the service will get from your Knative setup
   # _helpers.tpl would default it to wf-mfn1-management.knix.example.com
   #managementService: wf-mfn1-management.knix.example.com
+  managementService: wf-mfn-management.default.192.168.1.162.xip.io:30336
   frontendImagePath: "/microfn/frontend"
   frontendImageTag: "latest"
   imagePath: "/microfn/nginx"

mfn_sdk/mfn_sdk/mfnclient.py

@@ -266,7 +266,7 @@ def action(self,action,data=None):
         r.raise_for_status()
         log.debug("%s: %s <- %s", self.user, action, r.text[:256]+(r.text[256:] and '...'))
         resp = r.json()
-        print(str(resp))
+        #print(str(resp))
         if resp.get('status','') != 'success':
             if resp.get('has_error',False):
                 raise Exception(f"MicroFunctions Error for action {action}: {resp['error_type']}")
@@ -450,7 +450,7 @@ def _get_state_names_and_resource(self, desired_state_type, wf_dict):
         return state_list
 
 
-    def add_workflow(self,name,filename=None, gpu_usage=None):
+    def add_workflow(self,name,filename=None, gpu_usage="None"):
         """ add a workflow
 
         returns an existing workflow if the name exists, registers a new workflow name if it doesn't exist

mfn_sdk/mfn_sdk/workflow.py

@@ -104,6 +104,7 @@ def modified(self):
     def status(self):
         data = self.client.action('getWorkflows',{'workflow':{'id':self.id}})
         self._status = data['workflow']['status']
+        #self._status == "undeployed"
         if self._status == "deployed":
             self._endpoints = data['workflow']['endpoints']
         else:
@@ -141,7 +142,7 @@ def json(self):
     def json(self,json):
         if json != self.json:
             self._json = json
-            print ("uploaded workflow JOSN"+ str( json))
+            #print ("uploaded workflow JSON"+ str( json))
             self.client.action('uploadWorkflowJSON',{'workflow':{'id':self.id,'json':base64.b64encode(self._json.encode()).decode()}})
 
 

tests/asl_DLIB/test.py

@@ -34,6 +34,6 @@ def test_dlib(self):
 
         testtuplelist =[(inp1, res1)]
 
-        test = MFNTest(test_name = "Dlib_Test", num_gpu = 1)
+        test = MFNTest(test_name = "Dlib_Test", gpu_usage = "1")
         test.exec_tests(testtuplelist)
 

tests/mfn_test_utils.py

@@ -43,7 +43,7 @@ class MfnAppTextFormat():
 mfntestfailed = MfnAppTextFormat.STYLE_BOLD + MfnAppTextFormat.COLOR_RED + 'FAILED' + MfnAppTextFormat.END + MfnAppTextFormat.END
 
 class MFNTest():
-    def __init__(self, test_name=None, timeout=None, workflow_filename=None, new_user=False, delete_user=False, num_gpu=None):
+    def __init__(self, test_name=None, timeout=None, workflow_filename=None, new_user=False, delete_user=False, gpu_usage=None):
 
         self._settings = self._get_settings()
 
@@ -84,17 +84,9 @@ def __init__(self, test_name=None, timeout=None, workflow_filename=None, new_use
         if timeout is not None:
             self._settings["timeout"] = timeout
 
-        """
-        else:
-            #self._gpu_usage = None
-            #self._workflow_description['num_gpu'] = self._settings["num_gpu"]
-            #print("Workflow_description:" + str(self._workflow_description))
-        
-        self.gpu_usage = 0 # hardcoded for now 
-        if num_gpu is not None:
-            self._settings["num_gpu"] = num_gpu
-            self._gpu_usage = self._settings["num_gpu"]
-        """
+        if gpu_usage is not None:
+            self._settings["gpu_usage"] = gpu_usage
+            #self._gpu_usage = self._settings["num_gpu"]
 
         self._log_clear_timestamp = int(time.time() * 1000.0 * 1000.0)
 
@@ -105,7 +97,7 @@ def __init__(self, test_name=None, timeout=None, workflow_filename=None, new_use
         self._workflow_resources = []
 
         self.upload_workflow()
-        self.deploy_workflow()
+        self.deploy_workflow() # gpu usage
 
     def _get_json_file(self, filename):
         json_data = {}
@@ -127,7 +119,7 @@ def _get_settings(self):
 
         # Defaults
         settings.setdefault("timeout", 60)
-        settings.setdefault("num_gpu", 0)
+        settings.setdefault("gpu_usage", "None")
 
         return settings
 
@@ -204,7 +196,7 @@ def _get_resource_info_map(self, workflow_description=None, resource_info_map=No
                         resource_info["resource_req_filename"] = "requirements/" + resource_ref + "_requirements.txt"
                         resource_info["resource_env_filename"] = "environment_variables/" + resource_ref + "_environment_variables.txt"
                         resource_info_map[resource_ref] = resource_info
-                        resource_info_map[resource_ref]['num_gpu'] = self._settings['num_gpu']
+                        #resource_info_map[resource_ref]['num_gpu'] = self._settings['num_gpu']
                         #resource_info_map['num_gpu'] = self._settings['num_gpu']
                         #print("resource_info_map: " + json.dumps(resource_info_map))
 
@@ -220,7 +212,7 @@ def _get_resource_info_map(self, workflow_description=None, resource_info_map=No
                         resource_info["resource_req_filename"] = "requirements/" + resource_name + "_requirements.txt"
                         resource_info["resource_env_filename"] = "environment_variables/" + resource_name + "_environment_variables.txt"
                         resource_info_map[resource_name] = resource_info
-                        resource_info_map[resource_name]['num_gpu'] = self._settings['num_gpu']
+                        #resource_info_map[resource_name]['num_gpu'] = self._settings['num_gpu']
                         #resource_info_map['num_gpu'] = self._settings['num_gpu']
                         #print("resource_info_map: " + json.dumps(resource_info_map))
 
@@ -318,16 +310,13 @@ def get_deployment_error(self):
 
     def deploy_workflow(self):
         try:
-            wf = self._client.add_workflow(self._workflow_name)
+            gpu_usage=self._settings["gpu_usage"]
+            wf = self._client.add_workflow(self._workflow_name, None, gpu_usage)
+            #print ("retuned from add_workflow: " + str(wf))
             wf.json = json.dumps(self._workflow_description)
-            #print (wf.json)
-            #wf._use_gpu=self._settings["num_gpu"]
-            wf._gpu_usage = "teststringgpu" # _use_gpu=self._settings["num_gpu"]
-            wf.deploy(self._settings["timeout"]) #, num_gpu=self._settings['num_gpu'])
+            wf.deploy(self._settings["timeout"]) 
             self._workflow = wf
-            #print ("WF: " + str(wf._use_gpu))
-            #print ("WF1: " + str(wf.gpu_usage))
-            #wf.gpu_usage = "teststring"
+            print ("transformed wf with gpu usage" + str(wf.gpu_usage))
             if self._workflow.status != "failed":
                 print("MFN workflow " + self._workflow_name + " deployed.")
             else: