-
-
Notifications
You must be signed in to change notification settings - Fork 45
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mscroggs
approved these changes
May 1, 2024
mscroggs
reviewed
May 3, 2024
mscroggs
approved these changes
May 3, 2024
Co-authored-by: Matthew Scroggs <[email protected]>
mscroggs
reviewed
May 7, 2024
jorgensd
commented
May 7, 2024
jorgensd
commented
May 21, 2024
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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).