From a204ece26b22e7dc656d3a57d922fef533b0732c Mon Sep 17 00:00:00 2001 From: maxusmusti Date: Tue, 20 Jun 2023 19:04:12 -0400 Subject: [PATCH] Prepare for release 0.4.5 --- docs/cluster/config.html | 6 +++--- docs/job/jobs.html | 2 +- docs/utils/generate_yaml.html | 6 ++++-- pyproject.toml | 4 ++-- requirements.txt | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/cluster/config.html b/docs/cluster/config.html index 25e62d881..b80192ec8 100644 --- a/docs/cluster/config.html +++ b/docs/cluster/config.html @@ -76,7 +76,7 @@

Module codeflare_sdk.cluster.config

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" @@ -93,7 +93,7 @@

Classes

class ClusterConfiguration -(name: str, namespace: str = None, head_info: list = <factory>, machine_types: list = <factory>, 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 = <factory>, image: str = 'ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103') +(name: str, namespace: str = None, head_info: list = <factory>, machine_types: list = <factory>, 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 = <factory>, image: str = 'ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103')

This dataclass is used to specify resource requirements and other details, and @@ -119,7 +119,7 @@

Classes

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" diff --git a/docs/job/jobs.html b/docs/job/jobs.html index cfa3a3f53..366ab862d 100644 --- a/docs/job/jobs.html +++ b/docs/job/jobs.html @@ -305,7 +305,7 @@

Methods

class DDPJobDefinition -(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') +(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')
diff --git a/docs/utils/generate_yaml.html b/docs/utils/generate_yaml.html index feb3ed4c6..a1dfeddd5 100644 --- a/docs/utils/generate_yaml.html +++ b/docs/utils/generate_yaml.html @@ -216,7 +216,8 @@

Module codeflare_sdk.utils.generate_yaml

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 @@

Functions

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) diff --git a/pyproject.toml b/pyproject.toml index d73ca7e00..b1b7a1c24 100644 --- a/pyproject.toml +++ b/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] diff --git a/requirements.txt b/requirements.txt index 1a4b08061..e529bc39f 100644 --- a/requirements.txt +++ b/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