Skip to content

v0.6.0 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 26 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2d0c815
Updates for JIT-options
jorgensd Sep 2, 2022
2dfcdf9
Update various plots and other minor things
jorgensd Nov 21, 2022
1e6a5d8
Merge branch 'dokken/jupyterbook' into dokken/release
jorgensd Jan 20, 2023
cc98222
Resolve meshsize issue at the right part of the ring (x>0,y=0) on pa…
jorgensd Jan 20, 2023
a90234d
Install jupyterbook from main
jorgensd Jan 20, 2023
9001c5f
Repin nbconvert. Resolve Issue on chapter2/ns_code2.html #105
jorgensd Jan 20, 2023
8fd987a
Add new docker workflow for publishing images on tagging
jorgensd Jan 20, 2023
add9d81
Resolve Issue on page /chapter3/neumann_dirichlet_code.html #91
jorgensd Jan 20, 2023
97e32e5
Remove warning
jorgensd Jan 25, 2023
ea3594b
Merge in trame updates
jorgensd Jan 31, 2023
0b3582e
Try fixing pipelines
jorgensd Feb 1, 2023
7b0c042
Fix containers
jorgensd Feb 1, 2023
e55fa19
Fix position of requirements
jorgensd Feb 1, 2023
2a07f5c
Remove cache dir
jorgensd Feb 1, 2023
b5a56d1
Try more CI fixes
jorgensd Feb 1, 2023
7ef196f
Tweak requirements to not get stuck
jorgensd Feb 1, 2023
84728df
Change jupyter backend to static
jorgensd Feb 1, 2023
a54b782
Fix reference to trame
jorgensd Feb 1, 2023
648f2c3
Switch trame for panel for now
jorgensd Feb 1, 2023
a76e14e
Pin setuptools as long as we don't have new ffcx sub release
jorgensd Feb 8, 2023
70b2b45
Bump version in binder docker image
jorgensd Feb 8, 2023
54cebeb
Move pin setuptools
jorgensd Feb 8, 2023
1a93bb3
Another round ofpinning
jorgensd Feb 8, 2023
5cbc156
Add this
jorgensd Feb 8, 2023
b4ad1bd
Fix last pin
jorgensd Feb 8, 2023
be92f18
Fix last pins to 0.5.1
jorgensd Feb 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 49 additions & 23 deletions .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,43 +27,54 @@ concurrency:
env:
# Directory that will be published on github pages
PUBLISH_DIR: ./_build/html

HDF5_MPI: "ON"
HDF5_DIR: "/usr/local/"
DISPLAY: ":99.0"
DEB_PYTHON_INSTALL_LAYOUT: deb_system

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
test:
# The type of runner that the job will run on
runs-on: ubuntu-latest
container: ghcr.io/jorgensd/dolfinx-tutorial:v0.5.1

container: ghcr.io/fenics/dolfinx/lab:v0.6.0-r1
env:
HDF5_MPI: "ON"
CC: mpicc
HDF5_DIR: "/usr/local/"
DISPLAY: ":99.0"
PYVISTA_OFF_SCREEN: true

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3

# Upgrade setuptools and pip
# https://github.com/pypa/setuptools/issues/3269#issuecomment-1254507377
- name: Install apt dependencies and upgrade pip
run: |
apt-get update && apt-get install -y libgl1-mesa-glx libxrender1 xvfb
python3 -m pip install -U "setuptools<=65.5.1" pip pkgconfig

# Install `h5py`
# https://github.com/hl5py/h5py/issues/2222
- name: Install h5py and pip requirements
run: |
python3 -m pip install cython
python3 -m pip install --no-build-isolation --no-binary=h5py h5py
python3 -m pip install --no-cache-dir -r docker/requirements.txt --upgrade


- name: Test complex notebooks in parallel
run: |
export PKG_CONFIG_PATH=/usr/local/dolfinx-complex/lib/pkgconfig:$PKG_CONFIG_PATH
export PETSC_ARCH=linux-gnu-complex-32
export PYTHONPATH=/usr/local/dolfinx-complex/lib/python3.10/dist-packages:$PYTHONPATH
export LD_LIBRARY_PATH=/usr/local/dolfinx-complex/lib:$LD_LIBRARY_PATH
pip3 uninstall pyvista -y
pip3 install pyvista --upgrade
python3 -c "from pyvista import start_xvfb; start_xvfb(0.1)"
cd chapter1
python3 complex_mode.py
mpirun -n 2 python3 complex_mode.py


- name: Install dependencies
run: pip3 install notebook nbconvert jupyter-book --upgrade

- name: Test notebooks in parallel
run: |
python3 -c "from pyvista import start_xvfb; start_xvfb(0.1)"
Expand Down Expand Up @@ -102,24 +113,39 @@ jobs:
build-book:
# The type of runner that the job will run on
runs-on: ubuntu-latest
container: ghcr.io/jorgensd/dolfinx-tutorial:v0.5.1

container: ghcr.io/fenics/dolfinx/lab:v0.6.0-r1
env:
HDF5_MPI: "ON"
CC: mpicc
HDF5_DIR: "/usr/local/"
DISPLAY: ":99.0"
PYVISTA_TRAME_SERVER_PROXY_PREFIX: '/proxy/'
PYVISTA_TRAME_SERVER_PROXY_ENABLED: "True"
PYVISTA_OFF_SCREEN: false
PYVISTA_JUPYTER_BACKEND: "static"
PYVISTA_JUPYTER_BACKEND: "panel"


# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

- uses: actions/checkout@v3
# Runs a single command using the runners shell

# Upgrade setuptools and pip
# https://github.com/pypa/setuptools/issues/3269#issuecomment-1254507377
- name: Install apt dependencies and upgrade pip
run: |
apt-get update && apt-get install -y libgl1-mesa-glx libxrender1 xvfb
python3 -m pip install -U "setuptools<=65.5.1" pip pkgconfig

# Install `h5py`
# https://github.com/hl5py/h5py/issues/2222
- name: Install h5py and pip requirements
run: |
python3 -m pip install cython
python3 -m pip install --no-build-isolation --no-binary=h5py h5py
python3 -m pip install --no-cache-dir -r docker/requirements.txt jupyter-book --upgrade


- name: Build the book
run:
jupyter-book build -W .
jupyter-book build .

- name: Upload book
uses: actions/upload-pages-artifact@v1
Expand Down Expand Up @@ -147,4 +173,4 @@ jobs:

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v1
29 changes: 19 additions & 10 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,31 @@ jobs:
env:
HDF5_MPI: "ON"
PYVISTA_OFF_SCREEN: true

DISPLAY: ":99.0"
PYVISTA_JUPYTER_BACKEND: panel

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v3
# Workaround for scheduling to work
with:
ref: dokken/release

- name: Install dependencies
# Upgrade setuptools and pip
# https://github.com/pypa/setuptools/issues/3269#issuecomment-1254507377
- name: Install apt dependencies and upgrade pip
run: |
apt-get update && apt-get install -y libgl1-mesa-glx libxrender1 xvfb
python3 -m pip install -U "setuptools<=65.5.1" pip pkgconfig

# Install `h5py`
# https://github.com/hl5py/h5py/issues/2222
- name: Install h5py and pip requirements
run: |
pip3 install --upgrade pip setuptools
CC=mpicc HDF_MPI="ON" HDF5_DIR="/usr/local/" pip3 install --no-cache-dir -r docker/requirements.txt
pip3 uninstall pyvista -y
pip3 install pyvista --upgrade --user
apt-get -qq update
apt-get install -y libgl1-mesa-dev xvfb nodejs
python3 -m pip install cython
python3 -m pip install --no-build-isolation --no-binary=h5py h5py
python3 -m pip install --no-cache-dir -r docker/requirements.txt --upgrade

- name: Test complex notebooks in parallel
run: |
Expand All @@ -52,6 +60,7 @@ jobs:
export PYTHONPATH=/usr/local/dolfinx-complex/lib/python3.10/dist-packages:$PYTHONPATH
export LD_LIBRARY_PATH=/usr/local/dolfinx-complex/lib:$LD_LIBRARY_PATH
cd chapter1
python3 complex_mode.py
mpirun -n 2 python3 complex_mode.py

- name: Test real notebooks in parallel
Expand Down Expand Up @@ -84,4 +93,4 @@ jobs:

- name: Test building the book
run:
PYVISTA_JUPYTER_BACKEND=static PYVISTA_OFF_SCREEN=false jupyter-book build -W .
PYVISTA_OFF_SCREEN=false jupyter-book build -W .
52 changes: 52 additions & 0 deletions .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
on:
push:
branches:
- "!*"
tags:
- "v*"

workflow_dispatch:

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log in to the Container registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@v3
with:
context: .
push: true
file: docker/Dockerfile
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/jorgensd/dolfinx-tutorial:v0.5.1
FROM ghcr.io/jorgensd/dolfinx-tutorial:v0.6.0

# create user with a home directory
ARG NB_USER
Expand Down
Loading