Skip to content

No longer use ASV --strict #5496

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 1 commit into from
Sep 13, 2023
Merged

No longer use ASV --strict #5496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions benchmarks/bm_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@

# Common ASV arguments for all run_types except `custom`.
ASV_HARNESS = (
"run {posargs} --attribute rounds=4 --interleave-rounds --strict "
"--show-stderr"
"run {posargs} --attribute rounds=4 --interleave-rounds --show-stderr"
)


Expand Down Expand Up @@ -501,14 +500,19 @@ def csperf(
asv_command = (
ASV_HARNESS.format(posargs=commit_range) + f" --bench={run_type}"
)
# C/SPerf benchmarks are much bigger than the CI ones:
# Don't fail the whole run if memory blows on 1 benchmark.
asv_command = asv_command.replace(" --strict", "")

# Only do a single round.
asv_command = shlex.split(
re.sub(r"rounds=\d", "rounds=1", asv_command)
)
_subprocess_runner([*asv_command, *args.asv_args], asv=True)
try:
_subprocess_runner([*asv_command, *args.asv_args], asv=True)
except subprocess.CalledProcessError as err:
# C/SPerf benchmarks are much bigger than the CI ones:
# Don't fail the whole run if memory blows on 1 benchmark.
# ASV produces return code of 2 if the run includes crashes.
if err.returncode != 2:
raise

asv_command = shlex.split(
f"publish {commit_range} --html-dir={publish_subdir}"
Expand Down
3 changes: 3 additions & 0 deletions docs/src/whatsnew/latest.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ This document explains the changes made to Iris for this release
working properly. (Main pull request: :pull:`5437`, more detail:
:pull:`5430`, :pull:`5431`, :pull:`5432`, :pull:`5434`, :pull:`5436`)

#. `@trexfeathers`_ adapted benchmarking to work with ASV ``>=v0.6`` by no
longer using the ``--strict`` argument. (:pull:`5496`)


.. comment
Whatsnew author names (@github name) in alphabetical order. Note that,
Expand Down