special temporary code to be generalized (#753)

microsoft · Jan 9, 2020 · b46df24 · b46df24
1 parent b335cd3
commit b46df24
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/ClusterManager/dist_pod_template.py b/src/ClusterManager/dist_pod_template.py
@@ -76,11 +76,15 @@ def generate_pods(self, job):
         job.data_path = params["dataPath"]
         # TODO user's mountpoints first, but should after 'job_path'
         job.add_mountpoints(job.job_path_mountpoint())
-        job.add_mountpoints({"name": "home", "containerPath": "/home/{}".format(job.get_alias()), "hostPath": job.get_homefolder_hostpath(), "enabled": True})
+        # TODO: Remove VC name dependency
+        if params["vcName"] != "MMBellevue":
+            job.add_mountpoints({"name": "home", "containerPath": "/home/{}".format(job.get_alias()), "hostPath": job.get_homefolder_hostpath(), "enabled": True})
         if "mountpoints" in params:
             job.add_mountpoints(params["mountpoints"])
-        job.add_mountpoints(job.work_path_mountpoint())
-        job.add_mountpoints(job.data_path_mountpoint())
+        # TODO: Remove VC name dependency
+        if params["vcName"] != "MMBellevue":
+            job.add_mountpoints(job.work_path_mountpoint())
+            job.add_mountpoints(job.data_path_mountpoint())
         job.add_mountpoints(job.vc_custom_storage_mountpoints())
         job.add_mountpoints(job.vc_storage_mountpoints())
         job.add_mountpoints(job.infiniband_mountpoints())
@@ -103,10 +107,9 @@ def generate_pods(self, job):
         vc_node_hard_assignment = job.get_vc_node_hard_assignment()
         if isinstance(vc_node_hard_assignment, dict):
             vc = params["vcName"]
-            # Only consider GPU jobs
+            # TODO: Fix the case where CPU worker exists in a GPU pool
             if vc in vc_node_hard_assignment and \
-                    vc_node_hard_assignment[vc] is True and \
-                    params["resourcegpu"] > 0:
+                    vc_node_hard_assignment[vc] is True:
                 params["nodeSelector"]["vc"] = vc
             else:
                 params["nodeSelector"]["vc"] = "default"

diff --git a/src/ClusterManager/pod_template.py b/src/ClusterManager/pod_template.py
@@ -87,11 +87,15 @@ def generate_pods(self, job):
         job.data_path = params["dataPath"]
         # TODO user's mountpoints first, but should after 'job_path'
         job.add_mountpoints(job.job_path_mountpoint())
-        job.add_mountpoints({"name": "home", "containerPath": "/home/{}".format(job.get_alias()), "hostPath": job.get_homefolder_hostpath(), "enabled": True})
+        # TODO: Remove VC name dependency
+        if params["vcName"] != "MMBellevue":
+            job.add_mountpoints({"name": "home", "containerPath": "/home/{}".format(job.get_alias()), "hostPath": job.get_homefolder_hostpath(), "enabled": True})
         if "mountpoints" in params:
             job.add_mountpoints(params["mountpoints"])
-        job.add_mountpoints(job.work_path_mountpoint())
-        job.add_mountpoints(job.data_path_mountpoint())
+        # TODO: Remove VC name dependency
+        if params["vcName"] != "MMBellevue":
+            job.add_mountpoints(job.work_path_mountpoint())
+            job.add_mountpoints(job.data_path_mountpoint())
         job.add_mountpoints(job.vc_custom_storage_mountpoints())
         job.add_mountpoints(job.vc_storage_mountpoints())
         params["mountpoints"] = job.mountpoints
@@ -112,10 +116,9 @@ def generate_pods(self, job):
         vc_node_hard_assignment = job.get_vc_node_hard_assignment()
         if isinstance(vc_node_hard_assignment, dict):
             vc = params["vcName"]
-            # Only consider GPU jobs
+            # TODO: Fix the case where CPU worker exists in a GPU pool
             if vc in vc_node_hard_assignment and \
-                    vc_node_hard_assignment[vc] is True and \
-                    params["resourcegpu"] > 0:
+                    vc_node_hard_assignment[vc] is True:
                 params["nodeSelector"]["vc"] = vc
             else:
                 params["nodeSelector"]["vc"] = "default"