Skip to content

DO NOT MERGE! test merged solve block refactor branches #5239

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

Draft
angus-g wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

DO NOT MERGE! test merged solve block refactor branches #5239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48dc545
Add CachedSolverBlock
angus-g Jun 8, 2026
1128698
Disable annotation when creating solver caches
angus-g Jun 8, 2026
e32192a
Remove adj_sol_buf
angus-g Jun 8, 2026
db9f422
Gather adjoint solver cached data together (#5161)
JHopeCollins Jun 11, 2026
a9adaa4
Try to handle solver caching for linear forms (-> #4638) (#5158)
angus-g Jun 16, 2026
b2f7998
Remove explicit annotation on solve()
angus-g Jul 8, 2026
4e1e9d6
Handle MeshGeometry dependencies on cached solver blocks
angus-g Jun 18, 2026
4c199be
Fix PDE-constrained optimisation notebook
angus-g Jul 13, 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
5 changes: 3 additions & 2 deletions docs/notebooks/06-pde-constrained-optimisation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,13 @@
print("Jhat(g) = %.8g\nJhat(g_opt) = %.8g" % (Jhat(g), Jhat(g_opt)))

# %% [markdown]
# To see the optimised flow field, we solve the same problem again, only with the new (optimised) value for the boundary data on $\Gamma_\text{circ}$. This time we're not interested in annotating the solve, so we tell `firedrake-adjoint` to ignore it by passing `annotate=False`.
# To see the optimised flow field, we solve the same problem again, only with the new (optimised) value for the boundary data on $\Gamma_\text{circ}$. This time we're not interested in annotating the solve, so we tell `firedrake-adjoint` to ignore it by running it in a `stop_annotating()` context.

# %%
g.assign(g_opt)
w_opt = Function(W)
solve(a == L, w_opt, bcs=bcs, annotate=False)
with stop_annotating():
solve(a == L, w_opt, bcs=bcs)

# %% tags=["nbval-ignore-output"]
u_opt, p_opt = w_opt.subfunctions
Expand Down
2 changes: 1 addition & 1 deletion firedrake/adjoint_utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from firedrake.adjoint_utils.variational_solver import ( # noqa F401
NonlinearVariationalProblemMixin, NonlinearVariationalSolverMixin
)
from firedrake.adjoint_utils.solving import annotate_solve, get_solve_blocks # noqa F401
from firedrake.adjoint_utils.solving import get_solve_blocks # noqa F401
from firedrake.adjoint_utils.mesh import MeshGeometryMixin # noqa F401
from firedrake.adjoint_utils.checkpointing import ( # noqa F401
enable_disk_checkpointing, disk_checkpointing,
Expand Down
4 changes: 2 additions & 2 deletions firedrake/adjoint_utils/blocks/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from firedrake.adjoint_utils.blocks.assembly import AssembleBlock # noqa F401
from firedrake.adjoint_utils.blocks.solving import ( # noqa F401
GenericSolveBlock, SolveLinearSystemBlock, ProjectBlock,
SupermeshProjectBlock, SolveVarFormBlock,
CachedSolverBlock, GenericSolveBlock,
ProjectBlock, SupermeshProjectBlock, SolveVarFormBlock,
NonlinearVariationalSolveBlock
)
from firedrake.adjoint_utils.blocks.function import ( # noqa F401
Expand Down
Loading
Loading