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

Migrate neural network-based indicators to new repository #1701

Merged
merged 11 commits into from
Nov 7, 2023

Conversation

sloede
Copy link
Member

@sloede sloede commented Nov 2, 2023

As discussed at the last Trixi.jl meeting, we will move the currently unmaintained neural network-based indicators to a new repository, https://github.com/trixi-framework/TrixiSmartShockFinder.jl, for archival purposes.

See also the counterpart PR: trixi-framework/TrixiSmartShockFinder.jl#1

Copy link
Contributor

github-actions bot commented Nov 2, 2023

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.

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.

Copy link

codecov bot commented Nov 2, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c79fa43) 72.65% compared to head (3408d2c) 81.14%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1701      +/-   ##
==========================================
+ Coverage   72.65%   81.14%   +8.49%     
==========================================
  Files         431      423       -8     
  Lines       34637    34230     -407     
==========================================
+ Hits        25164    27775    +2611     
+ Misses       9473     6455    -3018     
Flag Coverage Δ
unittests 81.14% <ø> (+8.49%) ⬆️

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

Files Coverage Δ
src/Trixi.jl 42.86% <ø> (-0.62%) ⬇️
src/solvers/dgsem_tree/indicators.jl 89.69% <ø> (+16.45%) ⬆️
src/solvers/dgsem_tree/indicators_1d.jl 97.92% <ø> (+79.17%) ⬆️
src/solvers/dgsem_tree/indicators_2d.jl 96.93% <ø> (+49.47%) ⬆️

... and 142 files with indirect coverage changes

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

Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! We should also

  • update NEWS.md
  • make a breaking release with it
  • update all issues tracking breaking changes accordingly

NEWS.md Outdated Show resolved Hide resolved
@sloede
Copy link
Member Author

sloede commented Nov 3, 2023

This looks ready from my side. Thus, a review would be great. Please do not merge it until trixi-framework/TrixiSmartShockFinder.jl#1 was also approved.

@sloede sloede requested a review from ranocha November 3, 2023 16:36
NEWS.md Show resolved Hide resolved
@sloede sloede added the breaking label Nov 6, 2023
@ranocha ranocha changed the base branch from main to v0.6-dev November 6, 2023 15:57
Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I changed the base to the new v0.6 development branch you have set up.

@sloede sloede changed the title [WIP] Migrate neural network-based indicators to new repository Migrate neural network-based indicators to new repository Nov 6, 2023
@sloede sloede marked this pull request as ready for review November 6, 2023 16:00
@sloede
Copy link
Member Author

sloede commented Nov 6, 2023

Thanks! I changed the base to the new v0.6 development branch you have set up.

Thanks! Can we merge this to the v0.6 staging branch once the tests pass?

@ranocha
Copy link
Member

ranocha commented Nov 6, 2023

Sure - but some tests failed as in all other PRs as well...

@ranocha
Copy link
Member

ranocha commented Nov 7, 2023

I will merge this now but we should spend some time to figure out why the tests fail...

@ranocha ranocha merged commit 61c80ba into v0.6-dev Nov 7, 2023
27 of 29 checks passed
@ranocha ranocha deleted the msl/migrate-nn-based-indicators branch November 7, 2023 06:22
@sloede sloede mentioned this pull request Nov 7, 2023
2 tasks
ranocha added a commit that referenced this pull request Nov 10, 2023
* Remove all neural network indicator stuff from `src/`

* Migrate neural network tests

* Migrate neural network examples

* Migrate test dependencies

* Update NEWS.md

* Fix typo

* Remove Requires.jl-based use of Flux.jl

* Fix formatting

* Add migration of indicators to section with breaking changes

---------

Co-authored-by: Hendrik Ranocha <[email protected]>
ranocha added a commit that referenced this pull request Nov 10, 2023
* Breaking changes HLL MHD

* format

* format examples

* hlle

* fix

* news, tests, example changes

* fmt

* remove left-right-biased flux from test

* Set version to v0.6.0

* Migrate neural network-based indicators to new repository (#1701)

* Remove all neural network indicator stuff from `src/`

* Migrate neural network tests

* Migrate neural network examples

* Migrate test dependencies

* Update NEWS.md

* Fix typo

* Remove Requires.jl-based use of Flux.jl

* Fix formatting

* Add migration of indicators to section with breaking changes

---------

Co-authored-by: Hendrik Ranocha <[email protected]>

* fix hlle noncartesian 2d

* remove parantheses

* correct test vals

* Make parabolic terms nonexperimental (#1714)

* Make parabolic terms non-experimental

* Make NSE a separate item

* Add MPI to supported features

* Mention that parabolic terms are now officially supported in NEWS.md

Co-authored-by: Hendrik Ranocha <[email protected]>

* Deprecate some `DGMultiMesh` constructors  (#1709)

* remove previously deprecated functions

* fix typo in NEWS.md about deprecation vs removal

* fix literate tutorial

* removing other deprecation

* format

* Revert "fix typo in NEWS.md about deprecation vs removal"

This reverts commit 6b03020.

* add gradient variable type parameter to `AbstractEquationsParabolic` (#1409)

* add gradient variable type parameter

* fix parabolic literate test

* remove trailing comment

* remove unnecessary abstract type

* move gradient variable structs

* formatting

* fix dropped changes

* try to fix doc tests

* fixing navier stokes 1D

* formatting

* remove duplicate GradientVariablesPrimitive/Entropy definition

* update news

* bring downloads back

* fix failing test

* fmt

---------

Co-authored-by: Michael Schlottke-Lakemper <[email protected]>
Co-authored-by: Hendrik Ranocha <[email protected]>
ranocha added a commit that referenced this pull request Nov 11, 2023
* Remove all neural network indicator stuff from `src/`

* Migrate neural network tests

* Migrate neural network examples

* Migrate test dependencies

* Update NEWS.md

* Fix typo

* Remove Requires.jl-based use of Flux.jl

* Fix formatting

* Add migration of indicators to section with breaking changes

---------

Co-authored-by: Hendrik Ranocha <[email protected]>
ranocha added a commit that referenced this pull request Nov 11, 2023
* Breaking changes HLL MHD

* format

* format examples

* hlle

* fix

* news, tests, example changes

* fmt

* remove left-right-biased flux from test

* Set version to v0.6.0

* Migrate neural network-based indicators to new repository (#1701)

* Remove all neural network indicator stuff from `src/`

* Migrate neural network tests

* Migrate neural network examples

* Migrate test dependencies

* Update NEWS.md

* Fix typo

* Remove Requires.jl-based use of Flux.jl

* Fix formatting

* Add migration of indicators to section with breaking changes

---------

Co-authored-by: Hendrik Ranocha <[email protected]>

* fix hlle noncartesian 2d

* remove parantheses

* correct test vals

* Make parabolic terms nonexperimental (#1714)

* Make parabolic terms non-experimental

* Make NSE a separate item

* Add MPI to supported features

* Mention that parabolic terms are now officially supported in NEWS.md

Co-authored-by: Hendrik Ranocha <[email protected]>

* Deprecate some `DGMultiMesh` constructors  (#1709)

* remove previously deprecated functions

* fix typo in NEWS.md about deprecation vs removal

* fix literate tutorial

* removing other deprecation

* format

* Revert "fix typo in NEWS.md about deprecation vs removal"

This reverts commit 6b03020.

* add gradient variable type parameter to `AbstractEquationsParabolic` (#1409)

* add gradient variable type parameter

* fix parabolic literate test

* remove trailing comment

* remove unnecessary abstract type

* move gradient variable structs

* formatting

* fix dropped changes

* try to fix doc tests

* fixing navier stokes 1D

* formatting

* remove duplicate GradientVariablesPrimitive/Entropy definition

* update news

* bring downloads back

* fix failing test

* fmt

---------

Co-authored-by: Michael Schlottke-Lakemper <[email protected]>
Co-authored-by: Hendrik Ranocha <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants