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

Jump to bottom

Assemble: use tensor kwarg in FormSum maxpy #4056

Merged

dham merged 27 commits into master from pbrubeck/fix/base-form-tensor

Mar 19, 2025

Contributor

pbrubeck commented Feb 19, 2025 •

edited

Loading

Description

Assembling a linear combination of BaseForms, (i.e. a FormSum of Scalars, Cofunctions, or Matrices) was always allocating a new tensor for the result, ignoring the tensor kwarg. This PR fixes this.

Here we unify some basic functionality of the data carrier classes for 0-forms (Constant / R-space Cofunction), linear forms (Cofunction), and bilinear form (MatrixBase) by implementing the MatrixBase.zero() and MatrixBase.assign().

Fixes #3212


          Assemble: use tensor kwarg in FormSum maxpy

a5b09af

pbrubeck force-pushed the pbrubeck/fix/base-form-tensor branch from dfec145 to a5b09af Compare

February 19, 2025 16:02

github-actions bot commented Feb 19, 2025 •

edited

Loading

	Tests	Passed ✅	Skipped ⏭️	Failed ❌
Firedrake complex	8289 ran	6643 passed	1646 skipped	0 failed

github-actions bot commented Feb 19, 2025 •

edited

Loading

	Tests	Passed ✅	Skipped ⏭️	Failed ❌
Firedrake real	7937 ran	7312 passed	625 skipped	0 failed

pbrubeck added 10 commits

February 19, 2025 17:46


          BaseFormAssembler needs zeroing

082c625


          BaseFormAssembler: check tensor

eef29d6


          Cleanup

9a6f97c


          Cofunction -> Function

821e583


          ExternalOperator: update tensor

11aa95d


          MatrixBase: assign and zero

49950ee


          fixup

db0d9ce


          No-op for ImplicitMatrix.zero()

31098be


          Only zero tensor when assembling FormSum

c72988e


          ImplicitMatrix: Do not implement zero()

ecb6e6e

pbrubeck commented

View reviewed changes

firedrake/assemble.py Outdated Show resolved Hide resolved

pbrubeck commented

View reviewed changes

tests/firedrake/regression/test_assemble_baseform.py Outdated Show resolved Hide resolved

pbrubeck commented

View reviewed changes

tests/firedrake/regression/test_vfs_component_bcs.py Outdated Show resolved Hide resolved

pbrubeck commented

View reviewed changes

tests/firedrake/regression/test_vfs_component_bcs.py Outdated Show resolved Hide resolved

pbrubeck added 2 commits

February 20, 2025 21:33


          Fix tests


          Update tests/firedrake/regression/test_vfs_component_bcs.py

db497a1

pbrubeck commented

View reviewed changes

firedrake/assemble.py Outdated Show resolved Hide resolved


          Update firedrake/assemble.py

c39f9e8

pbrubeck commented

View reviewed changes

firedrake/assemble.py Outdated Show resolved Hide resolved


          Apply suggestions from code review

2485e54

pbrubeck commented

View reviewed changes

firedrake/assemble.py Outdated Show resolved Hide resolved

pbrubeck commented

View reviewed changes

firedrake/assemble.py Outdated Show resolved Hide resolved


          lint

9e7b915

pbrubeck commented

View reviewed changes

tests/firedrake/regression/test_vfs_component_bcs.py Outdated Show resolved Hide resolved


          Apply suggestions from code review

c6884bb

pbrubeck commented

View reviewed changes

firedrake/matrix.py Outdated Show resolved Hide resolved

pbrubeck added 2 commits

February 21, 2025 13:43


          more tests


          Merge branch 'master' into pbrubeck/fix/base-form-tensor

7ea3dfc

JHopeCollins reviewed

View reviewed changes

firedrake/assemble.py Outdated Show resolved Hide resolved

dham reviewed

View reviewed changes

firedrake/assemble.py Outdated Show resolved Hide resolved

firedrake/assemble.py Outdated Show resolved Hide resolved

Contributor

connorjward commented Feb 26, 2025

Just noticed that this fixes #3212 so I have amended the PR description to make sure it gets closed.

github-actions bot commented Feb 26, 2025 •

edited

Loading

	Tests	Passed ✅	Skipped ⏭️	Failed ❌
Firedrake default	8289 ran	7587 passed	702 skipped	0 failed


          address review comments

179fe50

pbrubeck force-pushed the pbrubeck/fix/base-form-tensor branch from b815048 to 179fe50 Compare

February 26, 2025 19:39

pbrubeck added 4 commits

February 26, 2025 13:41


          Merge branch 'master' into pbrubeck/fix/base-form-tensor

b9201d0


          AssembledMatrix: set options_prefix

bcd4e77


          drop unrelated files

b81b9da


          Merge branch 'master' into pbrubeck/fix/base-form-tensor

474ab65

pbrubeck commented

View reviewed changes

firedrake/matrix.py Outdated Show resolved Hide resolved

pbrubeck added 3 commits

March 17, 2025 09:50


          Update firedrake/matrix.py

c045bf4


          MatrixBase: implement __sub__

60002f4


          Merge branch 'master' into pbrubeck/fix/base-form-tensor

c2c2243

dham approved these changes

View reviewed changes

dham merged commit 12c20aa into master

15 checks passed

dham deleted the pbrubeck/fix/base-form-tensor branch

March 19, 2025 16:42

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet