Specify triton 2.0.0 requirement (#4008)

* specify triton 2.0.0 requirement * fix for setup-venv action * fix for install error * fix torch install error
deepspeedai · Jul 21, 2023 · 8e80839 · 8e80839
1 parent 0cc2d6f
commit 8e80839
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/nv-inference.yml b/.github/workflows/nv-inference.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Install deepspeed
         run: |
-          pip install .[dev,1bit,autotuning,inf]
+          pip install .[dev,1bit,autotuning,inf,triton]
           ds_report
 
       - name: Python environment

diff --git a/.github/workflows/nv-transformers-v100.yml b/.github/workflows/nv-transformers-v100.yml
@@ -27,10 +27,19 @@ jobs:
       - name: Install pytorch
         run: |
           # use the same pytorch version as transformers CI
-          pip install -U --cache-dir $TORCH_CACHE torch torchvision torchaudio -f https://download.pytorch.org/whl/torch_stable.html
+            pip install -U --cache-dir $TORCH_CACHE torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116
           python -c "import torch; print('torch:', torch.__version__, torch)"
           python -c "import torch; print('CUDA available:', torch.cuda.is_available())"
 
+      - name: Install transformers
+        run: |
+          git clone https://github.com/huggingface/transformers
+          cd transformers
+          # if needed switch to the last known good SHA until transformers@master is fixed
+          # git checkout 1cc453d33
+          git rev-parse --short HEAD
+          pip install .
+
       - name: Install deepspeed
         run: |
           pip install .[dev,autotuning]
@@ -43,12 +52,7 @@ jobs:
       - name: HF transformers tests
         run: |
           unset TORCH_CUDA_ARCH_LIST # only jit compile for current arch
-          git clone https://github.com/huggingface/transformers
           cd transformers
-          # if needed switch to the last known good SHA until transformers@master is fixed
-          #git checkout 6268694e2
-          git rev-parse --short HEAD
-          # scipy/sklearn required for tests, using the 'dev' extra forces torch re-install
           pip install .[testing]
           # find reqs used in ds integration tests
           find examples/pytorch -regextype posix-egrep -regex '.*(language-modeling|question-answering|summarization|image-classification|text-classification|translation).*/requirements.txt' -exec grep -v 'torch' {} \; | xargs -I {} pip install --upgrade {}

diff --git a/.github/workflows/setup-venv/action.yml b/.github/workflows/setup-venv/action.yml
@@ -12,6 +12,7 @@ runs:
       shell: bash
     - id: create-venv
       run: |
+        rm -rf ./unit-test-venv
         python -m venv unit-test-venv
         source ./unit-test-venv/bin/activate
         python -m pip install --upgrade pip

diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt
@@ -14,5 +14,4 @@ sphinx-rtd-theme
 tensorboard
 torchvision
 transformers
-triton
 wandb
diff --git a/requirements/requirements-inf.txt b/requirements/requirements-inf.txt
@@ -3,4 +3,3 @@ lm-eval==0.3.0
 protobuf
 transformers
 transformers[sentencepiece]
-triton
diff --git a/requirements/requirements-triton.txt b/requirements/requirements-triton.txt
@@ -1 +1 @@
-triton
+triton>=2.0.0