From 31799bdcc0aa7a8f0e57437aea37c041a858a12c Mon Sep 17 00:00:00 2001 From: Wing Lian Date: Fri, 21 Mar 2025 08:56:01 -0400 Subject: [PATCH] more parity across tests and docker images for packaging/setuptools --- .github/workflows/pypi.yml | 2 +- .github/workflows/tests-nightly.yml | 4 ++-- .github/workflows/tests.yml | 4 ++-- README.md | 2 +- docker/Dockerfile-base | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index c64afc0c9..24e3c497d 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -40,7 +40,7 @@ jobs: - name: Install dependencies run: | - pip3 install wheel packaging + pip3 install wheel packaging==23.2 pip3 install --no-build-isolation -e . pip3 install -r requirements-dev.txt -r requirements-tests.txt diff --git a/.github/workflows/tests-nightly.yml b/.github/workflows/tests-nightly.yml index 2733b8605..efad7cc37 100644 --- a/.github/workflows/tests-nightly.yml +++ b/.github/workflows/tests-nightly.yml @@ -42,7 +42,7 @@ jobs: - name: upgrade pip run: | pip3 install --upgrade pip - pip3 install --upgrade packaging setuptools wheel + pip3 install --upgrade packaging==23.2 setuptools==75.8.0 wheel - name: Install PyTorch run: | @@ -59,7 +59,7 @@ jobs: - name: Install dependencies run: | pip3 install --upgrade pip - pip3 install --upgrade packaging + pip3 install --upgrade packaging==23.2 pip3 install --no-build-isolation -U -e . python scripts/unsloth_install.py | sh python scripts/cutcrossentropy_install.py | sh diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 889339005..32bb42821 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -74,7 +74,7 @@ jobs: - name: upgrade pip run: | pip3 install --upgrade pip - pip3 install --upgrade packaging setuptools wheel + pip3 install --upgrade packaging==23.2 setuptools==75.8.0 wheel - name: Install PyTorch run: | @@ -147,7 +147,7 @@ jobs: - name: upgrade pip run: | pip3 install --upgrade pip - pip3 install --upgrade packaging setuptools setuptools_scm build wheel + pip3 install --upgrade packaging==23.2 setuptools==75.8.0 setuptools_scm build wheel - name: Install PyTorch run: | diff --git a/README.md b/README.md index 953bc0be5..343816aff 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Features: ### Installation ```bash -pip3 install -U packaging setuptools wheel ninja +pip3 install -U packaging==23.2 setuptools==75.8.0 wheel ninja pip3 install --no-build-isolation axolotl[flash-attn,deepspeed] # Download example axolotl configs, deepspeed configs diff --git a/docker/Dockerfile-base b/docker/Dockerfile-base index 0146fd9fe..e989152ec 100644 --- a/docker/Dockerfile-base +++ b/docker/Dockerfile-base @@ -28,7 +28,7 @@ ENV PATH="/root/miniconda3/envs/py${PYTHON_VERSION}/bin:${PATH}" WORKDIR /workspace -RUN python3 -m pip install --upgrade pip && pip3 install -U packaging setuptools wheel && \ +RUN python3 -m pip install --upgrade pip && pip3 install -U packaging==23.2 setuptools==75.8.0 wheel && \ python3 -m pip install --no-cache-dir -U torch==${PYTORCH_VERSION}+cu${CUDA} --extra-index-url https://download.pytorch.org/whl/cu$CUDA && \ python3 -m pip install --no-cache-dir "causal_conv1d @ git+https://github.com/Dao-AILab/causal-conv1d.git@main" && \ python3 -m pip install --no-cache-dir "mamba_ssm @ git+https://github.com/state-spaces/mamba.git@main"