update ray version in default template and code references

KPostOffice · KPostOffice · commit 123018840766 · 2023-10-10T13:30:17.000-04:00
Signed-off-by: Kevin &lt;kpostlet@redhat.com&gt;
diff --git a/custom-nb-image/Dockerfile b/custom-nb-image/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM  quay.io/opendatahub/notebooks:jupyter-minimal-ubi8-python-3.8-4c8f26e
+FROM  quay.io/opendatahub/notebooks:jupyter-minimal-ubi9-python-3.9-2023a_20230302
 # Install: torch (v1.12), ray (v2.1.0) and others
 
 COPY requirements.txt requirements.txt
diff --git a/demo-notebooks/additional-demos/hf_interactive.ipynb b/demo-notebooks/additional-demos/hf_interactive.ipynb
@@ -96,7 +96,7 @@
     "                                       min_memory=16, \n",
     "                                       max_memory=16, \n",
     "                                       num_gpus=4,\n",
-    "                                       image=\"quay.io/project-codeflare/ray:2.5.0-py38-cu116\",\n",
+    "                                       image=\"quay.io/project-codeflare/ray:latest-py39-cu118\",\n",
     "                                       instascale=True, machine_types=[\"m5.xlarge\", \"p3.8xlarge\"]))"
    ]
   },
diff --git a/demo-notebooks/guided-demos/0_basic_ray.ipynb b/demo-notebooks/guided-demos/0_basic_ray.ipynb
@@ -66,7 +66,7 @@
     "    min_memory=4,\n",
     "    max_memory=4,\n",
     "    num_gpus=0,\n",
-    "    image=\"quay.io/project-codeflare/ray:2.5.0-py38-cu116\", #current default\n",
+    "    image=\"quay.io/project-codeflare/ray:latest-py39-cu118\", #current default\n",
     "    instascale=False\n",
     "))"
    ]
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/0_basic_ray.ipynb b/demo-notebooks/guided-demos/notebook-ex-outputs/0_basic_ray.ipynb
@@ -74,7 +74,7 @@
     "    min_memory=4,\n",
     "    max_memory=4,\n",
     "    num_gpus=0,\n",
-    "    image=\"quay.io/project-codeflare/ray:2.5.0-py38-cu116\", #current default\n",
+    "    image=\"quay.io/project-codeflare/ray:latest-py39-cu118\", #current default\n",
     "    instascale=False\n",
     "))"
    ]
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
@@ -81,7 +81,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -147,7 +147,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   lifecycle:
                     preStop:
                       exec:
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml
@@ -81,7 +81,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -147,7 +147,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   lifecycle:
                     preStop:
                       exec:
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
@@ -81,7 +81,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -147,7 +147,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   lifecycle:
                     preStop:
                       exec:
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
@@ -70,7 +70,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -127,7 +127,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   lifecycle:
                     preStop:
                       exec:
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
@@ -70,7 +70,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -127,7 +127,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   lifecycle:
                     preStop:
                       exec:
diff --git a/demo-notebooks/guided-demos/preview_nbs/0_basic_ray.ipynb b/demo-notebooks/guided-demos/preview_nbs/0_basic_ray.ipynb
@@ -66,7 +66,7 @@
     "    min_memory=4,\n",
     "    max_memory=4,\n",
     "    num_gpus=0,\n",
-    "    image=\"quay.io/project-codeflare/ray:2.5.0-py38-cu116\", #current default\n",
+    "    image=\"quay.io/project-codeflare/ray:latest-py39-cu118\", #current default\n",
     "    instascale=False\n",
     "))"
    ]
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,10 +20,10 @@ homepage = "https://github.com/project-codeflare/codeflare-sdk"
 keywords = ['codeflare', 'python', 'sdk', 'client', 'batch', 'scale']
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.8"
 openshift-client = "1.0.18"
 rich = "^12.5"
-ray = {version = "2.7.0", extras = ["default"]}
+ray = {version = "~=2.7", extras = ["default"]}
 kubernetes = ">= 25.3.0, < 27"
 codeflare-torchx = "0.6.0.dev1"
 cryptography = "40.0.2"
diff --git a/src/codeflare_sdk/cluster/config.py b/src/codeflare_sdk/cluster/config.py
@@ -47,7 +47,7 @@ class ClusterConfiguration:
     template: str = f"{dir}/templates/base-template.yaml"
     instascale: bool = False
     envs: dict = field(default_factory=dict)
-    image: str = "quay.io/project-codeflare/ray:2.5.0-py38-cu116"
+    image: str = "quay.io/project-codeflare/ray:latest-py39-cu118"
     local_interactive: bool = False
     image_pull_secrets: list = field(default_factory=list)
     dispatch_priority: str = None
diff --git a/tests/test-case-bad.yaml b/tests/test-case-bad.yaml
@@ -73,7 +73,7 @@ spec:
                     valueFrom:
                       fieldRef:
                         fieldPath: status.podIP
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -130,7 +130,7 @@ spec:
                     valueFrom:
                       fieldRef:
                         fieldPath: status.podIP
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   lifecycle:
                     preStop:
                       exec:
diff --git a/tests/test-case-prio.yaml b/tests/test-case-prio.yaml
@@ -81,7 +81,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -110,7 +110,7 @@ spec:
                 imagePullSecrets:
                 - name: unit-test-pull-secret
                 priorityClassName: default
-          rayVersion: 2.5.0
+          rayVersion: 2.7.0
           workerGroupSpecs:
           - groupName: small-group-prio-test-cluster
             maxReplicas: 2
@@ -149,7 +149,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   lifecycle:
                     preStop:
                       exec:
diff --git a/tests/test-case.yaml b/tests/test-case.yaml
@@ -80,7 +80,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -108,7 +108,7 @@ spec:
                       nvidia.com/gpu: 0
                 imagePullSecrets:
                 - name: unit-test-pull-secret
-          rayVersion: 2.5.0
+          rayVersion: 2.7.0
           workerGroupSpecs:
           - groupName: small-group-unit-test-cluster
             maxReplicas: 2
@@ -147,7 +147,7 @@ spec:
                     value: /home/ray/workspace/tls/server.key
                   - name: RAY_TLS_CA_CERT
                     value: /home/ray/workspace/tls/ca.crt
-                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  image: quay.io/project-codeflare/ray:latest-py39-cu118
                   lifecycle:
                     preStop:
                       exec:
diff --git a/tests/unit_test.py b/tests/unit_test.py
@@ -231,7 +231,7 @@ def test_config_creation():
     assert config.min_cpus == 3 and config.max_cpus == 4
     assert config.min_memory == 5 and config.max_memory == 6
     assert config.num_gpus == 7
-    assert config.image == "quay.io/project-codeflare/ray:2.5.0-py38-cu116"
+    assert config.image == "quay.io/project-codeflare/ray:latest-py39-cu118"
     assert config.template == f"{parent}/src/codeflare_sdk/templates/base-template.yaml"
     assert config.instascale
     assert config.machine_types == ["cpu.small", "gpu.large"]

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`	`" min_memory=16, \n",`
`97`	`97`	`" max_memory=16, \n",`
`98`	`98`	`" num_gpus=4,\n",`
`99`		`- " image=\"quay.io/project-codeflare/ray:2.5.0-py38-cu116\",\n",`
	`99`	`+ " image=\"quay.io/project-codeflare/ray:latest-py39-cu118\",\n",`
`100`	`100`	`" instascale=True, machine_types=[\"m5.xlarge\", \"p3.8xlarge\"]))"`
`101`	`101`	`]`
`102`	`102`	`},`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`" min_memory=4,\n",`
`67`	`67`	`" max_memory=4,\n",`
`68`	`68`	`" num_gpus=0,\n",`
`69`		`- " image=\"quay.io/project-codeflare/ray:2.5.0-py38-cu116\", #current default\n",`
	`69`	`+ " image=\"quay.io/project-codeflare/ray:latest-py39-cu118\", #current default\n",`
`70`	`70`	`" instascale=False\n",`
`71`	`71`	`"))"`
`72`	`72`	`]`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@`
`74`	`74`	`" min_memory=4,\n",`
`75`	`75`	`" max_memory=4,\n",`
`76`	`76`	`" num_gpus=0,\n",`
`77`		`- " image=\"quay.io/project-codeflare/ray:2.5.0-py38-cu116\", #current default\n",`
	`77`	`+ " image=\"quay.io/project-codeflare/ray:latest-py39-cu118\", #current default\n",`
`78`	`78`	`" instascale=False\n",`
`79`	`79`	`"))"`
`80`	`80`	`]`