Skip to content

Fix macOS for release #5389

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

Merged
connorjward merged 7 commits into from
Aug 28, 2026
+15 −6
Merged

Fix macOS for release #5389

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7837ae0
empty commit
connorjward Aug 26, 2026
455eb9d
noodling
connorjward Aug 26, 2026
71ea323
fixup
connorjward Aug 26, 2026
3f6859e
Try libsupermesh branch
connorjward Aug 27, 2026
b6a872d
Fix supermesh linking for static libsupermesh.a
connorjward Aug 27, 2026
d9c1672
fixup
connorjward Aug 28, 2026
dca6300
Apply suggestions from code review
connorjward Aug 28, 2026
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
1 change: 1 addition & 0 deletions .github/actions/install/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ runs:
EXTRA_PIP_FLAGS='--no-build-isolation'
elif [ ${{ inputs.base_ref }} = 'release' ]; then
EXTRA_PIP_FLAGS=''
export PIP_BUILD_CONSTRAINT=constraints.txt
else
echo "Unrecognised 'base_ref' input: '${{ inputs.base_ref }}"
exit 1
Expand Down
12 changes: 9 additions & 3 deletions firedrake/supermeshing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import pathlib
import libsupermesh
import petsctools
import rtree

from firedrake.cython.supermeshimpl import assemble_mixed_mass_matrix as ammm, intersection_finder
from firedrake.mg.utils import get_level
Expand Down Expand Up @@ -462,9 +463,14 @@ def likely(cell_A):

libsupermesh_dir = pathlib.Path(libsupermesh.get_include()).parent.absolute()
dirs = petsctools.get_petsc_dirs() + (libsupermesh_dir,)
includes = ["-I%s/include" % d for d in dirs]
libs = ["-L%s/lib" % d for d in dirs]
libs = libs + ["-Wl,-rpath,%s/lib" % d for d in dirs] + ["-lpetsc", "-lsupermesh"]
includes = [f"-I{d}/include" for d in dirs]
libs = [
*[f"-L{d}/lib" for d in dirs],
*[f"-Wl,-rpath,{d}/lib" for d in dirs],
"-lpetsc",
"-lsupermesh",
str(pathlib.Path(rtree.core.rt._name).absolute()), # libspatialindex.so
]
dll = load(
supermesh_kernel_str, "c",
cppargs=includes,
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies = [
"firedrake-fiat>=2026.4",
"h5py>3.12.1",
"immutabledict",
"libsupermesh",
"libsupermesh @ git+https://github.com/firedrakeproject/libsupermesh.git@connorjward/static",
Comment thread
connorjward marked this conversation as resolved.
Outdated
"loopy>2024.1",
"numpy",
"packaging",
Expand Down Expand Up @@ -152,7 +152,7 @@ docker = [ # Used in firedrake-vanilla container
[build-system]
requires = [
"Cython>=3.0",
"libsupermesh",
"libsupermesh @ git+https://github.com/firedrakeproject/libsupermesh.git@connorjward/static",
Comment thread
connorjward marked this conversation as resolved.
Outdated
"mpi4py>3; python_version >= '3.13'",
"mpi4py; python_version < '3.13'",
"numpy",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def extensions():
name="firedrake.cython.supermeshimpl",
language="c",
sources=[os.path.join("firedrake", "cython", "supermeshimpl.pyx")],
**(mpi_ + petsc_ + numpy_ + libsupermesh_)
**(mpi_ + petsc_ + numpy_ + libsupermesh_ + spatialindex_)
))
# pyop2/sparsity.pyx: petsc, numpy,
cython_list.append(Extension(
Expand Down
Loading