diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ed6235ee57e4537239c2607252d02bc5e2f5f87..69ead27ef685fd46077d9cadcac212b427fcb444 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: push: branches: - - master + - main pull_request: schedule: - cron: '17 3 * * 0' @@ -19,7 +19,7 @@ jobs: python-version: '3.x' - name: "Main Script" run: | - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh . ./prepare-and-run-flake8.sh "$(basename $GITHUB_REPOSITORY)" ./test examples pylint: @@ -32,7 +32,7 @@ jobs: sed 's/python=3/python=3.7/' .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml USE_CONDA_BUILD=1 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh . ./prepare-and-run-pylint.sh "$(basename $GITHUB_REPOSITORY)" test/test_*.py pytest: @@ -43,7 +43,7 @@ jobs: - name: "Main Script" run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh . ./build-and-test-py-project-within-miniconda.sh pytest_no_arg_check: @@ -54,7 +54,7 @@ jobs: - name: "Main Script" run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh export _LOOPY_SKIP_ARG_CHECKS=1 . ./build-and-test-py-project-within-miniconda.sh @@ -66,7 +66,7 @@ jobs: - name: "Main Script" run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh . ./ci-support.sh build_py_project_in_conda_env ( test_py_project ) @@ -81,7 +81,7 @@ jobs: run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml EXTRA_INSTALL="matplotlib ipykernel nbconvert" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh . ./ci-support.sh build_py_project_in_conda_env @@ -107,7 +107,7 @@ jobs: - name: "Main Script" run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh . ci-support.sh build_py_project_in_conda_env build_docs @@ -137,7 +137,7 @@ jobs: sed -i "/mpi4py/ d" requirements.txt - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh . ./ci-support.sh build_py_project_in_conda_env test_py_project diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4886d47d90bbdf4659b1f5b3fab1b9ca90470f24..07a0492393048c64d93df70f800b7da4e3d1861f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ Python 3 POCL: - export PYOPENCL_TEST=portable:pthread - export EXTRA_INSTALL="pybind11 numpy mako" - export LOOPY_NO_CACHE=1 - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - python3 @@ -22,7 +22,7 @@ Python 3 POCL without arg check: - export EXTRA_INSTALL="pybind11 numpy mako" - export LOOPY_NO_CACHE=1 - export _LOOPY_SKIP_ARG_CHECKS=1 - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - python3 @@ -41,7 +41,7 @@ Python 3 Intel: - export LOOPY_NO_CACHE=1 - export LOOPY_INTEL_CL_OK_FOR_TEST_REF=1 - source /opt/enable-intel-cl.sh - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - python3 @@ -58,7 +58,7 @@ Python 3 POCL Twice With Cache: export PY_EXE=python3 export PYOPENCL_TEST=portable:pthread export EXTRA_INSTALL="pybind11 numpy mako" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh . ./ci-support.sh build_py_project_in_venv ( test_py_project ) @@ -78,7 +78,7 @@ Python 3 POCL Twice With Cache: # - export PY_EXE=pypy # - export PYOPENCL_TEST=portable:pthread # - export EXTRA_INSTALL="pybind11 numpy mako" -# - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh +# - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh # - ". ./build-and-test-py-project.sh" # tags: # - pypy @@ -92,7 +92,7 @@ Python 3 POCL Examples: export PYOPENCL_TEST=portable:pthread export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib ipykernel nbconvert" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh . ./ci-support.sh build_py_project_in_venv @@ -118,7 +118,7 @@ Pylint: - PROJECT_INSTALL_FLAGS="--editable" - export PY_EXE=python3 - EXTRA_INSTALL="pybind11 numpy mako matplotlib ipykernel ply fparser" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh - . ./prepare-and-run-pylint.sh "$CI_PROJECT_NAME" test/test_*.py tags: - python3 @@ -128,14 +128,14 @@ Pylint: Documentation: script: - EXTRA_INSTALL="pybind11 numpy" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh - ". ./build-docs.sh" tags: - python3 Flake8: script: - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh + - 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 tags: - python3 diff --git a/README.rst b/README.rst index 46204c29e166f86e170441ee1b54fc51def5f844..61cdfb02cbe9bdc33d9fda6022d75fa62c178040 100644 --- a/README.rst +++ b/README.rst @@ -1,12 +1,12 @@ Loopy: Transformation-Based Generation of High-Performance CPU/GPU Code ======================================================================= -.. image:: https://gitlab.tiker.net/inducer/loopy/badges/master/pipeline.svg +.. image:: https://gitlab.tiker.net/inducer/loopy/badges/main/pipeline.svg :alt: Gitlab Build Status - :target: https://gitlab.tiker.net/inducer/loopy/commits/master -.. image:: https://github.com/inducer/loopy/workflows/CI/badge.svg?branch=master&event=push + :target: https://gitlab.tiker.net/inducer/loopy/commits/main +.. image:: https://github.com/inducer/loopy/workflows/CI/badge.svg?branch=main&event=push :alt: Github Build Status - :target: https://github.com/inducer/loopy/actions?query=branch%3Amaster+workflow%3ACI+event%3Apush + :target: https://github.com/inducer/loopy/actions?query=branch%3Amain+workflow%3ACI+event%3Apush .. image:: https://badge.fury.io/py/loopy.png :alt: Python Package Index Release Page :target: https://pypi.org/project/loopy/