Skip to content
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.

Sign up for GitHub

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

Update CI branches for adios4dolfinx #121

Merged
merged 6 commits into from
May 6, 2024
Merged

Update CI branches for adios4dolfinx #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1061ae
Update CI branches for adios4dolfinx
jorgensd May 5, 2024
3609457
add --break-system-packages on CI
jorgensd May 5, 2024
27d0a68
add missing space
jorgensd May 5, 2024
30e0b27
More mods
jorgensd May 5, 2024
504de00
Add back break system packages
jorgensd May 5, 2024
b18f4a2
Add element dtype
jorgensd May 5, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/build_docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
env:
DEB_PYTHON_INSTALL_LAYOUT: deb_system

runs-on: ubuntu-22.04
container: ghcr.io/fenics/dolfinx/dolfinx:v0.8.0
runs-on: ubuntu-latest
container: ghcr.io/fenics/dolfinx/dolfinx:nightly
steps:
# This action sets the current path to the root of your github repo
- uses: actions/checkout@v4

- name: Update pip
run: python3 -m pip install --upgrade pip setuptools
run: python3 -m pip install --break-system-packages --upgrade pip setuptools

- name: Install dependencies
run: python3 -m pip install -e ".[docs]"
run: python3 -m pip install --break-system-packages -e ".[docs]"

- name: Build docs
run: jupyter book build -W .
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check_formatting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ jobs:
env:
DEB_PYTHON_INSTALL_LAYOUT: deb_system

runs-on: ubuntu-22.04
container: ghcr.io/fenics/dolfinx/dolfinx:v0.8.0
runs-on: ubuntu-latest
container: ghcr.io/fenics/dolfinx/dolfinx:nightly
steps:
# This action sets the current path to the root of your github repo
- uses: actions/checkout@v4

- name: Update pip
run: python3 -m pip install --upgrade pip setuptools
run: python3 -m pip install --break-system-packages --upgrade pip setuptools

- name: Install code
run: python3 -m pip install .[dev]
run: python3 -m pip install --break-system-packages .[dev]

- name: Check code formatting with ruff
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_legacy_checkpoint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4

- name: Install legacy version of adios4dolfinx
run: python3 -m pip install adios4dolfinx==${adios4dolfinx_version}
run: python3 -m pip install --break-system-packages adios4dolfinx==${adios4dolfinx_version}

- name: Create datasets
run: python3 ./tests/create_legacy_checkpoint.py --output-dir=$data_dir
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ jobs:
test-code:
runs-on: "ubuntu-22.04"
needs: [create-datasets, create-legacy-datasets, check-formatting]
container: ghcr.io/fenics/dolfinx/dolfinx:v0.8.0
container: ghcr.io/fenics/dolfinx/dolfinx:nightly
env:
DEB_PYTHON_INSTALL_LAYOUT: deb_system

steps:
- uses: actions/checkout@v4

- name: Update pip
run: python3 -m pip install --upgrade pip setuptools
run: python3 -m pip install --break-system-packages --upgrade pip setuptools

- name: Download legacy data
uses: actions/download-artifact@v4
Expand All @@ -56,7 +56,7 @@ jobs:
path: ./legacy_checkpoint

- name: Install package
run: python3 -m pip install .[test]
run: python3 -m pip install --break-system-packages .[test]

- name: Run tests
run: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test_package_openmpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
artifact_name: "legacy_checkpoint_ompi"

test-code:
runs-on: "ubuntu-22.04"
runs-on: ubuntu-latest
needs: [create-datasets, create-legacy-datasets]
container: ghcr.io/fenics/test-env:current-openmpi
env:
Expand All @@ -46,17 +46,17 @@ jobs:
- uses: actions/checkout@v4

- name: Update pip
run: python3 -m pip install --upgrade pip setuptools
run: python3 -m pip install --break-system-packages --upgrade pip setuptools

- name: Install DOLFINx
uses: jorgensd/actions/[email protected].0
uses: jorgensd/actions/[email protected]
with:
adios2: ${{ matrix.adios2 }}
petsc_arch: ${{ env.PETSC_ARCH }}
dolfinx: v0.8.0
basix: v0.8.0
ufl: 2024.1.0.post0
ffcx: v0.8.0
dolfinx: main
basix: main
ufl: main
ffcx: main
working-directory: ${{ env.working-directory}}

- name: Download legacy data
Expand All @@ -72,7 +72,7 @@ jobs:
path: ./legacy_checkpoint

- name: Install package
run: python3 -m pip install .[test]
run: python3 -m pip install --break-system-packages .[test]

- name: Run tests
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_redhat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
- uses: actions/checkout@v4

- name: Update pip
run: python3 -m pip install --upgrade pip setuptools
run: python3 -m pip install --break-system-packages --upgrade pip setuptools

- name: Install DOLFINx
uses: jorgensd/actions/[email protected].0
uses: jorgensd/actions/[email protected]
with:
adios2: ${{ matrix.adios2 }}
petsc_arch: ${{ env.PETSC_ARCH }}
Expand All @@ -72,7 +72,7 @@ jobs:
path: ./legacy_checkpoint

- name: Install package
run: python3 -m pip install .[test]
run: python3 -m pip install --break-system-packages .[test]

- name: Run tests
run: |
Expand Down
2 changes: 2 additions & 0 deletions tests/test_checkpointing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ def test_read_write_P_3D(
degree,
basix.LagrangeVariant.gll_warped,
shape=(mesh.geometry.dim,),
dtype=mesh.geometry.x.dtype,
)

def f(x):
Expand Down Expand Up @@ -178,6 +179,7 @@ def test_read_write_P_3D_time(
degree,
basix.LagrangeVariant.gll_warped,
shape=(mesh.geometry.dim,),
dtype=mesh.geometry.x.dtype,
)

def f(x):
Expand Down
10 changes: 5 additions & 5 deletions tests/test_checkpointing_vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def test_read_write_2D(
):
mesh = simplex_mesh_2D
f_dtype = get_dtype(mesh.geometry.x.dtype, is_complex)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree, dtype=mesh.geometry.x.dtype)

def f(x):
values = np.empty((2, x.shape[1]), dtype=f_dtype)
Expand All @@ -81,7 +81,7 @@ def test_read_write_3D(
):
mesh = simplex_mesh_3D
f_dtype = get_dtype(mesh.geometry.x.dtype, is_complex)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree, dtype=mesh.geometry.x.dtype)

def f(x):
values = np.empty((3, x.shape[1]), dtype=f_dtype)
Expand Down Expand Up @@ -114,7 +114,7 @@ def test_read_write_2D_quad(
):
mesh = non_simplex_mesh_2D
f_dtype = get_dtype(mesh.geometry.x.dtype, is_complex)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree, dtype=mesh.geometry.x.dtype)

def f(x):
values = np.empty((2, x.shape[1]), dtype=f_dtype)
Expand Down Expand Up @@ -146,7 +146,7 @@ def test_read_write_hex(
):
mesh = non_simplex_mesh_3D
f_dtype = get_dtype(mesh.geometry.x.dtype, is_complex)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree, dtype=mesh.geometry.x.dtype)

def f(x):
values = np.empty((3, x.shape[1]), dtype=f_dtype)
Expand Down Expand Up @@ -179,7 +179,7 @@ def test_read_write_multiple(
):
mesh = non_simplex_mesh_2D
f_dtype = get_dtype(mesh.geometry.x.dtype, is_complex)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree)
el = basix.ufl.element(family, mesh.ufl_cell().cellname(), degree, dtype=mesh.geometry.x.dtype)

def f(x):
values = np.empty((2, x.shape[1]), dtype=f_dtype)
Expand Down
Loading