move CUDA_VERSION_BNB arg inside of stage build scope
Browse files- .github/workflows/base.yml +2 -2
- docker/Dockerfile-base +1 -3
    	
        .github/workflows/base.yml
    CHANGED
    
    | @@ -16,11 +16,11 @@ jobs: | |
| 16 | 
             
                    include:
         | 
| 17 | 
             
                      - cuda: cu118
         | 
| 18 | 
             
                        cuda_version: 11.8.0
         | 
| 19 | 
            -
                        cuda_version_bnb: 118
         | 
| 20 | 
             
                        pytorch: 2.0.0
         | 
| 21 | 
             
                      - cuda: cu117
         | 
| 22 | 
             
                        cuda_version: 11.7.0
         | 
| 23 | 
            -
                        cuda_version_bnb: 117
         | 
| 24 | 
             
                        pytorch: 1.13.1
         | 
| 25 | 
             
                steps:
         | 
| 26 | 
             
                  - name: Checkout
         | 
|  | |
| 16 | 
             
                    include:
         | 
| 17 | 
             
                      - cuda: cu118
         | 
| 18 | 
             
                        cuda_version: 11.8.0
         | 
| 19 | 
            +
                        cuda_version_bnb: "118"
         | 
| 20 | 
             
                        pytorch: 2.0.0
         | 
| 21 | 
             
                      - cuda: cu117
         | 
| 22 | 
             
                        cuda_version: 11.7.0
         | 
| 23 | 
            +
                        cuda_version_bnb: "117"
         | 
| 24 | 
             
                        pytorch: 1.13.1
         | 
| 25 | 
             
                steps:
         | 
| 26 | 
             
                  - name: Checkout
         | 
    	
        docker/Dockerfile-base
    CHANGED
    
    | @@ -1,5 +1,4 @@ | |
| 1 | 
             
            ARG CUDA_VERSION="11.8.0"
         | 
| 2 | 
            -
            ARG CUDA_VERSION_BNB="118"
         | 
| 3 | 
             
            ARG CUDNN_VERSION="8"
         | 
| 4 | 
             
            ARG UBUNTU_VERSION="22.04"
         | 
| 5 | 
             
            ARG MAX_JOBS=4
         | 
| @@ -62,6 +61,7 @@ RUN git clone https://github.com/microsoft/DeepSpeed.git && \ | |
| 62 | 
             
            FROM base-builder AS bnb-builder
         | 
| 63 |  | 
| 64 | 
             
            WORKDIR /workspace
         | 
|  | |
| 65 | 
             
            ENV CUDA_VERSION_BNB=$CUDA_VERSION_BNB
         | 
| 66 |  | 
| 67 | 
             
            RUN git clone https://github.com/TimDettmers/bitsandbytes.git && \
         | 
| @@ -71,8 +71,6 @@ RUN git clone https://github.com/TimDettmers/bitsandbytes.git && \ | |
| 71 |  | 
| 72 | 
             
            FROM base-builder
         | 
| 73 |  | 
| 74 | 
            -
            ENV CUDA_VERSION_BNB=$CUDA_VERSION_BNB
         | 
| 75 | 
            -
             | 
| 76 | 
             
            # recompile apex
         | 
| 77 | 
             
            RUN python3 -m pip uninstall -y apex
         | 
| 78 | 
             
            RUN git clone https://github.com/NVIDIA/apex
         | 
|  | |
| 1 | 
             
            ARG CUDA_VERSION="11.8.0"
         | 
|  | |
| 2 | 
             
            ARG CUDNN_VERSION="8"
         | 
| 3 | 
             
            ARG UBUNTU_VERSION="22.04"
         | 
| 4 | 
             
            ARG MAX_JOBS=4
         | 
|  | |
| 61 | 
             
            FROM base-builder AS bnb-builder
         | 
| 62 |  | 
| 63 | 
             
            WORKDIR /workspace
         | 
| 64 | 
            +
            ARG CUDA_VERSION_BNB="118"
         | 
| 65 | 
             
            ENV CUDA_VERSION_BNB=$CUDA_VERSION_BNB
         | 
| 66 |  | 
| 67 | 
             
            RUN git clone https://github.com/TimDettmers/bitsandbytes.git && \
         | 
|  | |
| 71 |  | 
| 72 | 
             
            FROM base-builder
         | 
| 73 |  | 
|  | |
|  | |
| 74 | 
             
            # recompile apex
         | 
| 75 | 
             
            RUN python3 -m pip uninstall -y apex
         | 
| 76 | 
             
            RUN git clone https://github.com/NVIDIA/apex
         | 
