From 2e0fa097a2c8a7c34156f66b20296ce288e3a1cd Mon Sep 17 00:00:00 2001
From: Lev Kurilenko <lekurile@microsoft.com>
Date: Thu, 2 Nov 2023 20:22:07 +0000
Subject: [PATCH 1/3] Update ds-chat workflow to work w/ deepspeed-chat install

---
 .github/workflows/nv-ds-chat.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/nv-ds-chat.yml b/.github/workflows/nv-ds-chat.yml
index c90b7c72ac0b..b53fac36315b 100644
--- a/.github/workflows/nv-ds-chat.yml
+++ b/.github/workflows/nv-ds-chat.yml
@@ -36,11 +36,7 @@ jobs:
           pip install .[dev]
           ds_report
 
-      - name: Python environment
-        run: |
-          pip list
-
-      - name: DS-Chat unit tests
+      - name: Install deepspeed-chat
         run: |
           BRANCH="master"
           if [[ ! -z "${{ github.event.inputs.dse_branch }}" ]]; then
@@ -50,8 +46,17 @@ jobs:
           git clone -b $BRANCH https://github.com/microsoft/DeepSpeedExamples.git
           cd DeepSpeedExamples/applications/DeepSpeed-Chat
           pip install -r requirements.txt
+          pip install -e .
+
+      - name: Python environment
+        run: |
+          pip list
+
+      - name: DS-Chat unit tests
+        run: |
+          cd DeepSpeedExamples/applications/DeepSpeed-Chat
           unset TORCH_CUDA_ARCH_LIST # only jit compile for current arch
-          cd training/tests
+          cd tests
           pytest $PYTEST_OPTS ./
 
       - name: Open GitHub issue if nightly CI fails

From f427e4289d9c085979adb149f5305f4f67a29a7e Mon Sep 17 00:00:00 2001
From: Lev Kurilenko <lekurile@microsoft.com>
Date: Thu, 2 Nov 2023 20:27:27 +0000
Subject: [PATCH 2/3] Temporarily change branch to fork

---
 .github/workflows/nv-ds-chat.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nv-ds-chat.yml b/.github/workflows/nv-ds-chat.yml
index b53fac36315b..cdefc0eeaf57 100644
--- a/.github/workflows/nv-ds-chat.yml
+++ b/.github/workflows/nv-ds-chat.yml
@@ -43,7 +43,9 @@ jobs:
               BRANCH="${{ github.event.inputs.dse_branch }}"
           fi
           echo "DeepSpeedExamples Branch: $BRANCH"
-          git clone -b $BRANCH https://github.com/microsoft/DeepSpeedExamples.git
+          #git clone -b $BRANCH https://github.com/microsoft/DeepSpeedExamples.git
+          # TODO: Revert back to main branch once fork is merged into DSE
+          git clone -b $BRANCH https://github.com/santacml/DeepSpeedExamples.git
           cd DeepSpeedExamples/applications/DeepSpeed-Chat
           pip install -r requirements.txt
           pip install -e .

From 9027ea0b8fb92a656d22f4b5ba224bf33c241319 Mon Sep 17 00:00:00 2001
From: Lev Kurilenko <lekurile@microsoft.com>
Date: Thu, 2 Nov 2023 22:04:56 +0000
Subject: [PATCH 3/3] Revert branch to DSE

---
 .github/workflows/nv-ds-chat.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/nv-ds-chat.yml b/.github/workflows/nv-ds-chat.yml
index cdefc0eeaf57..b53fac36315b 100644
--- a/.github/workflows/nv-ds-chat.yml
+++ b/.github/workflows/nv-ds-chat.yml
@@ -43,9 +43,7 @@ jobs:
               BRANCH="${{ github.event.inputs.dse_branch }}"
           fi
           echo "DeepSpeedExamples Branch: $BRANCH"
-          #git clone -b $BRANCH https://github.com/microsoft/DeepSpeedExamples.git
-          # TODO: Revert back to main branch once fork is merged into DSE
-          git clone -b $BRANCH https://github.com/santacml/DeepSpeedExamples.git
+          git clone -b $BRANCH https://github.com/microsoft/DeepSpeedExamples.git
           cd DeepSpeedExamples/applications/DeepSpeed-Chat
           pip install -r requirements.txt
           pip install -e .