Skip to content

Use all cores in CI-run pytest jobs #6215

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

Closed
wants to merge 4 commits into from
Closed

Use all cores in CI-run pytest jobs #6215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7941b0
Fix pytest randomly-seed to a constant
pavoljuhas Jul 22, 2023
85b790b
Temporarily skip broken test
pavoljuhas Jul 22, 2023
667181d
Use all logical CPUs when running pytest on GitHub actions
pavoljuhas Jul 22, 2023
3356737
Use the `-n logical` option for parallel pytest
pavoljuhas Jul 22, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ jobs:
- name: Run Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
- name: Pytest check
run: check/pytest --ignore=cirq-core/cirq/contrib --rigetti-integration
run: check/pytest -n logical --ignore=cirq-core/cirq/contrib --rigetti-integration
- name: Stop Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
2 changes: 1 addition & 1 deletion .github/workflows/ci-weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install requirements
run: pip install -r dev_tools/requirements/isolated-base.env.txt
- name: Notebook tests
run: check/pytest -n auto -m weekly dev_tools/notebooks/isolated_notebook_test.py -k ${{matrix.partition}}
run: check/pytest -n logical -m weekly dev_tools/notebooks/isolated_notebook_test.py -k ${{matrix.partition}}
- uses: actions/upload-artifact@v2
if: failure()
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Install changed files test dependencies
run: dev_tools/conf/pip-install-minimal-for-pytest-changed-files.sh
- name: Changed files test
run: check/pytest-changed-files -n auto
run: check/pytest-changed-files -n logical
lint:
name: Lint check
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
- name: Run Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
- name: Pytest check
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --rigetti-integration
run: check/pytest -n logical --ignore=cirq-core/cirq/contrib --rigetti-integration
- name: Stop Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
pip-compile:
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
- name: Run Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
- name: Coverage check
run: check/pytest-and-incremental-coverage -n auto --rigetti-integration
run: check/pytest-and-incremental-coverage -n logical --rigetti-integration
- name: Stop Quil dependencies
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
windows:
Expand All @@ -263,7 +263,7 @@ jobs:
- name: Pytest Windows
run: |
source dev_tools/pypath
check/pytest -n auto --ignore=cirq-core/cirq/contrib
check/pytest -n logical --ignore=cirq-core/cirq/contrib
shell: bash
macos:
name: Pytest MacOS
Expand All @@ -286,7 +286,7 @@ jobs:
pip install wheel
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
- name: Pytest check
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib
run: check/pytest -n logical --ignore=cirq-core/cirq/contrib
notebooks-stable:
name: Changed Notebooks Isolated Test against Cirq stable
env:
Expand All @@ -307,7 +307,7 @@ jobs:
- name: Install requirements
run: pip install -r dev_tools/requirements/isolated-base.env.txt
- name: Notebook tests
run: check/pytest -n auto -m slow dev_tools/notebooks/isolated_notebook_test.py -k ${{matrix.partition}}
run: check/pytest -n logical -m slow dev_tools/notebooks/isolated_notebook_test.py -k ${{matrix.partition}}
- uses: actions/upload-artifact@v2
if: failure()
with:
Expand All @@ -325,7 +325,7 @@ jobs:
- name: Install requirements
run: pip install -r dev_tools/requirements/notebooks.env.txt
- name: Notebook tests
run: check/pytest -n auto -m slow dev_tools/notebooks/notebook_test.py
run: check/pytest -n logical -m slow dev_tools/notebooks/notebook_test.py
- uses: actions/upload-artifact@v2
if: failure()
with:
Expand Down
2 changes: 1 addition & 1 deletion check/pytest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PYTEST_ARGS=( "-n=auto" "$@" )

source dev_tools/pypath

pytest "${PYTEST_ARGS[@]}"
pytest --randomly-seed=2803633978 "${PYTEST_ARGS[@]}"
RESULT=$?

if [ "$RESULT" = 5 ]; then
Expand Down
2 changes: 1 addition & 1 deletion check/pytest-changed-files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ fi

source dev_tools/pypath

pytest "${rest[@]}" "${changed[@]}"
pytest --randomly-seed=2803633978 "${rest[@]}" "${changed[@]}"
2 changes: 2 additions & 0 deletions dev_tools/bash_scripts_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ def run(
)


# TODO(#6215) - remove this skip
@pytest.mark.skip(reason="skip while using fixed randomly-seed")
@only_on_posix
def test_pytest_changed_files_file_selection(tmpdir_factory):
result = run(
Expand Down
2 changes: 1 addition & 1 deletion dev_tools/requirements/deps/pytest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pytest-randomly
coverage<=6.2

# for parallel testing notebooks
pytest-xdist~=2.2.0
pytest-xdist~=3.3.0
filelock~=3.0.12

# For testing time specific logic
Expand Down