winglian commited on
Commit
2c37bf6
1 Parent(s): 9f69c4d

Prune cuda117 (#327)

Browse files

* drop cuda117/torch 1.13.1 from support, pin flash attention to v2.0.1, rm torchvision/torchaudio install

* gptq base build not needed. add sm 9.0 support

.github/workflows/base.yml CHANGED
@@ -19,22 +19,12 @@ jobs:
19
  cuda_version: 11.8.0
20
  python_version: "3.9"
21
  pytorch: 2.0.1
22
- axolotl_extras:
23
  - cuda: "118"
24
  cuda_version: 11.8.0
25
  python_version: "3.10"
26
  pytorch: 2.0.1
27
- axolotl_extras:
28
- - cuda: "117"
29
- cuda_version: 11.7.1
30
- python_version: "3.9"
31
- pytorch: 1.13.1
32
- axolotl_extras:
33
- - cuda: "118"
34
- cuda_version: 11.8.0
35
- python_version: "3.9"
36
- pytorch: 2.0.1
37
- axolotl_extras: gptq
38
  steps:
39
  - name: Checkout
40
  uses: actions/checkout@v3
@@ -63,4 +53,4 @@ jobs:
63
  CUDA=${{ matrix.cuda }}
64
  PYTHON_VERSION=${{ matrix.python_version }}
65
  PYTORCH_VERSION=${{ matrix.pytorch }}
66
- AXOLOTL_EXTRAS=${{ matrix.axolotl_extras }}
 
19
  cuda_version: 11.8.0
20
  python_version: "3.9"
21
  pytorch: 2.0.1
22
+ torch_cuda_arch_list: "7.0 7.5 8.0 8.6 9.0+PTX"
23
  - cuda: "118"
24
  cuda_version: 11.8.0
25
  python_version: "3.10"
26
  pytorch: 2.0.1
27
+ torch_cuda_arch_list: "7.0 7.5 8.0 8.6 9.0+PTX"
 
 
 
 
 
 
 
 
 
 
28
  steps:
29
  - name: Checkout
30
  uses: actions/checkout@v3
 
53
  CUDA=${{ matrix.cuda }}
54
  PYTHON_VERSION=${{ matrix.python_version }}
55
  PYTORCH_VERSION=${{ matrix.pytorch }}
56
+ TORCH_CUDA_ARCH_LIST=${{ matrix.torch_cuda_arch_list }}
.github/workflows/main.yml CHANGED
@@ -29,11 +29,6 @@ jobs:
29
  python_version: "3.9"
30
  pytorch: 2.0.1
31
  axolotl_extras: gptq
32
- - cuda: cu117
33
- cuda_version: 11.7.1
34
- python_version: "3.9"
35
- pytorch: 1.13.1
36
- axolotl_extras:
37
  runs-on: self-hosted
38
  steps:
39
  - name: Checkout
@@ -55,7 +50,7 @@ jobs:
55
  with:
56
  context: .
57
  build-args: |
58
- BASE_TAG=${{ github.ref_name }}-base-py${{ matrix.python_version }}-${{ matrix.cuda }}-${{ matrix.pytorch }}${{ matrix.axolotl_extras != '' && '-' || '' }}${{ matrix.axolotl_extras }}
59
  file: ./docker/Dockerfile
60
  push: ${{ github.event_name != 'pull_request' }}
61
  tags: ${{ steps.metadata.outputs.tags }}-py${{ matrix.python_version }}-${{ matrix.cuda }}-${{ matrix.pytorch }}${{ matrix.axolotl_extras != '' && '-' || '' }}${{ matrix.axolotl_extras }}
@@ -82,11 +77,6 @@ jobs:
82
  python_version: "3.9"
83
  pytorch: 2.0.1
84
  axolotl_extras: gptq
85
- - cuda: 117
86
- cuda_version: 11.7.1
87
- python_version: "3.9"
88
- pytorch: 1.13.1
89
- axolotl_extras:
90
  runs-on: self-hosted
91
  steps:
92
  - name: Checkout
 
29
  python_version: "3.9"
30
  pytorch: 2.0.1
31
  axolotl_extras: gptq
 
 
 
 
 
32
  runs-on: self-hosted
33
  steps:
34
  - name: Checkout
 
50
  with:
51
  context: .
52
  build-args: |
53
+ BASE_TAG=${{ github.ref_name }}-base-py${{ matrix.python_version }}-${{ matrix.cuda }}-${{ matrix.pytorch }}
54
  file: ./docker/Dockerfile
55
  push: ${{ github.event_name != 'pull_request' }}
56
  tags: ${{ steps.metadata.outputs.tags }}-py${{ matrix.python_version }}-${{ matrix.cuda }}-${{ matrix.pytorch }}${{ matrix.axolotl_extras != '' && '-' || '' }}${{ matrix.axolotl_extras }}
 
77
  python_version: "3.9"
78
  pytorch: 2.0.1
79
  axolotl_extras: gptq
 
 
 
 
 
80
  runs-on: self-hosted
81
  steps:
82
  - name: Checkout
docker/Dockerfile-base CHANGED
@@ -8,7 +8,7 @@ FROM nvidia/cuda:$CUDA_VERSION-cudnn$CUDNN_VERSION-devel-ubuntu$UBUNTU_VERSION a
8
  ENV PATH="/root/miniconda3/bin:${PATH}"
9
 
10
  ARG PYTHON_VERSION="3.9"
11
- ARG PYTORCH="2.0.0"
12
  ARG CUDA="118"
13
 
14
  ENV PYTHON_VERSION=$PYTHON_VERSION
@@ -29,18 +29,18 @@ ENV PATH="/root/miniconda3/envs/py${PYTHON_VERSION}/bin:${PATH}"
29
  WORKDIR /workspace
30
 
31
  RUN python3 -m pip install --upgrade pip && pip3 install packaging && \
32
- python3 -m pip install --no-cache-dir -U torch==${PYTORCH} torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu$CUDA
33
 
34
 
35
  FROM base-builder AS flash-attn-builder
36
 
37
  WORKDIR /workspace
38
 
39
- ARG TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6+PTX"
40
 
41
  RUN git clone https://github.com/Dao-AILab/flash-attention.git && \
42
  cd flash-attention && \
43
- git checkout 9ee0ff1 && \
44
  python3 setup.py bdist_wheel && \
45
  cd csrc/fused_dense_lib && \
46
  python3 setup.py bdist_wheel && \
@@ -53,7 +53,7 @@ RUN git clone https://github.com/Dao-AILab/flash-attention.git && \
53
 
54
  FROM base-builder AS deepspeed-builder
55
 
56
- ARG TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6+PTX"
57
 
58
  WORKDIR /workspace
59
 
@@ -74,6 +74,9 @@ RUN git clone https://github.com/TimDettmers/bitsandbytes.git && \
74
 
75
  FROM base-builder
76
 
 
 
 
77
  # recompile apex
78
  RUN python3 -m pip uninstall -y apex
79
  RUN git clone https://github.com/NVIDIA/apex
 
8
  ENV PATH="/root/miniconda3/bin:${PATH}"
9
 
10
  ARG PYTHON_VERSION="3.9"
11
+ ARG PYTORCH_VERSION="2.0.1"
12
  ARG CUDA="118"
13
 
14
  ENV PYTHON_VERSION=$PYTHON_VERSION
 
29
  WORKDIR /workspace
30
 
31
  RUN python3 -m pip install --upgrade pip && pip3 install packaging && \
32
+ python3 -m pip install --no-cache-dir -U torch==${PYTORCH_VERSION}+cu${CUDA} --extra-index-url https://download.pytorch.org/whl/cu$CUDA
33
 
34
 
35
  FROM base-builder AS flash-attn-builder
36
 
37
  WORKDIR /workspace
38
 
39
+ ARG TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6 9.0+PTX"
40
 
41
  RUN git clone https://github.com/Dao-AILab/flash-attention.git && \
42
  cd flash-attention && \
43
+ git checkout v2.0.1 && \
44
  python3 setup.py bdist_wheel && \
45
  cd csrc/fused_dense_lib && \
46
  python3 setup.py bdist_wheel && \
 
53
 
54
  FROM base-builder AS deepspeed-builder
55
 
56
+ ARG TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6 9.0+PTX"
57
 
58
  WORKDIR /workspace
59
 
 
74
 
75
  FROM base-builder
76
 
77
+ ARG TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6 9.0+PTX"
78
+ ENV TORCH_CUDA_ARCH_LIST=$TORCH_CUDA_ARCH_LIST
79
+
80
  # recompile apex
81
  RUN python3 -m pip uninstall -y apex
82
  RUN git clone https://github.com/NVIDIA/apex