Fix benchmarks

This commit is contained in:
Michael Droettboom 2018-08-03 13:10:18 -04:00
parent 2d0b9ee23a
commit 9f72505eff
2 changed files with 8 additions and 7 deletions

View File

@ -1,11 +1,13 @@
import json import json
import os
from pathlib import Path from pathlib import Path
import re import re
import subprocess import subprocess
import sys import sys
sys.path.insert(0, (Path(__file__).parent.parent / 'test').resolve()) sys.path.insert(
0, str((Path(__file__).resolve().parent.parent / 'test')))
print(sys.path)
import conftest import conftest
@ -16,10 +18,10 @@ SKIP = set(['fft', 'hyantes'])
def run_native(hostpython, code): def run_native(hostpython, code):
output = subprocess.check_output( output = subprocess.check_output(
[hostpython.resolve(), '-c', code], [hostpython.resolve(), '-c', code],
cwd=os.path.dirname(__file__), cwd=Path(__file__).resolve().parent,
env={ env={
'PYTHONPATH': 'PYTHONPATH':
str((Path(__file__).parent.parent / 'src').resolve()) str(Path(__file__).resolve().parent.parent / 'src')
} }
) )
return float(output.strip().split()[-1]) return float(output.strip().split()[-1])
@ -79,7 +81,7 @@ def get_numpy_benchmarks():
name = filename.name name = filename.name
if name in SKIP: if name in SKIP:
continue continue
content = parse_numpy_benchmark(root / filename) content = parse_numpy_benchmark(filename)
content += ( content += (
"import numpy as np\n" "import numpy as np\n"
"_ = np.empty(())\n" "_ = np.empty(())\n"
@ -105,6 +107,6 @@ def main(hostpython):
if __name__ == '__main__': if __name__ == '__main__':
results = main(sys.argv[-2]) results = main(Path(sys.argv[-2]).resolve())
with open(sys.argv[-1], 'w') as fp: with open(sys.argv[-1], 'w') as fp:
json.dump(results, fp) json.dump(results, fp)

View File

@ -35,7 +35,6 @@ def build_packages(packagesdir, outputdir):
# so first load in all of the package metadata and build a dependency map. # so first load in all of the package metadata and build a dependency map.
dependencies = {} dependencies = {}
for pkgdir in packagesdir.iterdir(): for pkgdir in packagesdir.iterdir():
pkgdir = packagesdir / pkgdir
pkgpath = pkgdir / 'meta.yaml' pkgpath = pkgdir / 'meta.yaml'
if pkgdir.is_dir() and pkgpath.is_file(): if pkgdir.is_dir() and pkgpath.is_file():
pkg = common.parse_package(pkgpath) pkg = common.parse_package(pkgpath)