Merge branch 'main' into build-args-nb-image

Author: KPostOffice

custom-nb-image/VERSION

@@ -1 +1 @@
-v0.4.4
+v0.4.5

docs/cluster/config.html

@@ -76,7 +76,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.config</code></h1>
     min_memory: int = 2
     max_memory: int = 2
     gpu: int = 0
-    template: str = f&#34;{dir}/templates/new-template.yaml&#34;
+    template: str = f&#34;{dir}/templates/base-template.yaml&#34;
     instascale: bool = False
     envs: dict = field(default_factory=dict)
     image: str = &#34;ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103&#34;</code></pre>
@@ -93,7 +93,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
 <dl>
 <dt id="codeflare_sdk.cluster.config.ClusterConfiguration"><code class="flex name class">
 <span>class <span class="ident">ClusterConfiguration</span></span>
-<span>(</span><span>name: str, namespace: str = None, head_info: list = &lt;factory&gt;, machine_types: list = &lt;factory&gt;, min_cpus: int = 1, max_cpus: int = 1, min_worker: int = 1, max_worker: int = 1, min_memory: int = 2, max_memory: int = 2, gpu: int = 0, template: str = '/Users/aasthana/go/src/github.com/codeflare-sdk/src/codeflare_sdk/templates/new-template.yaml', instascale: bool = False, envs: dict = &lt;factory&gt;, image: str = 'ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103')</span>
+<span>(</span><span>name: str, namespace: str = None, head_info: list = &lt;factory&gt;, machine_types: list = &lt;factory&gt;, min_cpus: int = 1, max_cpus: int = 1, min_worker: int = 1, max_worker: int = 1, min_memory: int = 2, max_memory: int = 2, gpu: int = 0, template: str = '/home/meyceoz/Documents/codeflare-sdk/src/codeflare_sdk/templates/base-template.yaml', instascale: bool = False, envs: dict = &lt;factory&gt;, image: str = 'ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103')</span>
 </code></dt>
 <dd>
 <div class="desc"><p>This dataclass is used to specify resource requirements and other details, and
@@ -119,7 +119,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
     min_memory: int = 2
     max_memory: int = 2
     gpu: int = 0
-    template: str = f&#34;{dir}/templates/new-template.yaml&#34;
+    template: str = f&#34;{dir}/templates/base-template.yaml&#34;
     instascale: bool = False
     envs: dict = field(default_factory=dict)
     image: str = &#34;ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103&#34;</code></pre>

docs/job/jobs.html

@@ -305,7 +305,7 @@ <h3>Methods</h3>
 </dd>
 <dt id="codeflare_sdk.job.jobs.DDPJobDefinition"><code class="flex name class">
 <span>class <span class="ident">DDPJobDefinition</span></span>
-<span>(</span><span>script: Optional[str] = None, m: Optional[str] = None, script_args: Optional[List[str]] = None, name: Optional[str] = None, cpu: Optional[int] = None, gpu: Optional[int] = None, memMB: Optional[int] = None, h: Optional[str] = None, j: Optional[str] = None, env: Optional[Dict[str, str]] = None, max_retries: int = 0, mounts: Optional[List[str]] = None, rdzv_port: int = 29500, rdzv_backend: str = None, scheduler_args: Optional[Dict[str, str]] = None, image: Optional[str] = None, workspace: Optional[str] = 'file:///Users/aasthana/go/src/github.com/codeflare-sdk')</span>
+<span>(</span><span>script: Optional[str] = None, m: Optional[str] = None, script_args: Optional[List[str]] = None, name: Optional[str] = None, cpu: Optional[int] = None, gpu: Optional[int] = None, memMB: Optional[int] = None, h: Optional[str] = None, j: Optional[str] = None, env: Optional[Dict[str, str]] = None, max_retries: int = 0, mounts: Optional[List[str]] = None, rdzv_port: int = 29500, rdzv_backend: str = None, scheduler_args: Optional[Dict[str, str]] = None, image: Optional[str] = None, workspace: Optional[str] = 'file:///home/meyceoz/Documents/codeflare-sdk')</span>
 </code></dt>
 <dd>
 <div class="desc"></div>

docs/utils/generate_yaml.html

@@ -216,7 +216,8 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
             update_image(spec, image)
             update_env(spec, env)
             if comp == head:
-                update_resources(spec, 2, 2, 8, 8, 0)
+                # TODO: Eventually add head node configuration outside of template
+                continue
             else:
                 update_resources(spec, min_cpu, max_cpu, min_memory, max_memory, gpu)
 
@@ -797,7 +798,8 @@ <h2 class="section-title" id="header-functions">Functions</h2>
             update_image(spec, image)
             update_env(spec, env)
             if comp == head:
-                update_resources(spec, 2, 2, 8, 8, 0)
+                # TODO: Eventually add head node configuration outside of template
+                continue
             else:
                 update_resources(spec, min_cpu, max_cpu, min_memory, max_memory, gpu)</code></pre>
 </details>

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codeflare-sdk"
-version = "0.4.4"
+version = "0.4.5"
 description = "Python SDK for codeflare client"
 
 license = "Apache-2.0"
@@ -24,7 +24,7 @@ python = "^3.7"
 openshift-client = "1.0.18"
 rich = "^12.5"
 ray = {version = "2.1.0", extras = ["default"]}
-kubernetes = "26.1.0"
+kubernetes = ">= 25.3.0, < 27"
 codeflare-torchx = "0.6.0.dev0"
 
 [tool.poetry.group.docs]

requirements.txt

@@ -1,5 +1,5 @@
 openshift-client==1.0.18
 rich==12.5.1
 ray[default]==2.1.0
-kubernetes==26.1.0
+kubernetes>=25.3.0,<27
 codeflare-torchx==0.6.0.dev0

src/codeflare_sdk/cluster/config.py

@@ -44,7 +44,7 @@ class ClusterConfiguration:
     min_memory: int = 2
     max_memory: int = 2
     gpu: int = 0
-    template: str = f"{dir}/templates/new-template.yaml"
+    template: str = f"{dir}/templates/base-template.yaml"
     instascale: bool = False
     envs: dict = field(default_factory=dict)
     image: str = "ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103"