diff --git a/docs/Makefile b/docs/Makefile index 38a2618bda..2f02a2661a 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -51,12 +51,12 @@ publishpdf: publish: html # The raw IP address is used to circumvent some dns fiddling which # Imperial's ICT department are doing. - rsync --rsh=ssh -rv -r build/html/* 'cm3f3ymc8wnd@92.204.68.56:public_html/' + rsync --rsh=ssh -rv -r build/html/* 'cm3f3ymc8wnd@92.204.222.76:public_html/' scp: # The raw IP address is used to circumvent some dns fiddling which # Imperial's ICT department are doing. - rsync --rsh=ssh -rv build/html/* 'cm3f3ymc8wnd@92.204.68.56:public_html/' + rsync --rsh=ssh -rv build/html/* 'cm3f3ymc8wnd@92.204.222.76:public_html/' livehtml: sphinx-autobuild -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html diff --git a/docs/source/events.rst b/docs/source/events.rst index 9ac85df893..c52918a37b 100644 --- a/docs/source/events.rst +++ b/docs/source/events.rst @@ -8,6 +8,13 @@ Firedrake events ---------------- +Firedrake '23 +~~~~~~~~~~~~~ + +The seventh Firedrake user and developer workshop will be held +between 13-15 September 2023 at Missenden Abbey. For more +information see :doc:`the workshop page `. + PETSc4py documentation sprint ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/source/firedrake_23.rst b/docs/source/firedrake_23.rst new file mode 100644 index 0000000000..a976ca0ee9 --- /dev/null +++ b/docs/source/firedrake_23.rst @@ -0,0 +1,49 @@ +:orphan: true + +.. title:: Firedrake '23 + +.. image:: images/missenden_abbey.jpg + :width: 45% + :alt: Missenden Abbey + :align: right + +Firedrake '23 +------------- + +The seventh Firedrake user and developer workshop will +be held at `Missenden Abbey `__ from 13-15 September 2023. The event is +hosted by Imperial College London. + +The workshop is an opportunity for Firedrake users and +developers to engage with each other to communicate the ways that +Firedrake can be used in simulation science, the latest developments +in the project, and the future developments anticipated. The event +provides Firedrake users with the opportunity to interact directly +with developers and other users. + +Key Dates +--------- + +* 21/7/2023 Abstract submission +* 21/7/2023 Registration +* 13-15/9/2023 Workshop. The workshop will run from the afternoon of 13 + September until lunchtime on 15 September. + +Registration +------------ + +Registration will be £180 for students and £300 for others. This includes two +nights accommodation and meals for the duration of the workshop. Registration +will open soon. + +Organising committee +-------------------- + +* `David Ham `__, Imperial College London +* `Daiane I. Dolci `__, Imperial College London +* `Koki Sagiyama `__, Imperial College London + +Further details +--------------- + +For any queries, please contact `David Ham `_. diff --git a/docs/source/images/missenden_abbey.jpg b/docs/source/images/missenden_abbey.jpg new file mode 100644 index 0000000000..3526e449aa Binary files /dev/null and b/docs/source/images/missenden_abbey.jpg differ diff --git a/firedrake/ml/pytorch.py b/firedrake/ml/pytorch.py index b510760f7c..9d093135b4 100644 --- a/firedrake/ml/pytorch.py +++ b/firedrake/ml/pytorch.py @@ -38,7 +38,7 @@ class FiredrakeTorchOperator(torch.autograd.Function): ---------- metadata : dict Dictionary used to stash Firedrake objects. - x_P : list of torch.Tensor + *x_P : torch.Tensor PyTorch tensors representing the inputs to the Firedrake operator `F`. Returns