Skip to content
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.

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

Unify Expression and IntegralIR with a common base #680

Merged
merged 11 commits into from
May 21, 2024
Merged

Conversation

jorgensd
Copy link
Sponsor Member

@jorgensd jorgensd commented Apr 16, 2024

Find commonground between IntegralIR and ExpressionIR.
Various clean-ups of extra parameters (such as points in expressionIR, as they are inside the integrand map key).

@jorgensd jorgensd marked this pull request as ready for review April 16, 2024 10:43
jorgensd added a commit to FEniCS/dolfinx that referenced this pull request Apr 16, 2024
@jorgensd jorgensd requested a review from mscroggs May 3, 2024 11:46
Co-authored-by: Matthew Scroggs <matthew.w.scroggs@gmail.com>
ffcx/ir/representation.py Outdated Show resolved Hide resolved
ffcx/ir/representation.py Outdated Show resolved Hide resolved
@jorgensd jorgensd added this pull request to the merge queue May 21, 2024
Merged via the queue into main with commit b83e4a8 May 21, 2024
8 of 9 checks passed
@jorgensd jorgensd deleted the dokken/unify_irs branch May 21, 2024 11:46
github-merge-queue bot pushed a commit to FEniCS/dolfinx that referenced this pull request May 21, 2024
* Unify IR names, coupled with: FEniCS/ffcx#680

* Update CI branches

* Change branch

* Revert to main branch of ffcx

---------

Co-authored-by: Garth N. Wells <gnw20@cam.ac.uk>
github-merge-queue bot pushed a commit to FEniCS/dolfinx that referenced this pull request May 21, 2024
* Unify IR names, coupled with: FEniCS/ffcx#680

* Update CI branches

* Change branch

* Revert to main branch of ffcx

---------

Co-authored-by: Garth N. Wells <gnw20@cam.ac.uk>
github-merge-queue bot pushed a commit to FEniCS/dolfinx that referenced this pull request May 21, 2024
* Unify IR names, coupled with: FEniCS/ffcx#680

* Update CI branches

* Change branch

* Revert to main branch of ffcx

---------

Co-authored-by: Garth N. Wells <gnw20@cam.ac.uk>
@jhale
Copy link
Member

jhale commented May 21, 2024

This was merged without the DOLFINx Integration tests passing - easy to miss this, perhaps it should be on the default set?

github-merge-queue bot pushed a commit to FEniCS/dolfinx that referenced this pull request May 21, 2024
* Unify IR names, coupled with: FEniCS/ffcx#680

* Update CI branches

* Change branch

* Revert to main branch of ffcx

---------

Co-authored-by: Garth N. Wells <gnw20@cam.ac.uk>
@jorgensd
Copy link
Sponsor Member Author

jorgensd commented May 21, 2024

This was merged without the DOLFINx Integration tests passing - easy to miss this, perhaps it should be on the default set?

That is just because of the branch reset to main. Has to happen here prior to dolfinx gets merged whenever there is an API change

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants