diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 61258a4eb..07048759c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -26,8 +26,8 @@ jobs: version: "latest" - name: Install dependencies run: | - uv pip --system install jupyter quartodoc - uv pip --system install -e . + uv pip install --system jupyter quartodoc + uv pip install --system -e . - name: Build autodoc run: quartodoc build - name: Publish to GitHub Pages (and render) diff --git a/.github/workflows/multi-gpu-e2e.yml b/.github/workflows/multi-gpu-e2e.yml index bc8515cfe..3d9e28f93 100644 --- a/.github/workflows/multi-gpu-e2e.yml +++ b/.github/workflows/multi-gpu-e2e.yml @@ -62,7 +62,7 @@ jobs: version: "latest" - name: Install Modal run: | - uv pip --system install modal==1.0.2 jinja2 + uv pip install --system modal==1.0.2 jinja2 - name: Update env vars run: | echo "BASE_TAG=main-base-uv-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV diff --git a/.github/workflows/precommit-autoupdate.yml b/.github/workflows/precommit-autoupdate.yml index 9d22a2645..42bf19f86 100644 --- a/.github/workflows/precommit-autoupdate.yml +++ b/.github/workflows/precommit-autoupdate.yml @@ -26,7 +26,7 @@ jobs: - name: Update pre-commit hooks id: update run: | - uv pip --system install pre-commit + uv pip install --system 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 831b73e29..7b22cbcfa 100644 --- a/.github/workflows/preview-docs.yml +++ b/.github/workflows/preview-docs.yml @@ -47,8 +47,8 @@ jobs: - name: Install dependencies run: | - uv pip --system install jupyter quartodoc - uv pip --system install -e . + uv pip install --system jupyter quartodoc + uv pip install --system -e . - name: Build autodoc run: quartodoc build diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index a8ac970ac..79421ff97 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -45,9 +45,9 @@ jobs: - name: Install dependencies run: | - uv pip --system install wheel packaging==23.2 - uv pip --system install --no-build-isolation -e . - uv pip --system install -r requirements-dev.txt -r requirements-tests.txt + uv pip install --system wheel packaging==23.2 + uv pip install --system --no-build-isolation -e . + uv pip install --system -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 ffdad1833..df57fdad8 100644 --- a/.github/workflows/tests-nightly.yml +++ b/.github/workflows/tests-nightly.yml @@ -50,7 +50,7 @@ jobs: - name: Install PyTorch run: | - uv pip --system install torch==${{ matrix.pytorch_version }} torchvision + uv pip install --system torch==${{ matrix.pytorch_version }} torchvision - name: Update requirements.txt run: | @@ -62,11 +62,11 @@ jobs: - name: Install dependencies run: | - uv pip --system show torch - uv pip --system install --no-build-isolation -U -e . + uv pip show --system torch + uv pip install --system --no-build-isolation -U -e . python scripts/unsloth_install.py --uv | sh python scripts/cutcrossentropy_install.py --uv | sh - uv pip --system install -r requirements-dev.txt -r requirements-tests.txt + uv pip install --system -r requirements-dev.txt -r requirements-tests.txt - name: Make sure PyTorch version wasn't clobbered run: | @@ -115,12 +115,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: | - uv pip --system install modal==1.0.2 jinja2 + uv pip install --system 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 @@ -156,12 +160,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: | - uv pip --system install modal==1.0.2 jinja2 + uv pip install --system 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/tests.yml b/.github/workflows/tests.yml index 40ebb5195..8541ea436 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -79,15 +79,15 @@ jobs: - name: Install PyTorch run: | - uv pip --system install torch==${{ matrix.pytorch_version }} torchvision + uv pip install --system torch==${{ matrix.pytorch_version }} torchvision - name: Install dependencies run: | - uv pip --system show torch - uv pip --system install --no-build-isolation -U -e . + uv pip show --system torch + uv pip install --system --no-build-isolation -U -e . python scripts/unsloth_install.py --uv | sh python scripts/cutcrossentropy_install.py --uv | sh - uv pip --system install -r requirements-dev.txt -r requirements-tests.txt + uv pip install --system -r requirements-dev.txt -r requirements-tests.txt - name: Make sure PyTorch version wasn't clobbered run: | @@ -150,17 +150,17 @@ jobs: - name: Install PyTorch run: | - uv pip --system install torch==${{ matrix.pytorch_version }} torchvision + uv pip install --system torch==${{ matrix.pytorch_version }} torchvision - name: Install dependencies run: | - uv pip --system show torch - uv pip --system install build + uv pip show --system torch + uv pip install --system build python -m build --no-isolation --sdist - uv pip --system install --no-build-isolation dist/axolotl*.tar.gz + uv pip install --system --no-build-isolation dist/axolotl*.tar.gz python scripts/unsloth_install.py --uv | sh python scripts/cutcrossentropy_install.py --uv | sh - uv pip --system install -r requirements-dev.txt -r requirements-tests.txt + uv pip install --system -r requirements-dev.txt -r requirements-tests.txt - name: Make sure PyTorch version wasn't clobbered run: | @@ -249,7 +249,7 @@ jobs: version: "latest" - name: Install Modal run: | - uv pip --system install modal==1.0.2 jinja2 + uv pip install --system modal==1.0.2 jinja2 - name: Update env vars run: | echo "BASE_TAG=main-base-uv-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV @@ -313,7 +313,7 @@ jobs: version: "latest" - name: Install Modal run: | - uv pip --system install modal==1.0.2 jinja2 + uv pip install --system modal==1.0.2 jinja2 - name: Update env vars run: | echo "BASE_TAG=main-base-uv-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV @@ -359,7 +359,7 @@ jobs: version: "latest" - name: Install Modal run: | - uv pip --system install modal==1.0.2 jinja2 + uv pip install --system modal==1.0.2 jinja2 - name: Update env vars run: | echo "BASE_TAG=main-base-uv-py${{ matrix.python_version }}-cu${{ matrix.cuda }}-${{ matrix.pytorch }}" >> $GITHUB_ENV