From cac9e54f04543b6ef3bfd7275286f1ecba63e10f Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Mar 2021 17:18:21 -0500 Subject: [PATCH 1/4] Upload benchmark results to documentation website --- .gitlab-ci.yml | 32 +++++++++++++++++++++++++++----- README.rst | 4 +--- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40517d54..577df673 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,12 @@ # reports: # junit: test/pytest.xml +stages: + - test + - deploy + Pytest POCL: + stage: test script: - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread @@ -34,6 +39,7 @@ Pytest POCL: junit: test/pytest.xml Pytest Titan V: + stage: test script: - py_version=3 - export PYOPENCL_TEST=nvi:titan @@ -51,6 +57,7 @@ Pytest Titan V: junit: test/pytest.xml Pytest Conda: + stage: test script: # Disable caching to ensure SymEngine code generation is exercised. - export SUMPY_NO_CACHE=1 @@ -68,6 +75,7 @@ Pytest Conda: junit: test/pytest.xml Pytest POCL Titan V: + stage: test script: # Disable caching to ensure SymEngine code generation is exercised. - export SUMPY_NO_CACHE=1 @@ -85,6 +93,7 @@ Pytest POCL Titan V: junit: test/pytest.xml Examples Conda: + stage: test script: | grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml @@ -99,14 +108,26 @@ Examples Conda: - tags Documentation: - script: - - EXTRA_INSTALL="pybind11 numpy mako" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh - - ". ./build-docs.sh" + stage: deploy + script: | + EXTRA_INSTALL="pybind11 numpy mako" + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh + . ci-support.sh + build_py_project_in_venv + pushd $PWD + build_docs + popd + if [[ -d ~/.scicomp-benchmarks/asv/$PROJECT ]]; then + cp -rf ~/.scicomp-benchmarks/asv/$PROJECT docs/_build/html/benchmarks/ + fi + maybe_upload_docs + tags: - - python3 + - linux + - benchmark Flake8: + stage: test script: - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh - . ./prepare-and-run-flake8.sh "$CI_PROJECT_NAME" test examples benchmarks @@ -116,6 +137,7 @@ Flake8: - tags Benchmarks: + stage: test script: - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - PROJECT=sumpy diff --git a/README.rst b/README.rst index 7d4041be..3c5bf836 100644 --- a/README.rst +++ b/README.rst @@ -35,6 +35,4 @@ Resources: * `documentation `_ * `source code via git `_ - -If you can see inside the UIUC firewall, you may browse -`benchmark results `_. +* `benchmarks `_ -- GitLab From 98516280f674839cd5098709528a03228f383a3e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Mar 2021 17:51:55 -0500 Subject: [PATCH 2/4] Fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 577df673..3033a315 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,7 +118,7 @@ Documentation: build_docs popd if [[ -d ~/.scicomp-benchmarks/asv/$PROJECT ]]; then - cp -rf ~/.scicomp-benchmarks/asv/$PROJECT docs/_build/html/benchmarks/ + cp -rf ~/.scicomp-benchmarks/asv/$PROJECT docs/_build/html/benchmarks fi maybe_upload_docs -- GitLab From 7bd51e8d13f7cbaa2160828fd621af5fbfeaf5dc Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Mar 2021 18:32:41 -0500 Subject: [PATCH 3/4] Typo. docs->doc --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3033a315..0f522beb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,7 +118,7 @@ Documentation: build_docs popd if [[ -d ~/.scicomp-benchmarks/asv/$PROJECT ]]; then - cp -rf ~/.scicomp-benchmarks/asv/$PROJECT docs/_build/html/benchmarks + cp -rf ~/.scicomp-benchmarks/asv/$PROJECT doc/_build/html/benchmarks fi maybe_upload_docs -- GitLab From 6e01c7b45d07e0a027ac03954aca1dc30d61bdca Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 25 Mar 2021 18:41:15 -0500 Subject: [PATCH 4/4] Tell asv that the default branch is now main --- asv.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asv.conf.json b/asv.conf.json index 4c34933d..800817d6 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -20,7 +20,7 @@ // List of branches to benchmark. If not provided, defaults to "master" // (for git) or "default" (for mercurial). - // "branches": ["master"], // for git + "branches": ["main"], // for git // "branches": ["default"], // for mercurial // The DVCS being used. If not set, it will be automatically -- GitLab