Skip to content

Revert "[CI] Comment flaky tests (#10084)" #10580

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jan 3, 2022
Merged

Revert "[CI] Comment flaky tests (#10084)" #10580

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95064ec
Revert "[CI] Comment flaky tests (#10084)"
akihironitta Nov 17, 2021
4aa3312
Empty commit to rerun CI
akihironitta Nov 17, 2021
73225bb
Merge branch 'master' into tests/remove-random-from-conda
akihironitta Nov 18, 2021
a8ca439
Temporarily 75 min timeout
akihironitta Nov 18, 2021
1dbb6c1
Merge branch 'master' into tests/remove-random-from-conda
akihironitta Dec 22, 2021
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
6 changes: 3 additions & 3 deletions .github/workflows/ci_test-conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ jobs:
python-version: ["3.8"] # previous to last Python version as that one is already used in test-full
pytorch-version: ["1.7", "1.8", "1.9", "1.10"] # nightly: add when there's a release candidate

timeout-minutes: 35
# FIXME: undo this before merge
timeout-minutes: 75
steps:
- uses: actions/checkout@v2

Expand All @@ -29,7 +30,6 @@ jobs:
python ./requirements/adjust_versions.py requirements/extra.txt
python ./requirements/adjust_versions.py requirements/examples.txt
pip install --requirement requirements/devel.txt --find-links https://download.pytorch.org/whl/nightly/torch_nightly.html
pip install pytest-random-order
pip list

- name: Pull checkpoints from S3
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Tests
run: |
# NOTE: run coverage on tests does not propagate failure status for Win, https://github.com/nedbat/coveragepy/issues/1003
coverage run --source pytorch_lightning -m pytest --random-order-seed=1 pytorch_lightning tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml
coverage run --source pytorch_lightning -m pytest pytorch_lightning tests -v --durations=50 --junitxml=junit/test-results-${{ runner.os }}-torch${{ matrix.pytorch-version }}.xml
shell: bash -l {0}

- name: Upload pytest results
Expand Down
1 change: 0 additions & 1 deletion tests/profiler/test_profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ def test_pytorch_profiler_trainer_ddp(tmpdir, pytorch_profiler):
assert any(f"{local_rank}-validation_step" in f for f in files)


@RunIf(special=True)
@pytest.mark.parametrize("fast_dev_run", [1, 2, 3, 4, 5])
@pytest.mark.parametrize("boring_model_cls", [ManualOptimBoringModel, BoringModel])
def test_pytorch_profiler_trainer_fit(fast_dev_run, boring_model_cls, tmpdir):
Expand Down