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

[SofaOpenCL] Make it work with 20.06 #1361

Merged
merged 4 commits into from
May 14, 2020
Merged

[SofaOpenCL] Make it work with 20.06 #1361

merged 4 commits into from
May 14, 2020

Conversation

fredroy
Copy link
Contributor

@fredroy fredroy commented May 2, 2020 •
edited by hugtalbot
Loading

The SOFA version of cleaning the Augean stables... 🐴

Make it compile and run (for the quadSpring scene)
And does not need the sofaOPENCL application.

Compile with the SofaSphPlugin as well, but the example scene crashes somewhere in the OpenCL kernel...

This PR:

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

Reviewers will merge only if all these checks are true.

@fredroy fredroy added location: plugins pr: fix Fix a bug pr: status wip Development in the pull-request is still in progress pr: clean Cleaning the code pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels May 2, 2020
hugtalbot
hugtalbot reviewed May 6, 2020
View reviewed changes
applications/plugins/SofaOpenCL/examples/SPHFluidForceFieldOPENCL.scn
<!--<CentralDifferenceSolver/>-->
<!--<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver/>-->
<EulerExplicitSolver symplectic="1" />
Copy link
Contributor

Choose a reason for hiding this comment

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

You decided to change the integration scheme of the example ? ^^ @fredroy

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, just took back the latest version in the examples of SofaSphFluid 🦆

@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 May 6, 2020
@guparan guparan added pr: status to review To notify reviewers to review this pull-request and removed pr: status ready Approved a pull-request, ready to be squashed labels May 12, 2020
@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 May 13, 2020
@hugtalbot hugtalbot merged commit 877e3bb into sofa-framework:master May 14, 2020
@hugtalbot hugtalbot mentioned this pull request Jun 15, 2020
Open
@guparan guparan added this to the v20.06 milestone Jun 16, 2020
@fredroy fredroy deleted the opencl_compile_20_06 branch June 16, 2020 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guparan guparan guparan left review comments

@hugtalbot hugtalbot hugtalbot approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@fredroy @guparan @hugtalbot