Skip to content

Commit e4d94fa

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 0879ad7 + d969617 commit e4d94fa

File tree

7 files changed

+24
-20
lines changed

7 files changed

+24
-20
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* `CODEFLARE_TEST_TIMEOUT_LONG` - Timeout duration for long tasks
2323
* `CODEFLARE_TEST_RAY_IMAGE` (Optional) - Ray image used for raycluster configuration
2424

25-
NOTE: `quay.io/rhoai/ray:2.23.0-py39-cu121` is the default community image used for creating a raycluster resource. If you have your own custom ray image which suits your purposes, specify it in `CODEFLARE_TEST_RAY_IMAGE` environment variable.
25+
NOTE: `quay.io/modh/ray:2.35.0-py39-cu121` is the default image used for creating a RayCluster resource. If you have your own custom ray image which suits your purposes, specify it in `CODEFLARE_TEST_RAY_IMAGE` environment variable.
2626

2727
### Environment variables for Training operator test suite
2828

examples/hpo-raytune/notebook/raytune-oai-MR-gRPC-demo.ipynb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@
4343
"outputs": [],
4444
"source": [
4545
"# Create and configure our cluster object (and appwrapper)\n",
46+
"cluster_name='terrestrial-raytest'\n",
4647
"cluster = Cluster(ClusterConfiguration(\n",
47-
" name='terrestial-raytest',\n",
48+
" name=cluster_name,\n",
4849
" head_cpus=1,\n",
4950
" head_memory=4,\n",
5051
" num_workers=2,\n",
@@ -53,7 +54,7 @@
5354
" min_memory=4,\n",
5455
" max_memory=4,\n",
5556
" num_gpus=0,\n",
56-
" image=\"quay.io/rhoai/ray:2.23.0-py39-cu121\"\n",
57+
" image=\"quay.io/modh/ray:2.35.0-py39-cu121\"\n",
5758
"))"
5859
]
5960
},
@@ -92,8 +93,8 @@
9293
"source": [
9394
"from codeflare_sdk import generate_cert\n",
9495
"# Create required TLS cert and export the environment variables to enable TLS\n",
95-
"generate_cert.generate_tls_cert(cluster_name, namespace)\n",
96-
"generate_cert.export_env(cluster_name, namespace)"
96+
"generate_cert.generate_tls_cert(cluster_name, cluster.config.namespace)\n",
97+
"generate_cert.export_env(cluster_name, cluster.config.namespace)"
9798
]
9899
},
99100
{
@@ -104,7 +105,7 @@
104105
"outputs": [],
105106
"source": [
106107
"!pip install numpy\n",
107-
"!pip install ray[default]==2.7.0\n",
108+
"!pip install ray[default]==2.35.0\n",
108109
"!pip install onnxruntime\n",
109110
"!pip install ml_metadata"
110111
]

examples/hpo-raytune/notebook/raytune-oai-demo-mlmd.ipynb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@
4343
"outputs": [],
4444
"source": [
4545
"# Create and configure our cluster object (and appwrapper)\n",
46+
"cluster_name='terrestrial-raytest'\n",
4647
"cluster = Cluster(ClusterConfiguration(\n",
47-
" name='terrestial-raytest',\n",
48+
" name=cluster_name,\n",
4849
" head_cpus=1,\n",
4950
" head_memory=4,\n",
5051
" num_workers=2,\n",
@@ -53,7 +54,7 @@
5354
" min_memory=4,\n",
5455
" max_memory=4,\n",
5556
" num_gpus=0,\n",
56-
" image=\"quay.io/rhoai/ray:2.23.0-py39-cu121\", \n",
57+
" image=\"quay.io/modh/ray:2.35.0-py39-cu121\", \n",
5758
"))"
5859
]
5960
},
@@ -92,8 +93,8 @@
9293
"source": [
9394
"from codeflare_sdk import generate_cert\n",
9495
"# Create required TLS cert and export the environment variables to enable TLS\n",
95-
"generate_cert.generate_tls_cert(cluster_name, namespace)\n",
96-
"generate_cert.export_env(cluster_name, namespace)"
96+
"generate_cert.generate_tls_cert(cluster_name, cluster.config.namespace)\n",
97+
"generate_cert.export_env(cluster_name, cluster.config.namespace)"
9798
]
9899
},
99100
{
@@ -104,7 +105,7 @@
104105
"outputs": [],
105106
"source": [
106107
"!pip install numpy\n",
107-
"!pip install ray[default]==2.7.0\n",
108+
"!pip install ray[default]==2.35.0\n",
108109
"!pip install onnxruntime\n",
109110
"!pip install ml_metadata"
110111
]

examples/hpo-raytune/notebook/raytune-oai-demo.ipynb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
"outputs": [],
4545
"source": [
4646
"# Create and configure our cluster object (and appwrapper)\n",
47+
"cluster_name=\"terrestrial-raytest\"\n",
4748
"cluster = Cluster(ClusterConfiguration(\n",
48-
" name='terrestial-raytest',\n",
49+
" name=cluster_name,\n",
4950
" head_cpus=1,\n",
5051
" head_memory=4,\n",
5152
" num_workers=2,\n",
@@ -54,7 +55,7 @@
5455
" min_memory=4,\n",
5556
" max_memory=4,\n",
5657
" num_gpus=0,\n",
57-
" image=\"quay.io/rhoai/ray:2.23.0-py39-cu121\"\n",
58+
" image=\"quay.io/modh/ray:2.35.0-py39-cu121\"\n",
5859
"))"
5960
]
6061
},
@@ -93,8 +94,8 @@
9394
"source": [
9495
"from codeflare_sdk import generate_cert\n",
9596
"# Create required TLS cert and export the environment variables to enable TLS\n",
96-
"generate_cert.generate_tls_cert(cluster_name, namespace)\n",
97-
"generate_cert.export_env(cluster_name, namespace)"
97+
"generate_cert.generate_tls_cert(cluster_name, cluster.config.namespace)\n",
98+
"generate_cert.export_env(cluster_name, cluster.config.namespace)"
9899
]
99100
},
100101
{
@@ -105,8 +106,9 @@
105106
"outputs": [],
106107
"source": [
107108
"!pip install numpy\n",
108-
"!pip install ray[default]==2.7.0\n",
109-
"!pip install onnxruntime"
109+
"!pip install ray[default]==2.35.0\n",
110+
"!pip install onnxruntime\n",
111+
"!pip install --upgrade pyarrow fsspec"
110112
]
111113
},
112114
{

examples/stable-diffusion-dreambooth/notebook/raycluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
- name: shared-storage
4747
persistentVolumeClaim:
4848
claimName: stable-diffusion-shared-storage
49-
rayVersion: 2.7.0
49+
rayVersion: 2.35.0
5050
suspend: false
5151
workerGroupSpecs:
5252
- groupName: small-group-stable-diffusion

images/runtime/examples/ray-torch-cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/rhoai/ray:2.35.0-py39-cu121
1+
FROM quay.io/modh/ray:2.35.0-py39-cu121
22

33
# Install PyTorch
44
RUN python3 -m pip install torch==2.4.0

images/runtime/examples/ray-torch-rocm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/rhoai/ray:2.35.0-py39-rocm61
1+
FROM quay.io/modh/ray:2.35.0-py39-rocm61
22

33
ENV PYTORCH_ROCM_ARCH=gfx942
44

0 commit comments

Comments
 (0)