From 400120af2dec9beecbcdd3834d3a9959201d331d Mon Sep 17 00:00:00 2001 From: Dan Saunders Date: Fri, 29 Aug 2025 21:58:35 -0400 Subject: [PATCH] wip --- .github/workflows/docs.yml | 8 ++++-- .github/workflows/lint.yml | 1 - .github/workflows/multi-gpu-e2e.yml | 9 ++++--- .github/workflows/precommit-autoupdate.yml | 7 ++++- .github/workflows/preview-docs.yml | 9 +++++-- .github/workflows/pypi.yml | 11 +++++--- .github/workflows/tests-nightly.yml | 31 +++++++++------------- 7 files changed, 45 insertions(+), 31 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5b5cc5489..989b2102e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -20,10 +20,14 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.11' + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + version: "latest" - name: Install dependencies run: | - python3 -m pip install jupyter quartodoc - python3 -m pip install -e . + uv pip install jupyter quartodoc + uv pip install -e . - name: Build autodoc run: quartodoc build - name: Publish to GitHub Pages (and render) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cf322f105..95a41fbf8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -23,5 +23,4 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.11" - cache: 'pip' # caching pip dependencies - uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/multi-gpu-e2e.yml b/.github/workflows/multi-gpu-e2e.yml index 05f9e0761..9450764e0 100644 --- a/.github/workflows/multi-gpu-e2e.yml +++ b/.github/workflows/multi-gpu-e2e.yml @@ -56,13 +56,16 @@ jobs: uses: actions/setup-python@v5 with: python-version: "3.11" + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + version: "latest" - name: Install Modal run: | - python -m pip install --upgrade pip - pip install modal==1.0.2 jinja2 + uv pip install modal==1.0.2 jinja2 - name: Update env vars run: | - echo "BASE_TAG=main-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV + echo "BASE_TAG=main-base-uv-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV echo "PYTORCH_VERSION=${{ matrix.pytorch}}" >> $GITHUB_ENV echo "AXOLOTL_ARGS=${{ matrix.axolotl_args}}" >> $GITHUB_ENV echo "AXOLOTL_EXTRAS=${{ matrix.axolotl_extras}}" >> $GITHUB_ENV diff --git a/.github/workflows/precommit-autoupdate.yml b/.github/workflows/precommit-autoupdate.yml index 10330f955..2f93dc30a 100644 --- a/.github/workflows/precommit-autoupdate.yml +++ b/.github/workflows/precommit-autoupdate.yml @@ -18,10 +18,15 @@ jobs: with: python-version: '3.11' + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + version: "latest" + - name: Update pre-commit hooks id: update run: | - pip install pre-commit + uv pip install pre-commit pre-commit autoupdate if [[ -n $(git status --porcelain) ]]; then echo "changes=true" >> $GITHUB_OUTPUT diff --git a/.github/workflows/preview-docs.yml b/.github/workflows/preview-docs.yml index db4abddce..4c8fbe977 100644 --- a/.github/workflows/preview-docs.yml +++ b/.github/workflows/preview-docs.yml @@ -40,10 +40,15 @@ jobs: with: python-version: '3.11' + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + version: "latest" + - name: Install dependencies run: | - python3 -m pip install jupyter quartodoc - python3 -m pip install -e . + uv pip install jupyter quartodoc + uv pip install -e . - name: Build autodoc run: quartodoc build diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 24e3c497d..f16a65c58 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -38,11 +38,16 @@ jobs: with: python-version: "3.11" + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + version: "latest" + - name: Install dependencies run: | - pip3 install wheel packaging==23.2 - pip3 install --no-build-isolation -e . - pip3 install -r requirements-dev.txt -r requirements-tests.txt + uv pip install wheel packaging==23.2 + uv pip install --no-build-isolation -e . + uv pip install -r requirements-dev.txt -r requirements-tests.txt - name: Extract tag name id: tag diff --git a/.github/workflows/tests-nightly.yml b/.github/workflows/tests-nightly.yml index fc6c2b396..c4ea26510 100644 --- a/.github/workflows/tests-nightly.yml +++ b/.github/workflows/tests-nightly.yml @@ -13,7 +13,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.11" - cache: 'pip' # caching pip dependencies - uses: pre-commit/action@v3.0.1 env: SKIP: no-commit-to-branch @@ -43,16 +42,15 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python_version }} - cache: 'pip' # caching pip dependencies - - name: upgrade pip - run: | - pip3 install --upgrade pip - pip3 install --upgrade packaging==23.2 setuptools==75.8.0 wheel + - name: Install uv + uses: astral-sh/setup-uv@v4 + with: + version: "latest" - name: Install PyTorch run: | - pip3 install torch==${{ matrix.pytorch_version }} torchvision + uv pip install torch==${{ matrix.pytorch_version }} torchvision - name: Update requirements.txt run: | @@ -64,11 +62,11 @@ jobs: - name: Install dependencies run: | - pip3 show torch - pip3 install --no-build-isolation -U -e . - python scripts/unsloth_install.py | sh - python scripts/cutcrossentropy_install.py | sh - pip3 install -r requirements-dev.txt -r requirements-tests.txt + uv pip show torch + uv pip install --no-build-isolation -U -e . + python scripts/unsloth_install.py --uv | sh + python scripts/cutcrossentropy_install.py --uv | sh + uv pip install -r requirements-dev.txt -r requirements-tests.txt - name: Make sure PyTorch version wasn't clobbered run: | @@ -84,9 +82,6 @@ jobs: pytest -v --durations=10 tests/patched/ pytest -v --durations=10 tests/cli/ - - name: cleanup pip cache - run: | - find "$(pip cache dir)/http-v2" -type f -mtime +14 -exec rm {} \; docker-e2e-tests: if: github.repository_owner == 'axolotl-ai-cloud' @@ -122,8 +117,7 @@ jobs: python-version: "3.11" - name: Install Modal run: | - python -m pip install --upgrade pip - pip install modal==1.0.2 jinja2 + uv pip install modal==1.0.2 jinja2 - name: Update env vars run: | echo "BASE_TAG=main-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV @@ -164,8 +158,7 @@ jobs: python-version: "3.11" - name: Install Modal run: | - python -m pip install --upgrade pip - pip install modal==1.0.2 jinja2 + uv pip install modal==1.0.2 jinja2 - name: Update env vars run: | echo "BASE_TAG=main-base-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV