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

remove restriction of DiffEqBase.jl (used as hotfix) #2264

Merged
merged 42 commits into from
Feb 7, 2025
Merged

Conversation

ranocha
Copy link
Member

@ranocha ranocha commented Feb 7, 2025

Closes #1789, closes #1785, closes #1240, closes #2108, closes #2120, closes #2121, closes #2157, closes #1791, closes #1850, closes #2091.

Copy link
Contributor

github-actions bot commented Feb 7, 2025

Review checklist

This checklist is meant to assist creators of PRs (to let them know what reviewers will typically look for) and reviewers (to guide them in a structured review process). Items do not need to be checked explicitly for a PR to be eligible for merging.

Purpose and scope

  • The PR has a single goal that is clear from the PR title and/or description.
  • All code changes represent a single set of modifications that logically belong together.
  • No more than 500 lines of code are changed or there is no obvious way to split the PR into multiple PRs.

Code quality

  • The code can be understood easily.
  • Newly introduced names for variables etc. are self-descriptive and consistent with existing naming conventions.
  • There are no redundancies that can be removed by simple modularization/refactoring.
  • There are no leftover debug statements or commented code sections.
  • The code adheres to our conventions and style guide, and to the Julia guidelines.

Documentation

  • New functions and types are documented with a docstring or top-level comment.
  • Relevant publications are referenced in docstrings (see example for formatting).
  • Inline comments are used to document longer or unusual code sections.
  • Comments describe intent ("why?") and not just functionality ("what?").
  • If the PR introduces a significant change or new feature, it is documented in NEWS.md with its PR number.

Testing

  • The PR passes all tests.
  • New or modified lines of code are covered by tests.
  • New or modified tests run in less then 10 seconds.

Performance

  • There are no type instabilities or memory allocations in performance-critical parts.
  • If the PR intent is to improve performance, before/after time measurements are posted in the PR.

Verification

  • The correctness of the code was verified using appropriate tests.
  • If new equations/methods are added, a convergence test has been run and the results
    are posted in the PR.

Created with ❤️ by the Trixi.jl community.

@JoshuaLampert
Copy link
Member

In #2263 (comment) I made a list of issues and PRs, which are closed by this PR.

Copy link

codecov bot commented Feb 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.87%. Comparing base (ce4f75d) to head (4a682ff).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2264   +/-   ##
=======================================
  Coverage   96.87%   96.87%           
=======================================
  Files         490      490           
  Lines       39485    39491    +6     
=======================================
+ Hits        38248    38255    +7     
+ Misses       1237     1236    -1     
Flag Coverage Δ
unittests 96.87% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@JoshuaLampert
Copy link
Member

Probably bump Reexport.jl to v1.2 to allow newer versions of NonlinearSolve.jl?

@JoshuaLampert
Copy link
Member

I'll try to locally debug the Downgrade compat stuff.

@ranocha
Copy link
Member Author

ranocha commented Feb 7, 2025

Thanks a lot!

@ranocha
Copy link
Member Author

ranocha commented Feb 7, 2025

Thanks a lot, @JoshuaLampert! Could you please review this PR so that we can merge it when CI passes?

@JoshuaLampert
Copy link
Member

Yes, we still have some errors. I'll look into them.

@ranocha ranocha mentioned this pull request Feb 7, 2025
2 tasks
@ranocha
Copy link
Member Author

ranocha commented Feb 7, 2025

Failing invalidations CI is fine with me

@JoshuaLampert
Copy link
Member

JoshuaLampert commented Feb 7, 2025

Let's collect the errors we have in CI:

@ranocha
Copy link
Member Author

ranocha commented Feb 7, 2025

I will look at the

LoadError: MethodError: no method matching get_tstops_max(

error. Could you please check the second and third items on the list?

@JoshuaLampert
Copy link
Member

Ok, looks like Downgrade is finally happy. These SciML packages always need pretty high compat bounds... Now, we only need to fix the compat bounds in TrixiShallowWater.jl according to the ones here.

@JoshuaLampert
Copy link
Member

@ranocha, can you comment on the circular dependency including TrixiDiffEqBaseExt.jl (https://github.com/trixi-framework/Trixi.jl/actions/runs/13200117204/job/36849978148?pr=2264#step:8:530)?

@JoshuaLampert
Copy link
Member

@DanielDoehring, can you please confirm that eb3d778 is the correct fix for https://github.com/trixi-framework/Trixi.jl/actions/runs/13200117205/job/36849994393?pr=2264#step:7:3488? Do you know why this error wasn't thrown before?

@ranocha
Copy link
Member Author

ranocha commented Feb 7, 2025

@ranocha, can you comment on the circular dependency including TrixiDiffEqBaseExt.jl (https://github.com/trixi-framework/Trixi.jl/actions/runs/13200117204/job/36849978148?pr=2264#step:8:530)?

See dd81e82

Trixi.jl depends on DiffEqBase.jl already via DiffEqCallbacks.jl. Making DiffEqBase.jl
a regular dep instead of a weakdep fixes a cyclic dependency issue with extensions.
@JoshuaLampert
Copy link
Member

@ranocha, can you comment on the circular dependency including TrixiDiffEqBaseExt.jl (https://github.com/trixi-framework/Trixi.jl/actions/runs/13200117204/job/36849978148?pr=2264#step:8:530)?

See dd81e82

Thanks!

ranocha and others added 2 commits February 7, 2025 14:53
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@ranocha ranocha requested a review from JoshuaLampert February 7, 2025 14:54
@ranocha ranocha merged commit ee23598 into main Feb 7, 2025
38 of 39 checks passed
@ranocha ranocha deleted the hr/update_DiffEq branch February 7, 2025 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants