Skip to content

Fix cuda compilation with revamped SofaCUDA #15

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

Merged
hugtalbot merged 1 commit into from
May 28, 2025
Merged

Fix cuda compilation with revamped SofaCUDA #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/CUDA/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.12)
project(SofaSphFluid.CUDA CUDA CXX)
project(SofaSphFluid.CUDA LANGUAGES CUDA CXX)

set(HEADER_FILES
src/SofaSphFluid/CUDA/init.h
Expand Down
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* *
* Contact information: [email protected] *
******************************************************************************/
#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
#include <sofa/gpu/cuda/CudaTypes.h>
#include "CudaParticleSource.inl"
#include <sofa/core/ObjectFactory.h>
#include <sofa/core/behavior/ProjectiveConstraintSet.h>
Expand Down
4 changes: 2 additions & 2 deletions extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* *
* Contact information: [email protected] *
******************************************************************************/
#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
#include <sofa/gpu/cuda/CudaCommon.h>
#include <sofa/gpu/cuda/CudaMath.h>
#include "cuda.h"

#if defined(__cplusplus) && CUDA_VERSION < 2000
Expand Down
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
#ifndef SOFA_GPU_CUDA_CUDAPARTICLESOURCE_H
#define SOFA_GPU_CUDA_CUDAPARTICLESOURCE_H

#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
#include <sofa/gpu/cuda/CudaTypes.h>

#endif
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define SOFA_GPU_CUDA_CUDAPARTICLESOURCE_INL

#include "CudaParticleSource.h"
#include <SofaCUDA/sofa/gpu/cuda/mycuda.h>
#include <sofa/gpu/cuda/mycuda.h>

namespace sofa
{
Expand Down
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* *
* Contact information: [email protected] *
******************************************************************************/
#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
#include <sofa/gpu/cuda/CudaTypes.h>
#include "CudaParticlesRepulsionForceField.inl"
#include <sofa/core/ObjectFactory.h>
#include <sofa/core/behavior/ForceField.inl>
Expand Down
4 changes: 2 additions & 2 deletions extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* *
* Contact information: [email protected] *
******************************************************************************/
#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
#include <sofa/gpu/cuda/CudaCommon.h>
#include <sofa/gpu/cuda/CudaMath.h>
#include "cuda.h"

#if defined(__cplusplus) && CUDA_VERSION < 2000
Expand Down
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef SOFA_GPU_CUDA_CUDAPARTICLESREPULSIONFORCEFIELD_H
#define SOFA_GPU_CUDA_CUDAPARTICLESREPULSIONFORCEFIELD_H

#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
#include <sofa/gpu/cuda/CudaTypes.h>
#include <SofaSphFluid/ParticlesRepulsionForceField.h>
#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>

Expand Down
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* *
* Contact information: [email protected] *
******************************************************************************/
#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
#include <sofa/gpu/cuda/CudaTypes.h>
#include "CudaSPHFluidForceField.inl"
#include <sofa/core/ObjectFactory.h>
#include <sofa/core/behavior/ForceField.inl>
Expand Down
4 changes: 2 additions & 2 deletions extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* *
* Contact information: [email protected] *
******************************************************************************/
#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
#include <sofa/gpu/cuda/CudaCommon.h>
#include <sofa/gpu/cuda/CudaMath.h>
#include "cuda.h"

#if defined(__cplusplus) && CUDA_VERSION < 2000
Expand Down
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define SOFA_GPU_CUDA_CUDASPHFLUIDFORCEFIELD_H

#include <SofaSphFluid/CUDA/config.h>
#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
#include <sofa/gpu/cuda/CudaTypes.h>
#include <SofaSphFluid/SPHFluidForceField.h>
#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>

Expand Down
6 changes: 3 additions & 3 deletions extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
*/


#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
#include <SofaCUDA/sofa/gpu/cuda/mycuda.h>
#include <sofa/gpu/cuda/CudaCommon.h>
#include <sofa/gpu/cuda/CudaMath.h>
#include <sofa/gpu/cuda/mycuda.h>
#include <cuda.h>

#if defined(__cplusplus) && CUDA_VERSION < 2000
Expand Down
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include <SofaSphFluid/CUDA/config.h>
#include <SofaSphFluid/SpatialGridContainer.h>
#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
#include <sofa/gpu/cuda/CudaTypes.h>
#include <sofa/type/Vec.h>


Expand Down
2 changes: 1 addition & 1 deletion extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#define SOFA_GPU_CUDA_CUDASPATIALGRIDCONTAINER_INL

#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>
#include <SofaCUDA/sofa/gpu/cuda/CudaSort.h>
#include <sofa/gpu/cuda/CudaSort.h>
#include <SofaSphFluid/SpatialGridContainer.inl>
#include <sofa/gl/template.h>

Expand Down
Loading