Skip to content

Commit

Permalink
Merge pull request #17736 from seiko2plus/issue_17716
Browse files Browse the repository at this point in the history
BUG, Benchmark: fix passing optimization build options to asv
  • Loading branch information
mattip committed Dec 16, 2020
2 parents c4693fe + 11728e8 commit d7a75e8
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
4 changes: 3 additions & 1 deletion benchmarks/asv_compare.conf.json.tpl
Expand Up @@ -78,7 +78,9 @@

"build_command" : [
"python setup.py build {numpy_build_options}",
"PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}"
// pip ignores '--global-option' when pep517 is enabled, we also enabling pip verbose to
// be reached from asv `--verbose` so we can verify the build options.
"PIP_NO_BUILD_ISOLATION=false python {build_dir}/benchmarks/asv_pip_nopep517.py -v {numpy_global_options} --no-deps --no-index -w {build_cache_dir} {build_dir}"
],
// The commits after which the regression search in `asv publish`
// should start looking for regressions. Dictionary whose keys are
Expand Down
15 changes: 15 additions & 0 deletions benchmarks/asv_pip_nopep517.py
@@ -0,0 +1,15 @@
"""
This file is used by asv_compare.conf.json.tpl.
"""
import subprocess, sys
# pip ignores '--global-option' when pep517 is enabled therefore we disable it.
cmd = [sys.executable, '-mpip', 'wheel', '--no-use-pep517']
try:
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, universal_newlines=True)
except Exception as e:
output = str(e.output)
if "no such option" in output:
print("old version of pip, escape '--no-use-pep517'")
cmd.pop()

subprocess.run(cmd + sys.argv[1:])
1 change: 1 addition & 0 deletions runtests.py
Expand Up @@ -524,6 +524,7 @@ def asv_compare_config(bench_path, args, h_commits):

is_cached = asv_substitute_config(conf_path, nconf_path,
numpy_build_options = ' '.join([f'\\"{v}\\"' for v in build]),
numpy_global_options= ' '.join([f'--global-option=\\"{v}\\"' for v in ["build"] + build])
)
if not is_cached:
asv_clear_cache(bench_path, h_commits)
Expand Down

0 comments on commit d7a75e8

Please sign in to comment.