From 56b25f07833a5567da796c8040f764b471c81643 Mon Sep 17 00:00:00 2001 From: Isuru Fernando <isuruf@gmail.com> Date: Fri, 24 Aug 2018 08:41:35 -0500 Subject: [PATCH] Use ci-support benchmark script --- .gitlab-ci.yml | 9 +++------ benchmarks/run_asv.sh | 28 ---------------------------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100755 benchmarks/run_asv.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed8f5f40..d767ba51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,12 +104,9 @@ Benchmarks: script: - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - - rm -rf test - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh - - ". ./build-and-test-py-project-within-miniconda.sh" - - conda config --add channels conda-forge - - conda config --add channels inducer - - ./benchmarks/run_asv.sh + - PROJECT=sumpy + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-benchmark-py-project.sh + - ". ./build-and-benchmark-py-project.sh" tags: - linux - benchmark diff --git a/benchmarks/run_asv.sh b/benchmarks/run_asv.sh deleted file mode 100755 index 8489fb60..00000000 --- a/benchmarks/run_asv.sh +++ /dev/null @@ -1,28 +0,0 @@ -pip install asv - -if [[ ! -z "$CI" ]]; then - mkdir -p ~/.sumpy/asv - ln -s ~/.sumpy/asv .asv -fi - -asv machine --yes -asv setup --verbose -master_commit=`git rev-parse master` -test_commit=`git rev-parse HEAD` - -export PYOPENCL_CTX=port - -asv run $master_commit...$master_commit~ --skip-existing --verbose -asv run $test_commit...$test_commit~ --skip-existing --verbose - -output=`asv compare $master_commit $test_commit --factor 1 -s` -echo "$output" - -if [[ "$output" = *"worse"* ]]; then - echo "Some of the benchmarks have gotten worse" - exit 1 -fi - -if [[ ! -z "$CI" ]]; then - asv publish --html-dir ~/.scicomp-benchmarks/asv/sumpy -fi -- GitLab