Surrounding prep for final two notebook updates

Maxusmusti · openshift-merge-robot · commit 804cbb6000bf · 2023-08-11T10:43:07.000-04:00
diff --git a/demo-notebooks/guided-demos/3_basic_interactive.ipynb b/demo-notebooks/guided-demos/3_basic_interactive.ipynb
@@ -140,7 +140,9 @@
     "#install additional libraries that will be required for model training\n",
     "runtime_env = {\"pip\": [\"transformers\", \"datasets\", \"evaluate\", \"pyarrow<7.0.0\", \"accelerate\"]}\n",
     "\n",
-    "ray.init(address=f'{ray_cluster_uri}', runtime_env=runtime_env)\n",
+    "# NOTE: This will work for in-cluster notebook servers (RHODS/ODH), but not for local machines\n",
+    "# To see how to connect from your laptop, go to demo-notebooks/additional-interactive/local_interactive.ipynb\n",
+    "ray.init(address=ray_cluster_uri, runtime_env=runtime_env)\n",
     "\n",
     "print(\"Ray cluster is up and running: \", ray.is_initialized())"
    ]
diff --git a/demo-notebooks/guided-demos/4_gpt.ipynb b/demo-notebooks/guided-demos/4_gpt.ipynb
@@ -44,7 +44,7 @@
     "    min_memory=8,\n",
     "    max_memory=8,\n",
     "    num_gpus=1,\n",
-    "    instascale=True,\n",
+    "    instascale=True, #<---instascale enabled\n",
     "    machine_types=[\"m5.xlarge\", \"g4dn.xlarge\"],\n",
     "))"
    ]
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
@@ -73,7 +73,15 @@ spec:
                     valueFrom:
                       fieldRef:
                         fieldPath: status.podIP
-                  image: ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103
+                  - name: RAY_USE_TLS
+                    value: '0'
+                  - name: RAY_TLS_SERVER_CERT
+                    value: /home/ray/workspace/tls/server.crt
+                  - name: RAY_TLS_SERVER_KEY
+                    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
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -99,7 +107,8 @@ spec:
                       cpu: 2
                       memory: 8G
                       nvidia.com/gpu: 0
-          rayVersion: 1.12.0
+                imagePullSecrets: []
+          rayVersion: 2.1.0
           workerGroupSpecs:
           - groupName: small-group-gptfttest
             maxReplicas: 2
@@ -130,7 +139,15 @@ spec:
                     valueFrom:
                       fieldRef:
                         fieldPath: status.podIP
-                  image: ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103
+                  - name: RAY_USE_TLS
+                    value: '0'
+                  - name: RAY_TLS_SERVER_CERT
+                    value: /home/ray/workspace/tls/server.crt
+                  - name: RAY_TLS_SERVER_KEY
+                    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
                   lifecycle:
                     preStop:
                       exec:
@@ -148,6 +165,7 @@ spec:
                       cpu: 2
                       memory: 8G
                       nvidia.com/gpu: 1
+                imagePullSecrets: []
                 initContainers:
                 - command:
                   - sh
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
@@ -73,7 +73,15 @@ spec:
                     valueFrom:
                       fieldRef:
                         fieldPath: status.podIP
-                  image: ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103
+                  - name: RAY_USE_TLS
+                    value: '0'
+                  - name: RAY_TLS_SERVER_CERT
+                    value: /home/ray/workspace/tls/server.crt
+                  - name: RAY_TLS_SERVER_KEY
+                    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
                   imagePullPolicy: Always
                   lifecycle:
                     preStop:
@@ -99,7 +107,8 @@ spec:
                       cpu: 2
                       memory: 8G
                       nvidia.com/gpu: 0
-          rayVersion: 1.12.0
+                imagePullSecrets: []
+          rayVersion: 2.1.0
           workerGroupSpecs:
           - groupName: small-group-interactivetest
             maxReplicas: 2
@@ -130,7 +139,15 @@ spec:
                     valueFrom:
                       fieldRef:
                         fieldPath: status.podIP
-                  image: ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103
+                  - name: RAY_USE_TLS
+                    value: '0'
+                  - name: RAY_TLS_SERVER_CERT
+                    value: /home/ray/workspace/tls/server.crt
+                  - name: RAY_TLS_SERVER_KEY
+                    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
                   lifecycle:
                     preStop:
                       exec:
@@ -148,6 +165,7 @@ spec:
                       cpu: 2
                       memory: 8G
                       nvidia.com/gpu: 1
+                imagePullSecrets: []
                 initContainers:
                 - command:
                   - sh
diff --git a/demo-notebooks/guided-demos/preview_nbs/3_basic_interactive.ipynb b/demo-notebooks/guided-demos/preview_nbs/3_basic_interactive.ipynb
@@ -61,7 +61,7 @@
     "    min_memory=8,\n",
     "    max_memory=8,\n",
     "    num_gpus=1,\n",
-    "    instascale=True,\n",
+    "    instascale=True, #<---instascale enabled\n",
     "    machine_types=[\"m5.xlarge\", \"g4dn.xlarge\"]\n",
     "    \n",
     "))"
@@ -140,7 +140,9 @@
     "#install additional libraries that will be required for model training\n",
     "runtime_env = {\"pip\": [\"transformers\", \"datasets\", \"evaluate\", \"pyarrow<7.0.0\", \"accelerate\"]}\n",
     "\n",
-    "ray.init(address=f'{ray_cluster_uri}', runtime_env=runtime_env)\n",
+    "# NOTE: This will work for in-cluster notebook servers (RHODS/ODH), but not for local machines\n",
+    "# To see how to connect from your laptop, go to demo-notebooks/additional-interactive/local_interactive.ipynb\n",
+    "ray.init(address=ray_cluster_uri, runtime_env=runtime_env)\n",
     "\n",
     "print(\"Ray cluster is up and running: \", ray.is_initialized())"
    ]
diff --git a/demo-notebooks/guided-demos/preview_nbs/4_gpt.ipynb b/demo-notebooks/guided-demos/preview_nbs/4_gpt.ipynb
@@ -44,7 +44,7 @@
     "    min_memory=8,\n",
     "    max_memory=8,\n",
     "    num_gpus=1,\n",
-    "    instascale=True,\n",
+    "    instascale=True, #<---instascale enabled\n",
     "    machine_types=[\"m5.xlarge\", \"g4dn.xlarge\"],\n",
     "))"
    ]

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`" min_memory=8,\n",`
`45`	`45`	`" max_memory=8,\n",`
`46`	`46`	`" num_gpus=1,\n",`
`47`		`- " instascale=True,\n",`
	`47`	`+ " instascale=True, #<---instascale enabled\n",`
`48`	`48`	`" machine_types=[\"m5.xlarge\", \"g4dn.xlarge\"],\n",`
`49`	`49`	`"))"`
`50`	`50`	`]`