Merge main

Author: dsroberts

.github/workflows/core.yml

@@ -190,10 +190,6 @@ jobs:
           : # Empty the pip cache to ensure that everything is compiled from scratch
           pip cache purge
 
-          : # Fix for petsc4py+slepc4py build
-          echo 'setuptools<81' > constraints.txt
-          export PIP_CONSTRAINT=constraints.txt
-
           if [ ${{ inputs.target_branch }} = 'release' ]; then
             EXTRA_BUILD_ARGS=''
             EXTRA_PIP_FLAGS=''
@@ -448,10 +444,6 @@ jobs:
           : # Empty the pip cache to ensure that everything is compiled from scratch
           pip cache purge
 
-          : # Fix for petsc4py+slepc4py build
-          echo 'setuptools<81' > constraints.txt
-          export PIP_CONSTRAINT=constraints.txt
-
           if [ ${{ inputs.target_branch }} = 'release' ]; then
             EXTRA_PIP_FLAGS=''
           else

do.sh

@@ -0,0 +1,31 @@
+sed -i 's|http://archive.ubuntu.com/ubuntu|http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/|g' /etc/apt/sources.list.d/ubuntu.sources
+apt-get update
+apt-get -y install git python3 gnupg2 curl ca-certificates
+curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/3bf863cc.pub | apt-key add -
+echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64 /" > /etc/apt/sources.list.d/cuda.list
+apt-get update
+apt-get -y install $(python3 ./firedrake-configure --arch default --gpu-arch cuda --show-system-packages)
+apt-get -y install fonts-dejavu graphviz graphviz-dev parallel poppler-utils python3-venv
+
+cd /opt
+git clone --depth 1 https://gitlab.com/petsc/petsc.git
+cd petsc
+export LIBRARY_PATH=/usr/local/cuda/lib64/stubs
+python3 ../firedrake-repo/scripts/firedrake-configure --arch default --gpu-arch cuda --show-petsc-configure-options | xargs -L1 ./configure --with-make-np=8 --download-slepc
+make PETSC_DIR=/opt/petsc PETSC_ARCH=arch-firedrake-default-cuda
+make PETSC_DIR=/opt/petsc PETSC_ARCH=arch-firedrake-default-cuda check
+export PETSC_DIR="/opt/petsc"
+export PETSC_ARCH="arch-firedrake-default-cuda"
+export SLEPC_DIR="/opt/petsc/arch-firedrake-default-cuda"
+
+cd /opt
+export $(python3 ./firedrake-configure --arch default --gpu-arch cuda --show-env)
+python3 -m venv venv
+. venv/bin/activate
+pip cache purge
+pip install "$PETSC_DIR"/src/binding/petsc4py
+pip install -r ./firedrake/requirements-build.txt
+pip install --no-build-isolation --no-deps "$PETSC_DIR"/"$PETSC_ARCH"/externalpackages/git.slepc/src/binding/slepc4py
+pip install --no-deps git+https://github.com/NGSolve/ngsPETSc.git netgen-mesher netgen-occt
+pip install --verbose --no-build-isolation --no-binary h5py './firedrake-repo[check]'
+

docker/Dockerfile.vanilla

@@ -36,14 +36,14 @@
 #     Extra arguments to pass to PETSc's `configure` script
 #
 # Example usage for a specific firedrake release with complex scalars:
-#  $ docker build \
+#  $ docker build . \
 #     --file=Dockerfile.vanilla \
 #     --tag=firedrake:2025.4.2-complex \
 #     --build-arg ARCH=complex \
 #     --build-arg BRANCH=2025.4.2
 #
 # Example usage for building from firedrake main with real scalars, ml installed with PETSc, and valgrind installed with apt:
-#  $ docker build \
+#  $ docker build . \
 #     --file=Dockerfile.vanilla \
 #     --tag=firedrake:main-latest \
 #     --build-arg ARCH=default \
@@ -136,28 +136,28 @@ ENV MPICC=mpicc
 ENV CFLAGS="-O3 -mtune=generic" CPPFLAGS="-O3 -mtune=generic"
 
 # Install Firedrake
-# - petsc4py and slepc4py are installed from source in PETSc repo.
-# - slepc4py is installed without build isolation so it links against
-#     the correct petsc4py version.
+# - If installing 'main' then petsc4py and slepc4py are installed from source,
+#   otherwise they are installed from PyPI. This mirrors our CI.
 # - Firedrake main branch requires main/master branch of some upstream
 #     packages. These are installed in editable mode.
 #     The order these are installed is important, e.g. FIAT must be installed
 #     before UFL otherwise `pip install fiat` will reinstall pypi ufl.
 
-# Fix for petsc4py+slepc4py build to be removed after #4873 is resolved.
-RUN echo 'setuptools<81' > /opt/constraints.txt
-ENV PIP_CONSTRAINT=/opt/constraints.txt
-
 RUN git clone --branch ${BRANCH} \
       https://github.com/firedrakeproject/firedrake.git /opt/firedrake \
-   && pip cache purge \
-   && pip install --verbose ${PETSC_DIR}/src/binding/petsc4py \
-   && pip install --verbose -r /opt/firedrake/requirements-build.txt \
-   && pip install --verbose --no-build-isolation \
-      ${SLEPC_DIR}/externalpackages/git.slepc/src/binding/slepc4py \
-   && pip install --verbose --no-binary h5py --no-build-isolation \
-      --editable '/opt/firedrake[docker]' || exit; \
-   if [ ${BRANCH} == "main" ]; then \
+    && pip cache purge || exit; \
+    if [ ${BRANCH} == "main" ]; then \
+      pip install --verbose ${PETSC_DIR}/src/binding/petsc4py \
+      && pip install --verbose -r /opt/firedrake/requirements-build.txt \
+      && pip install --verbose --no-build-isolation \
+           ${SLEPC_DIR}/externalpackages/git.slepc/src/binding/slepc4py \
+      && pip install --verbose --no-binary h5py --no-build-isolation \
+        --editable '/opt/firedrake[docker]' || exit; \
+    else \
+      pip install --verbose --no-binary h5py \
+        --editable '/opt/firedrake[docker]' || exit; \
+    fi; \
+    if [ ${BRANCH} == "main" ]; then \
       for pkg in \
          "git+https://github.com/dolfin-adjoint/pyadjoint.git#egg=pyadjoint-ad" \
          "git+https://github.com/firedrakeproject/fiat.git#egg=firedrake-fiat" \

docs/notebooks/11-extract-adjoint-solutions.ipynb

@@ -240,12 +240,6 @@ install Firedrake. To do this perform the following steps:
       so that it can be detected by mpi4py. See `here <https://mpi4py.readthedocs.io/en/stable/install.html#linux>`__
       for more information.
 
-#. Set ``PIP_CONSTRAINT`` to work around
-   `an issue with setuptools <https://gitlab.com/petsc/petsc/-/merge_requests/9016>`__::
-
-      $ echo 'setuptools<81' > constraints.txt
-      $ export PIP_CONSTRAINT=constraints.txt
-
 #. Install Firedrake::
 
       $ pip install --no-binary h5py 'firedrake[check]'

docs/source/install.rst

@@ -118,7 +118,7 @@ functions over to the new mesh.  To move `f` over to ``mesh``, use:
 
 .. code-block:: python3
 
-   g = Function(functionspaceimpl.WithGeometry.create(f.function_space(), mesh),
+   g = Function(functionspaceimpl.WithGeometry(f.function_space(), mesh),
                 val=f.topological)
 
 This creates a :py:class:`~.Function` `g` which shares data with `f`,

docs/source/mesh-coordinates.rst

@@ -26,8 +26,7 @@ also be possible to join the tutorial using the cloud. Installing `Paraview <htt
 Registration
 ------------
 
-Registration of £25 covers tea, coffee, and biscuits. `Registration is now open on the Oxford online store <https://www.oxforduniversitystores.co.uk/product-catalogue/mathematical-institute/events/solving-partial-differential-equations-with-firedrake>`__.
-
+Registration of £25 covered tea, coffee, and biscuits. Registration closed on 6 March 2026.
 
 Where and when
 --------------
@@ -62,7 +61,7 @@ Thu Mar 19 (room L4)
 +-------------+-------------------------------------+
 | Time        | Session                             |
 +=============+=====================================+
-| 09:00-10:45 | Surface integrals. Nonlinearity     |
+| 09:00-10:45 | Boundaries. Nonlinearity            |
 +-------------+-------------------------------------+
 | 10:45-11:15 | Coffee break                        |
 +-------------+-------------------------------------+

docs/source/tutorial_mar_26.rst

@@ -1246,7 +1246,7 @@ def load_mesh(self, name=DEFAULT_MESH_NAME, reorder=None, distribution_parameter
                 radial_coord_name = self.get_attr(path, PREFIX + "_radial_coordinates")
                 radial_coordinates = self._load_function_topology(tmesh, radial_coord_element, radial_coord_name)
                 tV_radial_coord = impl.FunctionSpace(tmesh, radial_coord_element)
-                V_radial_coord = impl.WithGeometry.create(tV_radial_coord, mesh)
+                V_radial_coord = impl.WithGeometry(tV_radial_coord, mesh)
                 radial_coord_function_name = self.get_attr(path, PREFIX + "_radial_coordinate_function")
                 mesh.radial_coordinates = Function(V_radial_coord, val=radial_coordinates, name=radial_coord_function_name)
             # The followings are conceptually redundant, but needed.
@@ -1416,7 +1416,7 @@ def _load_function_space(self, mesh, name):
             element = self._load_ufl_element(path, PREFIX + "_ufl_element")
             tV = self._load_function_space_topology(tmesh, element)
             # Construct function space
-            V = impl.WithGeometry.create(tV, mesh)
+            V = impl.WithGeometry(tV, mesh)
         else:
             raise RuntimeError(f"""
                 FunctionSpace ({name}) not found in either of the following path in {self.filename}: