Changed min/max workers to single field

Author: Maxusmusti

src/codeflare_sdk/cluster/cluster.py

@@ -83,7 +83,7 @@ def create_app_wrapper(self):
         min_memory = self.config.min_memory
         max_memory = self.config.max_memory
         gpu = self.config.gpu
-        workers = self.config.max_worker
+        workers = self.config.worker
         template = self.config.template
         image = self.config.image
         instascale = self.config.instascale
@@ -318,8 +318,7 @@ def from_k8_cluster_object(rc):
             name=rc["metadata"]["name"],
             namespace=rc["metadata"]["namespace"],
             machine_types=machine_types,
-            min_worker=rc["spec"]["workerGroupSpecs"][0]["minReplicas"],
-            max_worker=rc["spec"]["workerGroupSpecs"][0]["maxReplicas"],
+            worker=rc["spec"]["workerGroupSpecs"][0]["minReplicas"],
             min_cpus=rc["spec"]["workerGroupSpecs"][0]["template"]["spec"][
                 "containers"
             ][0]["resources"]["requests"]["cpu"],
@@ -545,8 +544,7 @@ def _map_to_ray_cluster(rc) -> Optional[RayCluster]:
         name=rc["metadata"]["name"],
         status=status,
         # for now we are not using autoscaling so same replicas is fine
-        min_workers=rc["spec"]["workerGroupSpecs"][0]["replicas"],
-        max_workers=rc["spec"]["workerGroupSpecs"][0]["replicas"],
+        workers=rc["spec"]["workerGroupSpecs"][0]["replicas"],
         worker_mem_max=rc["spec"]["workerGroupSpecs"][0]["template"]["spec"][
             "containers"
         ][0]["resources"]["limits"]["memory"],
@@ -575,8 +573,7 @@ def _copy_to_ray(cluster: Cluster) -> RayCluster:
     ray = RayCluster(
         name=cluster.config.name,
         status=cluster.status(print_to_console=False)[0],
-        min_workers=cluster.config.min_worker,
-        max_workers=cluster.config.max_worker,
+        workers=cluster.config.worker,
         worker_mem_min=cluster.config.min_memory,
         worker_mem_max=cluster.config.max_memory,
         worker_cpu=cluster.config.min_cpus,

src/codeflare_sdk/cluster/config.py

@@ -37,8 +37,7 @@ class ClusterConfiguration:
     machine_types: list = field(default_factory=list)  # ["m4.xlarge", "g4dn.xlarge"]
     min_cpus: int = 1
     max_cpus: int = 1
-    min_worker: int = 1
-    max_worker: int = 1
+    worker: int = 1
     min_memory: int = 2
     max_memory: int = 2
     gpu: int = 0

src/codeflare_sdk/cluster/model.py

@@ -67,8 +67,7 @@ class RayCluster:
 
     name: str
     status: RayClusterStatus
-    min_workers: int
-    max_workers: int
+    workers: int
     worker_mem_min: str
     worker_mem_max: str
     worker_cpu: int

src/codeflare_sdk/job/jobs.py

@@ -91,7 +91,7 @@ def __init__(
         self.workspace = workspace
 
     def _dry_run(self, cluster: "Cluster"):
-        j = f"{cluster.config.max_worker}x{max(cluster.config.gpu, 1)}"  # # of proc. = # of gpus
+        j = f"{cluster.config.worker}x{max(cluster.config.gpu, 1)}"  # # of proc. = # of gpus
         return torchx_runner.dryrun(
             app=ddp(
                 *self.script_args,

src/codeflare_sdk/utils/pretty_print.py

@@ -115,8 +115,7 @@ def print_clusters(clusters: List[RayCluster]):
         )
         name = cluster.name
         dashboard = cluster.dashboard
-        mincount = str(cluster.min_workers)
-        maxcount = str(cluster.max_workers)
+        workers = str(cluster.workers)
         memory = str(cluster.worker_mem_min) + "~" + str(cluster.worker_mem_max)
         cpu = str(cluster.worker_cpu)
         gpu = str(cluster.worker_gpu)
@@ -142,10 +141,10 @@ def print_clusters(clusters: List[RayCluster]):
         #'table1' to display the worker counts
         table1 = Table(box=None)
         table1.add_row()
-        table1.add_column("Min", style="cyan", no_wrap=True)
-        table1.add_column("Max", style="magenta")
+        # table1.add_column("Min", style="cyan", no_wrap=True)
+        table1.add_column("# Workers", style="magenta")
         table1.add_row()
-        table1.add_row(mincount, maxcount)
+        table1.add_row(workers)
         table1.add_row()
 
         #'table2' to display the worker resources