Skip to content

Commit a3e4f0a

Browse files
tedhtchangtedhtchang
committed
fix merge conflict
2 parents a762019 + ac02248 commit a3e4f0a

File tree

15 files changed

+223
-596
lines changed

15 files changed

+223
-596
lines changed

Diff for: ‎custom-nb-image/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
FROM quay.io/opendatahub/notebooks:jupyter-minimal-ubi8-python-3.8-4c8f26e
16-
1716
# Install: torch (v1.12), ray (v2.1.0) and others
1817

1918
COPY requirements.txt requirements.txt
@@ -23,7 +22,8 @@ RUN pip install -r requirements.txt
2322
RUN pip uninstall pickle5 -y
2423

2524
# Install codeflare-sdk and other libraries
26-
RUN pip install codeflare-sdk==0.4.4 \
25+
ARG SDK_VERSION=0.*
26+
RUN pip install codeflare-sdk==${SDK_VERSION} \
2727
datasets==2.6.1 \
2828
transformers==4.23.1 \
2929
evaluate==0.3.0

Diff for: ‎custom-nb-image/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.4.4
1+
v0.4.5

Diff for: ‎docs/cluster/config.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ <h1 class="title">Module <code>codeflare_sdk.cluster.config</code></h1>
7676
min_memory: int = 2
7777
max_memory: int = 2
7878
gpu: int = 0
79-
template: str = f&#34;{dir}/templates/new-template.yaml&#34;
79+
template: str = f&#34;{dir}/templates/base-template.yaml&#34;
8080
instascale: bool = False
8181
envs: dict = field(default_factory=dict)
8282
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>
9393
<dl>
9494
<dt id="codeflare_sdk.cluster.config.ClusterConfiguration"><code class="flex name class">
9595
<span>class <span class="ident">ClusterConfiguration</span></span>
96-
<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>
96+
<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>
9797
</code></dt>
9898
<dd>
9999
<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>
119119
min_memory: int = 2
120120
max_memory: int = 2
121121
gpu: int = 0
122-
template: str = f&#34;{dir}/templates/new-template.yaml&#34;
122+
template: str = f&#34;{dir}/templates/base-template.yaml&#34;
123123
instascale: bool = False
124124
envs: dict = field(default_factory=dict)
125125
image: str = &#34;ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103&#34;</code></pre>

Diff for: ‎docs/job/jobs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ <h3>Methods</h3>
305305
</dd>
306306
<dt id="codeflare_sdk.job.jobs.DDPJobDefinition"><code class="flex name class">
307307
<span>class <span class="ident">DDPJobDefinition</span></span>
308-
<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>
308+
<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>
309309
</code></dt>
310310
<dd>
311311
<div class="desc"></div>

Diff for: ‎docs/utils/generate_yaml.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
216216
update_image(spec, image)
217217
update_env(spec, env)
218218
if comp == head:
219-
update_resources(spec, 2, 2, 8, 8, 0)
219+
# TODO: Eventually add head node configuration outside of template
220+
continue
220221
else:
221222
update_resources(spec, min_cpu, max_cpu, min_memory, max_memory, gpu)
222223

@@ -797,7 +798,8 @@ <h2 class="section-title" id="header-functions">Functions</h2>
797798
update_image(spec, image)
798799
update_env(spec, env)
799800
if comp == head:
800-
update_resources(spec, 2, 2, 8, 8, 0)
801+
# TODO: Eventually add head node configuration outside of template
802+
continue
801803
else:
802804
update_resources(spec, min_cpu, max_cpu, min_memory, max_memory, gpu)</code></pre>
803805
</details>

Diff for: ‎pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "codeflare-sdk"
3-
version = "0.4.4"
3+
version = "0.4.5"
44
description = "Python SDK for codeflare client"
55

66
license = "Apache-2.0"
@@ -24,7 +24,7 @@ python = "^3.7"
2424
openshift-client = "1.0.18"
2525
rich = "^12.5"
2626
ray = {version = "2.1.0", extras = ["default"]}
27-
kubernetes = "26.1.0"
27+
kubernetes = ">= 25.3.0, < 27"
2828
codeflare-torchx = "0.6.0.dev0"
2929
cryptography = "40.0.2"
3030

Diff for: ‎requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
openshift-client==1.0.18
22
rich==12.5.1
33
ray[default]==2.1.0
4-
kubernetes==26.1.0
4+
kubernetes>=25.3.0,<27
55
codeflare-torchx==0.6.0.dev0

Diff for: ‎src/codeflare_sdk/cluster/config.py

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

Diff for: ‎src/codeflare_sdk/templates/aw-kuberay.yaml

-220
This file was deleted.

0 commit comments

Comments
 (0)