Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reverting optional task for v0.11 [wip] #1856

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci-integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ jobs:
- name: Install all dependencies
run: |
set -e
pip install -r requirements/test.txt
pip install -r requirements/integrate.txt --find-links $PYTORCH_URL --upgrade-strategy eager
python ./requirements/adjust-versions.py requirements.txt
python ./requirements/adjust-versions.py requirements/image.txt
curl https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py -o adjust-torch-versions.py
pip install -r requirements/test.txt -r requirements/integrate.txt \
--find-links $PYTORCH_URL --upgrade-strategy eager
python adjust-torch-versions.py requirements.txt
python adjust-torch-versions.py requirements/image.txt
cat requirements.txt
pip install -e . --find-links $PYTORCH_URL
pip list
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-tests-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ jobs:
- name: Set PyTorch version
if: inputs.requires != 'oldest'
run: |
pip install packaging
python ./requirements/adjust-versions.py requirements.txt ${{ matrix.pytorch-version }}
curl https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py \
-o adjust-torch-versions.py
python adjust-torch-versions.py requirements.txt ${{ matrix.pytorch-version }}

- uses: ./.github/actions/caching
with:
Expand All @@ -107,8 +108,7 @@ jobs:

- name: Install all dependencies
run: |
python ./requirements/adjust-versions.py requirements.txt
python ./requirements/adjust-versions.py requirements/image.txt
python adjust-torch-versions.py requirements/image.txt
pip install --requirement requirements/devel.txt -U --find-links $PYTORCH_URL
pip list

Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
Expand All @@ -38,27 +38,27 @@ repos:
- id: detect-private-key

- repo: https://github.com/asottile/pyupgrade
rev: v2.38.2
rev: v3.7.0
hooks:
- id: pyupgrade
args: [--py36-plus]
name: Upgrade code

- repo: https://github.com/PyCQA/docformatter
rev: v1.5.0
rev: v1.7.3
hooks:
- id: docformatter
args: [--in-place, --wrap-summaries=115, --wrap-descriptions=120]

- repo: https://github.com/PyCQA/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
name: imports
require_serial: false

- repo: https://github.com/psf/black
rev: 22.8.0
rev: 23.3.0
hooks:
- id: black
name: Format code
Expand All @@ -78,12 +78,12 @@ repos:
)$

- repo: https://github.com/asottile/yesqa
rev: v1.4.0
rev: v1.5.0
hooks:
- id: yesqa

- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
rev: 6.0.0
hooks:
- id: flake8
name: PEP8
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ docs: clean
python -m sphinx -b html -W --keep-going docs/source docs/build

env:
pip install -e .
python ./requirements/adjust-versions.py requirements/image.txt
export FREEZE_REQUIREMENTS=1
pip install -e . -U
pip install -r requirements/devel.txt

data:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ def metric_ddp(rank, world_size):
n_epochs = 5
# this shows iteration over multiple training epochs
for n in range(n_epochs):

# this will be replaced by a DataLoader with a DistributedSampler
n_batches = 10
for i in range(n_batches):
Expand Down
86 changes: 0 additions & 86 deletions requirements/adjust-versions.py

This file was deleted.

6 changes: 4 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ verbose = 2
format = pylint
# see: https://www.flake8rules.com/
ignore =
E731 # Do not assign a lambda expression, use a def
E203 # whitespace before ':'
# Do not assign a lambda expression, use a def
E731
# whitespace before ':'
E203


# setup.cfg or tox.ini
Expand Down
Loading
Loading