Merge remote-tracking branch 'upstream/main'

Author: dchourasia

examples/stable-diffusion-dreambooth/README.md

@@ -87,7 +87,7 @@ make setup-ray-distributed-training
 
 ## Running the Examples
 
-In the workbench, navigate to `openshift-ai-ray/notebook` to begin exploring the notebooks.
+In the workbench, navigate to `distributed-workloads/examples/stable-diffusion-dreambooth/notebook` to begin exploring the notebooks.
 
 ### Fine-tune of Stable Diffusion with DreamBooth and Ray Train
 

examples/stable-diffusion-dreambooth/notebook/00 Intro.ipynb

@@ -8,16 +8,6 @@
     "This notebook shows a simple example of running a remote function on the Ray cluster."
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "b4e7fbb0",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!pip install codeflare_sdk==0.16.3"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -27,8 +17,7 @@
    },
    "outputs": [],
    "source": [
-    "from codeflare_sdk.cluster.cluster import Cluster, ClusterConfiguration\n",
-    "from codeflare_sdk.cluster.auth import TokenAuthentication"
+    "from codeflare_sdk import Cluster, ClusterConfiguration, TokenAuthentication"
    ]
   },
   {

examples/stable-diffusion-dreambooth/notebook/01 raytrain-stablediffusion.ipynb

@@ -10,7 +10,7 @@
    "outputs": [],
    "source": [
     "# For matplotlib 3.8.4 see https://discourse.matplotlib.org/t/latest-versions-via-pip-jupyterlab-import-of-matplotlib-broken/24477\n",
-    "!pip install -U ray==2.7.0 codeflare_sdk==0.16.3 huggingface_hub==0.16.2 matplotlib==3.8.4"
+    "!pip install -U huggingface_hub==0.16.2 matplotlib==3.8.4"
    ]
   },
   {

examples/stable-diffusion-dreambooth/yaml/distributed/git-clone.yaml

@@ -14,7 +14,7 @@ spec:
         command: ["/bin/sh", "-c"]
         args:
           - |
-            git clone https://github.com/tsailiming/openshift-ai-ray /data/openshift-ai-ray 
+            git clone https://github.com/opendatahub-io/distributed-workloads /data/distributed-workloads
         volumeMounts:        
         - name: data
           mountPath: /data

examples/stable-diffusion-dreambooth/yaml/distributed/workbench.yaml

@@ -6,7 +6,7 @@ metadata:
     opendatahub.io/image-display-name: Standard Data Science
     openshift.io/description: ''
     openshift.io/display-name: stable-diffusion-nb
-    notebooks.opendatahub.io/last-image-selection: 's2i-generic-data-science-notebook:2024.1'
+    notebooks.opendatahub.io/last-image-selection: 's2i-generic-data-science-notebook:2024.2'
     notebooks.opendatahub.io/last-size-selection: Medium    
   name: stable-diffusion-nb
   namespace: distributed
@@ -57,7 +57,7 @@ spec:
                                   --ServerApp.quit_button=False
                                   --ServerApp.tornado_settings={"user":"admin","hub_host":"https://rhods-dashboard-redhat-ods-applications.apps.cluster-frvw4.frvw4.sandbox1107.opentlc.com","hub_prefix":"/projects/distributed"}
             - name: JUPYTER_IMAGE
-              value: 'image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/s2i-generic-data-science-notebook:2024.1'
+              value: 'image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/s2i-generic-data-science-notebook:2024.2'
             - name: PIP_CERT
               value: /etc/pki/tls/custom-certs/ca-bundle.crt
             - name: REQUESTS_CA_BUNDLE
@@ -80,7 +80,7 @@ spec:
               name: trusted-ca
               readOnly: true
               subPath: ca-bundle.crt      
-          image: 'image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/s2i-generic-data-science-notebook:2024.1'
+          image: 'image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/s2i-generic-data-science-notebook:2024.2'
           workingDir: /opt/app-root/src
           envFrom:
             - secretRef:

examples/stable-diffusion-dreambooth/yaml/operators/nfd-cr.yaml

@@ -4,10 +4,6 @@ metadata:
   name: nfd-instance
   namespace: openshift-nfd
 spec:
-  operand:
-    image: >-
-      registry.redhat.io/openshift4/ose-node-feature-discovery@sha256:bc6130cddeec433af572eed4f4558001c0680418dbdd4a52431200a47010d926
-    servicePort: 12000
   workerConfig:
     configData: |
       core:
@@ -116,6 +112,10 @@ spec:
       #            vendor: ["15b3"]
       #            device: ["1014", "1017"]
       #          loadedKMod : ["vendor_kmod1", "vendor_kmod2"]
+  operand:
+    image: 'registry.redhat.io/openshift4/ose-node-feature-discovery-rhel9@sha256:00208889a98c5b767e201bd1427be07edd4388271d82f09bbe393a545e94ac42'
+    imagePullPolicy: IfNotPresent
+    servicePort: 12000
   customConfig:
     configData: |
       #    - name: "more.kernel.features"