Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/snakes-on-a-by…
Browse files Browse the repository at this point in the history
…te-transport
  • Loading branch information
thorstenhater committed Aug 2, 2023
2 parents a384236 + cfed35d commit af63408
Show file tree
Hide file tree
Showing 11 changed files with 110 additions and 104 deletions.
1 change: 1 addition & 0 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Benchmarks
on:
pull_request:
branches: [ master ]
paths-ignore: 'doc/**'

jobs:
build:
Expand Down
File renamed without changes.
28 changes: 0 additions & 28 deletions .github/workflows/check-submodules.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/sanitize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Sanitize
on:
pull_request:
branches: [ master ]
paths-ignore: 'doc/**'

jobs:
build:
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/test-docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Test docs

on:
push:
branches: [ master ]
paths: 'doc/**'
pull_request:
branches: [ master ]
paths: 'doc/**'

jobs:
testdocs:
name: "Docs build test"
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
python-version: [3.7]
steps:
- name: Set up cmake
uses: jwlawson/[email protected]
with:
cmake-version: ${{ matrix.config.cmake }}
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Update pip and setup venv
run: python -m pip install --upgrade pip && python -m venv ~/env && . ~/env/bin/activate && echo "PATH=$PATH" >> $GITHUB_ENV
- name: Clone w/ submodules
uses: actions/checkout@v3
with:
submodules: recursive
- name: Install Python packages
run: python -m pip install -r doc/requirements.txt -U
- name: Build Arbor Docs
run: |
mkdir build
cd build
cmake .. -DARB_WITH_PYTHON=ON -DPython3_EXECUTABLE=`which python` -DARB_USE_BUNDLED_LIBS=ON
make html
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
name: Test Everything
name: Test Matrix

on:
push:
branches: [ master ]
paths-ignore: 'doc/**'
pull_request:
branches: [ master ]
paths-ignore: 'doc/**'

jobs:
testallconfigs:
Expand Down Expand Up @@ -191,67 +193,3 @@ jobs:
# run: scripts/run_python_examples.sh
- name: Test executables
run: ./scripts/test_executables.sh
testpip:
name: "Pip build test + Python examples test"
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
python-version: [3.7]
steps:
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Clone w/ submodules
uses: actions/checkout@v3
with:
submodules: recursive
- name: Update pip and setup venv
run: python -m pip install --upgrade pip && python -m venv ~/env && . ~/env/bin/activate && echo PATH=$PATH >> $GITHUB_ENV
- name: Debug info Python
run: |
which python
python --version
pip --version
- name: Build and install Arbor using pip + build flags
run: CMAKE_ARGS="-DARB_VECTORIZE=ON -DARB_ARCH=native" pip install . --user
- name: Check that build flags match
run: |
python -c "import arbor; print(arbor.config())" | grep -q "'arch': 'native'"
- name: Run Python tests
run: python -m unittest discover -v -s python
- name: Run Python examples
run: scripts/run_python_examples.sh
- name: Test executables
run: scripts/test_executables.sh
testdocs:
name: "Docs build test"
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
python-version: [3.7]
steps:
- name: Set up cmake
uses: jwlawson/[email protected]
with:
cmake-version: ${{ matrix.config.cmake }}
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Update pip and setup venv
run: python -m pip install --upgrade pip && python -m venv ~/env && . ~/env/bin/activate && echo "PATH=$PATH" >> $GITHUB_ENV
- name: Clone w/ submodules
uses: actions/checkout@v3
with:
submodules: recursive
- name: Install Python packages
run: python -m pip install -r doc/requirements.txt -U
- name: Build Arbor Docs
run: |
mkdir build
cd build
cmake .. -DARB_WITH_PYTHON=ON -DPython3_EXECUTABLE=`which python` -DARB_USE_BUNDLED_LIBS=ON
make html
44 changes: 44 additions & 0 deletions .github/workflows/test-pip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Test pip

on:
push:
branches: [ master ]
paths-ignore: 'doc/**'
pull_request:
branches: [ master ]
paths-ignore: 'doc/**'

jobs:
testpip:
name: "Pip build test + Python examples test"
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
python-version: [3.7]
steps:
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Clone w/ submodules
uses: actions/checkout@v3
with:
submodules: recursive
- name: Update pip and setup venv
run: python -m pip install --upgrade pip && python -m venv ~/env && . ~/env/bin/activate && echo PATH=$PATH >> $GITHUB_ENV
- name: Debug info Python
run: |
which python
python --version
pip --version
- name: Build and install Arbor using pip + build flags
run: CMAKE_ARGS="-DARB_VECTORIZE=ON -DARB_ARCH=native" pip install . --user
- name: Check that build flags match
run: |
python -c "import arbor; print(arbor.config())" | grep -q "'arch': 'native'"
- name: Run Python tests
run: python -m unittest discover -v -s python
- name: Run Python examples
run: scripts/run_python_examples.sh
- name: Test executables
run: scripts/test_executables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ name: Spack
on:
push:
branches: [ master ]
paths-ignore: 'doc/**'
pull_request:
branches: [ master ]
paths-ignore: 'doc/**'

jobs:
build:
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[![ci](https://github.com/arbor-sim/arbor/actions/workflows/test-everything.yml/badge.svg)](https://github.com/arbor-sim/arbor/actions/workflows/test-everything.yml)
[![pythonwheels](https://github.com/arbor-sim/arbor/actions/workflows/release.yml/badge.svg)](https://github.com/arbor-sim/arbor/actions/workflows/release.yml)
[![ci](https://github.com/arbor-sim/arbor/actions/workflows/test-matrix.yml/badge.svg)](https://github.com/arbor-sim/arbor/actions/workflows/test-matrix.yml)
[![spack](https://github.com/arbor-sim/arbor/actions/workflows/test-spack.yml/badge.svg)](https://github.com/arbor-sim/arbor/actions/workflows/test-spack.yml)
[![pip](https://github.com/arbor-sim/arbor/actions/workflows/test-pip.yml/badge.svg)](https://github.com/arbor-sim/arbor/actions/workflows/test-pip.yml)
[![pythonwheels](https://github.com/arbor-sim/arbor/actions/workflows/build-pip-wheels.yml/badge.svg)](https://github.com/arbor-sim/arbor/actions/workflows/build-pip-wheels.yml)
[![gitpod](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/arbor-sim/arbor)
[![docs](https://readthedocs.org/projects/arbor/badge/?version=latest)](https://docs.arbor-sim.org/en/latest/)
[![gitter](https://badges.gitter.im/arbor-sim/community.svg)](https://gitter.im/arbor-sim/community)
Expand Down
16 changes: 11 additions & 5 deletions doc/index.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
Arbor
=====

|ci| |pythonwheels| |zlatest| |gitter| |matrix|
|ci| |spack| |pip| |pythonwheels| |zlatest| |gitter| |matrix|

.. |ci| image:: https://github.com/arbor-sim/arbor/actions/workflows/test-everything.yml/badge.svg
:target: https://github.com/arbor-sim/arbor/actions/workflows/test-everything.yml
.. |ci| image:: https://github.com/arbor-sim/arbor/actions/workflows/test-matrix.yml/badge.svg
:target: https://github.com/arbor-sim/arbor/actions/workflows/test-matrix.yml

.. |pythonwheels| image:: https://github.com/arbor-sim/arbor/actions/workflows/release.yml/badge.svg
:target: https://github.com/arbor-sim/arbor/actions/workflows/release.yml
.. |spack| image:: https://github.com/arbor-sim/arbor/actions/workflows/test-spack.yml/badge.svg
:target: https://github.com/arbor-sim/arbor/actions/workflows/test-spack.yml

.. |pip| image:: https://github.com/arbor-sim/arbor/actions/workflows/test-pip.yml/badge.svg
:target: https://github.com/arbor-sim/arbor/actions/workflows/test-pip.yml

.. |pythonwheels| image:: https://github.com/arbor-sim/arbor/actions/workflows/build-pip-wheels.yml/badge.svg
:target: https://github.com/arbor-sim/arbor/actions/workflows/build-pip-wheels.yml

.. |gitter| image:: https://badges.gitter.im/arbor-sim/community.svg
:target: https://gitter.im/arbor-sim/community
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,10 @@ build-backend = "scikit_build_core.build"

[tool.cibuildwheel]
build-frontend = "build"
build = ["cp3*-*linux*","cp3*-macosx*"]
skip = ["cp36*", "pp*", "*musllinux*"]
build = ["*linux*","*macosx*"]
skip = ["cp36*", "*musllinux*"]
test-command = "python -m unittest discover -v -s {project}/python"
before-build = "python -m pip install pip --upgrade"
before-test = "python -m pip install pip --upgrade"
dependency-versions = "latest"

[tool.cibuildwheel.macos]
archs = ["universal2"]
Expand Down

0 comments on commit af63408

Please sign in to comment.