Skip to content

Commit 0397b18

Browse files
Update Ray to v2.52.1 for RHOAI 2.25.1 (#954)
* NO-JIRA: Update Ray to 2.52.1 * [2.25] fix: upgrade test post CVE fixes * fix: post ray 2.52.1 fix for mnist script * Update python 3.11 image sha * Update python 3.12 image sha * Add v0.31 to the CI branches --------- Co-authored-by: Pawel Paszki <[email protected]>
1 parent 3668d60 commit 0397b18

35 files changed

+105
-174
lines changed

.github/workflows/e2e_tests.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- main
88
- 'release-*'
99
- ray-jobs-feature
10+
- v0.31
1011
paths-ignore:
1112
- 'docs/**'
1213
- '**.adoc'

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Python Tests
22

33
on:
44
pull_request:
5-
branches: [ main, ray-jobs-feature ]
5+
branches: [ main, ray-jobs-feature, v0.31 ]
66
push:
7-
branches: [ main, ray-jobs-feature ]
7+
branches: [ main, ray-jobs-feature, v0.31 ]
88

99
jobs:
1010
unit-tests:

demo-notebooks/additional-demos/hf_interactive.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
"\n",
7171
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
7272
"\n",
73-
"- For Python 3.11: 'quay.io/modh/ray:2.47.1-py311-cu121'\n",
74-
"- For Python 3.12: 'quay.io/modh/ray:2.47.1-py312-cu128'\n",
73+
"- For Python 3.11: 'quay.io/modh/ray:2.52.1-py311-cu121'\n",
74+
"- For Python 3.12: 'quay.io/modh/ray:2.52.1-py312-cu128'\n",
7575
"\n",
7676
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
7777
]

demo-notebooks/additional-demos/local_interactive.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"\n",
3838
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
3939
"\n",
40-
"- For Python 3.11: 'quay.io/modh/ray:2.47.1-py311-cu121'\n",
41-
"- For Python 3.12: 'quay.io/modh/ray:2.47.1-py312-cu128'\n",
40+
"- For Python 3.11: 'quay.io/modh/ray:2.52.1-py311-cu121'\n",
41+
"- For Python 3.12: 'quay.io/modh/ray:2.52.1-py312-cu128'\n",
4242
"\n",
4343
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
4444
]

demo-notebooks/additional-demos/ray_job_client.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"\n",
4444
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
4545
"\n",
46-
"- For Python 3.11: 'quay.io/modh/ray:2.47.1-py311-cu121'\n",
47-
"- For Python 3.12: 'quay.io/modh/ray:2.47.1-py312-cu128'\n",
46+
"- For Python 3.11: 'quay.io/modh/ray:2.52.1-py311-cu121'\n",
47+
"- For Python 3.12: 'quay.io/modh/ray:2.52.1-py312-cu128'\n",
4848
"\n",
4949
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
5050
]

demo-notebooks/guided-demos/0_basic_ray.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
"\n",
5050
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
5151
"\n",
52-
"- For Python 3.11: 'quay.io/modh/ray:2.47.1-py311-cu121'\n",
53-
"- For Python 3.12: 'quay.io/modh/ray:2.47.1-py312-cu128'\n",
52+
"- For Python 3.11: 'quay.io/modh/ray:2.52.1-py311-cu121'\n",
53+
"- For Python 3.12: 'quay.io/modh/ray:2.52.1-py312-cu128'\n",
5454
"\n",
5555
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
5656
]

demo-notebooks/guided-demos/1_cluster_job_client.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"\n",
4444
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
4545
"\n",
46-
"- For Python 3.11: 'quay.io/modh/ray:2.47.1-py311-cu121'\n",
47-
"- For Python 3.12: 'quay.io/modh/ray:2.47.1-py312-cu128'\n",
46+
"- For Python 3.11: 'quay.io/modh/ray:2.52.1-py311-cu121'\n",
47+
"- For Python 3.12: 'quay.io/modh/ray:2.52.1-py312-cu128'\n",
4848
"\n",
4949
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
5050
]

demo-notebooks/guided-demos/2_basic_interactive.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"\n",
4747
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
4848
"\n",
49-
"- For Python 3.11: 'quay.io/modh/ray:2.47.1-py311-cu121'\n",
50-
"- For Python 3.12: 'quay.io/modh/ray:2.47.1-py312-cu128'\n",
49+
"- For Python 3.11: 'quay.io/modh/ray:2.52.1-py311-cu121'\n",
50+
"- For Python 3.12: 'quay.io/modh/ray:2.52.1-py312-cu128'\n",
5151
"\n",
5252
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
5353
]

demo-notebooks/guided-demos/3_widget_example.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
"\n",
5050
"NOTE: The default images used by the CodeFlare SDK for creating a RayCluster resource depend on the installed Python version:\n",
5151
"\n",
52-
"- For Python 3.11: 'quay.io/modh/ray:2.47.1-py311-cu121'\n",
53-
"- For Python 3.12: 'quay.io/modh/ray:2.47.1-py312-cu128'\n",
52+
"- For Python 3.11: 'quay.io/modh/ray:2.52.1-py311-cu121'\n",
53+
"- For Python 3.12: 'quay.io/modh/ray:2.52.1-py312-cu128'\n",
5454
"\n",
5555
"If you prefer to use a custom Ray image that better suits your needs, you can specify it in the image field to override the default."
5656
]

demo-notebooks/guided-demos/mnist_fashion.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@
88
from ray.train import ScalingConfig
99

1010

11-
def get_dataset():
12-
return datasets.FashionMNIST(
13-
root="/tmp/data",
14-
train=True,
15-
download=True,
16-
transform=ToTensor(),
17-
)
18-
19-
2011
class NeuralNetwork(nn.Module):
2112
def __init__(self):
2213
super().__init__()
@@ -84,9 +75,6 @@ def train_func_distributed():
8475
resources_per_worker={
8576
"CPU": 1,
8677
},
87-
trainer_resources={
88-
"CPU": 0,
89-
},
9078
),
9179
)
9280

0 commit comments

Comments
 (0)