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.

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

[SofaSparseSolver] Clean examples scenes of sparse linear solvers #2422

Merged
merged 12 commits into from
Oct 22, 2021
Merged

[SofaSparseSolver] Clean examples scenes of sparse linear solvers #2422

merged 12 commits into from
Oct 22, 2021

Conversation

alxbilger
Copy link
Contributor

@alxbilger alxbilger commented Oct 15, 2021 •
edited
Loading

  • Remove some scenes in the module as their equivalent are in examples\Components\linearsolver
  • Add example for PrecomputedLinearSolver
  • Add example for SVDLinearSolver
  • Minor cleaning
  • Speed up an example using multithreading (from 74 fps to 131 fps in 1000 time steps on my computer)

By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).

Reviewers will merge this pull-request only if

  • it builds with SUCCESS for all platforms on the CI.
  • it does not generate new warnings.
  • it does not generate new unit test failures.
  • it does not generate new scene test failures.
  • it does not break API compatibility.
  • it is more than 1 week old (or has fast-merge label).

@alxbilger alxbilger added pr: clean Cleaning the code pr: status to review To notify reviewers to review this pull-request labels Oct 15, 2021
@alxbilger
Copy link
Contributor Author

[ci-build][with-all-tests]

hugtalbot
hugtalbot reviewed Oct 17, 2021
View reviewed changes
examples/Components/linearsolver/FEMBAR-SVDLinearSolver.scn Outdated
<Node name="M1">
<EulerImplicit name="cg_odesolver" printLog="false" rayleighStiffness="0.1" rayleighMass="0.1" />
<SparseLUSolver printLog="1" verbose="0" />
<EulerImplicitSolver name="cg_odesolver" printLog="false" rayleighStiffness="0.1" rayleighMass="0.1" />
Copy link
Contributor

Choose a reason for hiding this comment

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

well I do not like seeing these rayleigh damping, especially in example scenes, but it's not the purpose of the PR ^^

hugtalbot
hugtalbot reviewed Oct 17, 2021
View reviewed changes
examples/Components/linearsolver/FEMBAR-SVDLinearSolver.scn
<Node name="M1">
<EulerImplicit name="cg_odesolver" printLog="false" rayleighStiffness="0.1" rayleighMass="0.1" />
<SparseLUSolver printLog="1" verbose="0" />
Copy link
Contributor

Choose a reason for hiding this comment

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

well .. SVD you said? 😂

hugtalbot
hugtalbot reviewed Oct 17, 2021
View reviewed changes
modules/SofaSparseSolver/src/SofaSparseSolver/SparseLUSolver.h
@@ -29,7 +29,7 @@
namespace sofa::component::linearsolver
{

//defaut structure for a LDL factorization
Copy link
Contributor

Choose a reason for hiding this comment

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

nice copy-paste ..

@hugtalbot
Copy link
Contributor

Great work @alxbilger 👍

@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Oct 17, 2021
epernod
epernod requested changes Oct 21, 2021
View reviewed changes
Copy link
Contributor

@epernod epernod left a comment

Choose a reason for hiding this comment

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

Hum sorry in fact FEMBAR-SVDLinearSolver.scn seems to time out: https://ci.inria.fr/sofa-ci-dev/job/sofa-framework/job/PR-2422/CI_CONFIG=macos_clang,CI_PLUGINS=options,CI_TYPE=release/3/SceneTestCrashes/

https://ci.inria.fr/sofa-ci-dev/job/sofa-framework/job/PR-2422/CI_CONFIG=macos_clang,CI_PLUGINS=options,CI_TYPE=release/3/artifact/parent_dir/build/scene-tests/archive/examples/Components/linearsolver/FEMBAR-SVDLinearSolver.scn/output.txt

could you double check before merging.

@epernod
Copy link
Contributor

epernod commented Oct 21, 2021

[ci-build][with-all-tests]

@alxbilger
Copy link
Contributor Author

Hum sorry in fact FEMBAR-SVDLinearSolver.scn seems to time out: https://ci.inria.fr/sofa-ci-dev/job/sofa-framework/job/PR-2422/CI_CONFIG=macos_clang,CI_PLUGINS=options,CI_TYPE=release/3/SceneTestCrashes/

https://ci.inria.fr/sofa-ci-dev/job/sofa-framework/job/PR-2422/CI_CONFIG=macos_clang,CI_PLUGINS=options,CI_TYPE=release/3/artifact/parent_dir/build/scene-tests/archive/examples/Components/linearsolver/FEMBAR-SVDLinearSolver.scn/output.txt

could you double check before merging.

@epernod yes it makes sense as this solver is super slow. I'll change the number of iterations for this scene. Thanks

@epernod
Copy link
Contributor

epernod commented Oct 22, 2021

lower your expectations! :)

@epernod
Copy link
Contributor

epernod commented Oct 22, 2021

hum... otherwise we could considering ignoring this scene on the CI.

@guparan
Copy link
Contributor

guparan commented Oct 22, 2021

Still timeout, even with only 1 iteration 😞
To be disabled ?

@alxbilger
Copy link
Contributor Author

Still timeout, even with only 1 iteration 😞 To be disabled ?

@epernod @guparan I check on my computer to be sure that it computes something. If it does, let's ignore it

@alxbilger
Copy link
Contributor Author

@epernod @guparan It computes the first iteration in 23 seconds on my computer. Let's ignore it

@epernod epernod merged commit 7eac779 into sofa-framework:master Oct 22, 2021
@guparan guparan added this to the v21.12 milestone Nov 18, 2021
alxbilger added a commit to alxbilger/sofa that referenced this pull request Oct 27, 2023
@alxbilger
[SofaSparseSolver] Clean examples scenes of sparse linear solvers (so…
154917c 
…fa-framework#2422)

* [SofaSparseSolver] Remove scenes as their equivalent are in examples\Components\linearsolver

* [examples] Add example for PrecomputedLinearSolver

* [examples] Add example for SVDLinearSolver

* [SofaSparseSolver] msg_info without parameter

* Cleaning

* [examples] Speed up the example using multithreading

* Turn multithreading on

* [examples] Run only a few iterations to test FEMBAR-SVDLinearSolver.scn

* Lower number of iterations

* Clean scenes

Remove collision components
Add a scene for CGLinearSolver
Set the right RequiredPlugin

* ignore FEMBAR-SVDLinearSolver.scn on the CI
alxbilger added a commit to alxbilger/sofa that referenced this pull request Oct 27, 2023
@alxbilger
[SofaSparseSolver] Clean examples scenes of sparse linear solvers (so…
775e943 
…fa-framework#2422)

* [SofaSparseSolver] Remove scenes as their equivalent are in examples\Components\linearsolver

* [examples] Add example for PrecomputedLinearSolver

* [examples] Add example for SVDLinearSolver

* [SofaSparseSolver] msg_info without parameter

* Cleaning

* [examples] Speed up the example using multithreading

* Turn multithreading on

* [examples] Run only a few iterations to test FEMBAR-SVDLinearSolver.scn

* Lower number of iterations

* Clean scenes

Remove collision components
Add a scene for CGLinearSolver
Set the right RequiredPlugin

* ignore FEMBAR-SVDLinearSolver.scn on the CI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hugtalbot hugtalbot hugtalbot approved these changes

@epernod epernod epernod approved these changes

Assignees
No one assigned
Labels
pr: clean Cleaning the code pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v21.12
Development

Successfully merging this pull request may close these issues.
4 participants
@alxbilger @hugtalbot @epernod @guparan