-
Notifications
You must be signed in to change notification settings - Fork 341
[SofaCUDA] No longer use deprecated texture references in HexaTLED #3868
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
Merged
Conversation
This file contains hidden or 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
Contributor
Author
|
[ci-build][with-all-tests] |
Contributor
|
The added scene is failing because CUDA scene are not tested on the CI. Add the scene to the ignore list, then rebase, then ready |
fredroy
approved these changes
May 31, 2023
hugtalbot
pushed a commit
to hugtalbot/sofa
that referenced
this pull request
Jun 1, 2023
…ofa-framework#3868) * [SofaCUDA] Remove non-working scene * Introduce example * nodesPerElement * DhC0, DhC1 and DhC2 * detJ * Disp * hourglass control * preferredDirection * Di1, Di2, Dv1, Dv2 * force coordinates * Fi * x, x0 * Ignore added scene on CI
alxbilger
added a commit
that referenced
this pull request
Jun 14, 2023
* Rename file DefaultContactManager into CollisionResponse * Update Compat layer with the new class name * udpate CMakeLists with new class name * udpate CMakeLists with new class name keeping compat file * update class name in the code * propagate the change of C++ class name * add compatibility file * update all scenes with new component name CollisionResponse * Apply suggestions from code review Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * [LinearAlgebra] Change access specifier for the method set (#3834) * Change access specifier for the method set. Needed in SofaCUDASolver plugin. Regardless the resons of this modification, The fact that this method is at the begining of the class declaration without any access specifier befoe is not usual * Changed attributs/methods orders and remove repeated identifiers --------- Co-authored-by: Paul Baksic <paul.baksic@unistra.fr> * [Spring] Remove unused dependencies (#3848) * [StateContainer] Fix bug in dynamic data registration (#3783) * [Sofa.Type] Replace the use of Matrix::s_identity (deprecated) by Matrix::Identity() * [Sofa.Component.StateContainer] Fix missing registration of dynamic properties. Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> --------- Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> * [SceneChecking] Add check when setting contactStiffness uselessly (#3843) * [SceneChecking] Add check when setting contactStiffness uselessly * Separate contribution in a separate function * [test] Fix unit test on RestShapeSpringsForceField (#3864) * [plugins] Remove fetching of SofaPython (#3855) * [Constraint.Lagrangian] Activate the export of lambda forces by default (#3857) * [all] Change variable name supportOnlySymmetricMatrix in MParams (#3861) * [all] Change variable name supportOnlySymmetricMatrix in MechanicalParams * propagate the supportOnlySymmetricMatrix API change * Add deprecation --------- Co-authored-by: Alex Bilger <alexbilger0@gmail.com> * [Constraint.Lagrangian] Add messages when no compliance is given (#3858) * [Constraint.Lagrangian] Add messages when no compliance is given * minor esthetic msg update * [all] include base class inl file (#3865) * [test] Fix failing unit test (#3876) Introduced in #3858 * [LinearAlgebra] Pull Insimo's CompressedRowSparseMatrix into the main branch (#3515) * WIP * CRS: integration from issofa * rename all bloc to blocks * use MessagingAPI (and rename again bloc to block * add matrix_bloc_traits for Vec * fix compilation with CRS debug macros * revert some useless changes * add insimo as contributors * fix compilation test by bringing back operators and MatrixExpr * fix stuff about add() * add compress() after clearing (fix some tests?) * fix debug compilation * clarify add() functions (indices, etc) * apply insimo code and clean ups * rename CRS for CRSGeneric * apply insimo code for CRSMechanical (previous CRS) and clean ups * add transitional header * fix confusion about mul() * bring back some changes from original version * bring back BM:add with mat3 and various fixes * fix gcc * remove conversion warnings * fix tests and stuff * Use struct instead of class (+public) Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * remove diag/debug/trace api in crs * remove now-useless CRS trace logger utility header * remove some override warnings * remove more warnings * fix rebase * refresh scene with MechanicalMatrixMapper * change traits to try to match previous behavior * fix missing include * add explicit instanction for float type * apply suggestion by using directly the correct type * remove the touch trait --------- Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * [SofaCUDA] Deprecated CudaTexture.h (#3869) It is not used, and its content is deprecated in Cuda 12 * [examples] Fix unstable scene constantMomentum.scn (#3886) * [SofaCUDA] Replace deprecated vector types (#3902) * [Config] Fix cross-compilation for embedded external libs (#3870) [Config] Fix cross-compilation by turning off cmake_find_root_path for embedded external libs * [all] Deprecate unused verbose data (#3871) * [all] Deprecate unused verbose data * Add warning in parse method * [contact] Add missing call to super init (#3884) * [SolidMechanics] Use accessors & make geometrical data required in BFF (#3887) [SolidMechanics] Use accessors & make geometrical data required in BeamFEMFF * [SofaCUDA] No longer use deprecated texture references in HexaTLED (#3868) * [SofaCUDA] Remove non-working scene * Introduce example * nodesPerElement * DhC0, DhC1 and DhC2 * detJ * Disp * hourglass control * preferredDirection * Di1, Di2, Dv1, Dv2 * force coordinates * Fi * x, x0 * Ignore added scene on CI --------- Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Co-authored-by: Paul Baksic <paul.baksic@unistra.fr> Co-authored-by: Damien Marchal <damien.marchal@univ-lille1.fr> Co-authored-by: Alex Bilger <alexbilger0@gmail.com> Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Olivier Roussel <olivier.roussel@inria.fr>
damienmarchal
added a commit
to CRIStAL-PADR/sofa
that referenced
this pull request
Jun 28, 2023
…work#3891) * Rename file DefaultContactManager into CollisionResponse * Update Compat layer with the new class name * udpate CMakeLists with new class name * udpate CMakeLists with new class name keeping compat file * update class name in the code * propagate the change of C++ class name * add compatibility file * update all scenes with new component name CollisionResponse * Apply suggestions from code review Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * [LinearAlgebra] Change access specifier for the method set (sofa-framework#3834) * Change access specifier for the method set. Needed in SofaCUDASolver plugin. Regardless the resons of this modification, The fact that this method is at the begining of the class declaration without any access specifier befoe is not usual * Changed attributs/methods orders and remove repeated identifiers --------- Co-authored-by: Paul Baksic <paul.baksic@unistra.fr> * [Spring] Remove unused dependencies (sofa-framework#3848) * [StateContainer] Fix bug in dynamic data registration (sofa-framework#3783) * [Sofa.Type] Replace the use of Matrix::s_identity (deprecated) by Matrix::Identity() * [Sofa.Component.StateContainer] Fix missing registration of dynamic properties. Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> --------- Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> * [SceneChecking] Add check when setting contactStiffness uselessly (sofa-framework#3843) * [SceneChecking] Add check when setting contactStiffness uselessly * Separate contribution in a separate function * [test] Fix unit test on RestShapeSpringsForceField (sofa-framework#3864) * [plugins] Remove fetching of SofaPython (sofa-framework#3855) * [Constraint.Lagrangian] Activate the export of lambda forces by default (sofa-framework#3857) * [all] Change variable name supportOnlySymmetricMatrix in MParams (sofa-framework#3861) * [all] Change variable name supportOnlySymmetricMatrix in MechanicalParams * propagate the supportOnlySymmetricMatrix API change * Add deprecation --------- Co-authored-by: Alex Bilger <alexbilger0@gmail.com> * [Constraint.Lagrangian] Add messages when no compliance is given (sofa-framework#3858) * [Constraint.Lagrangian] Add messages when no compliance is given * minor esthetic msg update * [all] include base class inl file (sofa-framework#3865) * [test] Fix failing unit test (sofa-framework#3876) Introduced in sofa-framework#3858 * [LinearAlgebra] Pull Insimo's CompressedRowSparseMatrix into the main branch (sofa-framework#3515) * WIP * CRS: integration from issofa * rename all bloc to blocks * use MessagingAPI (and rename again bloc to block * add matrix_bloc_traits for Vec * fix compilation with CRS debug macros * revert some useless changes * add insimo as contributors * fix compilation test by bringing back operators and MatrixExpr * fix stuff about add() * add compress() after clearing (fix some tests?) * fix debug compilation * clarify add() functions (indices, etc) * apply insimo code and clean ups * rename CRS for CRSGeneric * apply insimo code for CRSMechanical (previous CRS) and clean ups * add transitional header * fix confusion about mul() * bring back some changes from original version * bring back BM:add with mat3 and various fixes * fix gcc * remove conversion warnings * fix tests and stuff * Use struct instead of class (+public) Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * remove diag/debug/trace api in crs * remove now-useless CRS trace logger utility header * remove some override warnings * remove more warnings * fix rebase * refresh scene with MechanicalMatrixMapper * change traits to try to match previous behavior * fix missing include * add explicit instanction for float type * apply suggestion by using directly the correct type * remove the touch trait --------- Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * [SofaCUDA] Deprecated CudaTexture.h (sofa-framework#3869) It is not used, and its content is deprecated in Cuda 12 * [examples] Fix unstable scene constantMomentum.scn (sofa-framework#3886) * [SofaCUDA] Replace deprecated vector types (sofa-framework#3902) * [Config] Fix cross-compilation for embedded external libs (sofa-framework#3870) [Config] Fix cross-compilation by turning off cmake_find_root_path for embedded external libs * [all] Deprecate unused verbose data (sofa-framework#3871) * [all] Deprecate unused verbose data * Add warning in parse method * [contact] Add missing call to super init (sofa-framework#3884) * [SolidMechanics] Use accessors & make geometrical data required in BFF (sofa-framework#3887) [SolidMechanics] Use accessors & make geometrical data required in BeamFEMFF * [SofaCUDA] No longer use deprecated texture references in HexaTLED (sofa-framework#3868) * [SofaCUDA] Remove non-working scene * Introduce example * nodesPerElement * DhC0, DhC1 and DhC2 * detJ * Disp * hourglass control * preferredDirection * Di1, Di2, Dv1, Dv2 * force coordinates * Fi * x, x0 * Ignore added scene on CI --------- Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Co-authored-by: Paul Baksic <paul.baksic@unistra.fr> Co-authored-by: Damien Marchal <damien.marchal@univ-lille1.fr> Co-authored-by: Alex Bilger <alexbilger0@gmail.com> Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Olivier Roussel <olivier.roussel@inria.fr>
bakpaul
added a commit
to bakpaul/sofa
that referenced
this pull request
Feb 23, 2024
…work#3891) * Rename file DefaultContactManager into CollisionResponse * Update Compat layer with the new class name * udpate CMakeLists with new class name * udpate CMakeLists with new class name keeping compat file * update class name in the code * propagate the change of C++ class name * add compatibility file * update all scenes with new component name CollisionResponse * Apply suggestions from code review Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * [LinearAlgebra] Change access specifier for the method set (sofa-framework#3834) * Change access specifier for the method set. Needed in SofaCUDASolver plugin. Regardless the resons of this modification, The fact that this method is at the begining of the class declaration without any access specifier befoe is not usual * Changed attributs/methods orders and remove repeated identifiers --------- Co-authored-by: Paul Baksic <paul.baksic@unistra.fr> * [Spring] Remove unused dependencies (sofa-framework#3848) * [StateContainer] Fix bug in dynamic data registration (sofa-framework#3783) * [Sofa.Type] Replace the use of Matrix::s_identity (deprecated) by Matrix::Identity() * [Sofa.Component.StateContainer] Fix missing registration of dynamic properties. Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> --------- Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> * [SceneChecking] Add check when setting contactStiffness uselessly (sofa-framework#3843) * [SceneChecking] Add check when setting contactStiffness uselessly * Separate contribution in a separate function * [test] Fix unit test on RestShapeSpringsForceField (sofa-framework#3864) * [plugins] Remove fetching of SofaPython (sofa-framework#3855) * [Constraint.Lagrangian] Activate the export of lambda forces by default (sofa-framework#3857) * [all] Change variable name supportOnlySymmetricMatrix in MParams (sofa-framework#3861) * [all] Change variable name supportOnlySymmetricMatrix in MechanicalParams * propagate the supportOnlySymmetricMatrix API change * Add deprecation --------- Co-authored-by: Alex Bilger <alexbilger0@gmail.com> * [Constraint.Lagrangian] Add messages when no compliance is given (sofa-framework#3858) * [Constraint.Lagrangian] Add messages when no compliance is given * minor esthetic msg update * [all] include base class inl file (sofa-framework#3865) * [test] Fix failing unit test (sofa-framework#3876) Introduced in sofa-framework#3858 * [LinearAlgebra] Pull Insimo's CompressedRowSparseMatrix into the main branch (sofa-framework#3515) * WIP * CRS: integration from issofa * rename all bloc to blocks * use MessagingAPI (and rename again bloc to block * add matrix_bloc_traits for Vec * fix compilation with CRS debug macros * revert some useless changes * add insimo as contributors * fix compilation test by bringing back operators and MatrixExpr * fix stuff about add() * add compress() after clearing (fix some tests?) * fix debug compilation * clarify add() functions (indices, etc) * apply insimo code and clean ups * rename CRS for CRSGeneric * apply insimo code for CRSMechanical (previous CRS) and clean ups * add transitional header * fix confusion about mul() * bring back some changes from original version * bring back BM:add with mat3 and various fixes * fix gcc * remove conversion warnings * fix tests and stuff * Use struct instead of class (+public) Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * remove diag/debug/trace api in crs * remove now-useless CRS trace logger utility header * remove some override warnings * remove more warnings * fix rebase * refresh scene with MechanicalMatrixMapper * change traits to try to match previous behavior * fix missing include * add explicit instanction for float type * apply suggestion by using directly the correct type * remove the touch trait --------- Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> * [SofaCUDA] Deprecated CudaTexture.h (sofa-framework#3869) It is not used, and its content is deprecated in Cuda 12 * [examples] Fix unstable scene constantMomentum.scn (sofa-framework#3886) * [SofaCUDA] Replace deprecated vector types (sofa-framework#3902) * [Config] Fix cross-compilation for embedded external libs (sofa-framework#3870) [Config] Fix cross-compilation by turning off cmake_find_root_path for embedded external libs * [all] Deprecate unused verbose data (sofa-framework#3871) * [all] Deprecate unused verbose data * Add warning in parse method * [contact] Add missing call to super init (sofa-framework#3884) * [SolidMechanics] Use accessors & make geometrical data required in BFF (sofa-framework#3887) [SolidMechanics] Use accessors & make geometrical data required in BeamFEMFF * [SofaCUDA] No longer use deprecated texture references in HexaTLED (sofa-framework#3868) * [SofaCUDA] Remove non-working scene * Introduce example * nodesPerElement * DhC0, DhC1 and DhC2 * detJ * Disp * hourglass control * preferredDirection * Di1, Di2, Dv1, Dv2 * force coordinates * Fi * x, x0 * Ignore added scene on CI --------- Signed-off-by: Damien Marchal <damien.marchal@univ-lille1.fr> Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com> Co-authored-by: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Co-authored-by: Paul Baksic <paul.baksic@unistra.fr> Co-authored-by: Damien Marchal <damien.marchal@univ-lille1.fr> Co-authored-by: Alex Bilger <alexbilger0@gmail.com> Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com> Co-authored-by: Olivier Roussel <olivier.roussel@inria.fr>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Similar to #3650
To make it compatible with Cuda 12
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