adapt includes

alxbilger · alxbilger · commit c0652fb1c7a7 · 2025-05-13T14:08:52.000+02:00
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cpp b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cpp
@@ -19,7 +19,7 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include "CudaTypes.h"
+#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
 #include "CudaParticleSource.inl"
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/core/behavior/ProjectiveConstraintSet.h>
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cu b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cu
@@ -19,8 +19,8 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include "CudaCommon.h"
-#include "CudaMath.h"
+#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
 #include "cuda.h"
 
 #if defined(__cplusplus) && CUDA_VERSION < 2000
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.h b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.h
@@ -22,6 +22,6 @@
 #ifndef SOFA_GPU_CUDA_CUDAPARTICLESOURCE_H
 #define SOFA_GPU_CUDA_CUDAPARTICLESOURCE_H
 
-#include <sofa/gpu/cuda/CudaTypes.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
 
 #endif
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.inl b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.inl
@@ -23,7 +23,7 @@
 #define SOFA_GPU_CUDA_CUDAPARTICLESOURCE_INL
 
 #include "CudaParticleSource.h"
-#include <sofa/gpu/cuda/mycuda.h>
+#include <SofaCUDA/sofa/gpu/cuda/mycuda.h>
 
 namespace sofa
 {
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cpp b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cpp
@@ -19,7 +19,7 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <sofa/gpu/cuda/CudaTypes.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
 #include "CudaParticlesRepulsionForceField.inl"
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/core/behavior/ForceField.inl>
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cu b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cu
@@ -19,8 +19,8 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <sofa/gpu/cuda/CudaCommon.h>
-#include <sofa/gpu/cuda/CudaMath.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
 #include "cuda.h"
 
 #if defined(__cplusplus) && CUDA_VERSION < 2000
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.h b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.h
@@ -22,9 +22,9 @@
 #ifndef SOFA_GPU_CUDA_CUDAPARTICLESREPULSIONFORCEFIELD_H
 #define SOFA_GPU_CUDA_CUDAPARTICLESREPULSIONFORCEFIELD_H
 
-#include <sofa/gpu/cuda/CudaTypes.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
 #include <SofaSphFluid/ParticlesRepulsionForceField.h>
-#include <sofa/gpu/cuda/CudaSpatialGridContainer.h>
+#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>
 
 namespace sofa
 {
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.inl b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.inl
@@ -24,7 +24,7 @@
 
 #include "CudaParticlesRepulsionForceField.h"
 #include <SofaSphFluid/ParticlesRepulsionForceField.inl>
-//#include <sofa/gpu/cuda/CudaSpatialGridContainer.inl>
+//#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.inl>
 
 namespace sofa
 {
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cpp b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cpp
@@ -19,7 +19,7 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <sofa/gpu/cuda/CudaTypes.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
 #include "CudaSPHFluidForceField.inl"
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/core/behavior/ForceField.inl>
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cu b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cu
@@ -19,8 +19,8 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <sofa/gpu/cuda/CudaCommon.h>
-#include <sofa/gpu/cuda/CudaMath.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
 #include "cuda.h"
 
 #if defined(__cplusplus) && CUDA_VERSION < 2000
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.h b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.h
@@ -22,9 +22,10 @@
 #ifndef SOFA_GPU_CUDA_CUDASPHFLUIDFORCEFIELD_H
 #define SOFA_GPU_CUDA_CUDASPHFLUIDFORCEFIELD_H
 
-#include <sofa/gpu/cuda/CudaTypes.h>
+#include <SofaSphFluid/CUDA/config.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
 #include <SofaSphFluid/SPHFluidForceField.h>
-#include <sofa/gpu/cuda/CudaSpatialGridContainer.h>
+#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>
 
 namespace sofa
 {
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cpp b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cpp
@@ -19,7 +19,8 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <sofa/gpu/cuda/CudaSpatialGridContainer.inl>
+#define SOFASPHFLUID_CUDA_CUDASPATIALGRIDCONTAINER_CPP
+#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.inl>
 #include <sofa/component/statecontainer/MechanicalObject.inl>
 #include <sofa/core/ObjectFactory.h>
 
@@ -36,13 +37,13 @@ int SpatialGridContainerCudaClass = core::RegisterObject("GPU support using CUDA
         .add< SpatialGridContainer<CudaVec3fTypes> >()
         ;
 
-template class SOFA_GPU_CUDA_API SpatialGridContainer< CudaVec3fTypes >;
-template class SOFA_GPU_CUDA_API SpatialGrid< SpatialGridTypes< CudaVec3fTypes > >;
+template class SOFA_SOFASPHFLUID_CUDA_API SpatialGridContainer< CudaVec3fTypes >;
+template class SOFA_SOFASPHFLUID_CUDA_API SpatialGrid< SpatialGridTypes< CudaVec3fTypes > >;
 
 #ifdef SOFA_GPU_CUDA_DOUBLE
 
-template class SpatialGridContainer< CudaVec3dTypes >;
-template class SpatialGrid< SpatialGridTypes< CudaVec3dTypes > >;
+template class SOFA_SOFASPHFLUID_CUDA_API SpatialGridContainer< CudaVec3dTypes >;
+template class SOFA_SOFASPHFLUID_CUDA_API SpatialGrid< SpatialGridTypes< CudaVec3dTypes > >;
 
 #endif // SOFA_GPU_CUDA_DOUBLE
 
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cu b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cu
@@ -50,9 +50,9 @@
  */
 
 
-#include <sofa/gpu/cuda/CudaCommon.h>
-#include <sofa/gpu/cuda/CudaMath.h>
-#include <sofa/gpu/cuda/mycuda.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
+#include <SofaCUDA/sofa/gpu/cuda/mycuda.h>
 #include <cuda.h>
 
 #if defined(__cplusplus) && CUDA_VERSION < 2000
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.h b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.h
@@ -34,8 +34,9 @@
 #ifndef SOFA_GPU_CUDA_CUDASPATIALGRIDCONTAINER_H
 #define SOFA_GPU_CUDA_CUDASPATIALGRIDCONTAINER_H
 
+#include <SofaSphFluid/CUDA/config.h>
 #include <SofaSphFluid/SpatialGridContainer.h>
-#include <sofa/gpu/cuda/CudaTypes.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
 #include <sofa/type/Vec.h>
 
 
@@ -122,7 +123,19 @@ class SpatialGrid< SpatialGridTypes < gpu::cuda::CudaVectorTypes<TCoord,TDeriv,T
 
 };
 
-} // namespace sofa::component::container
+#if !defined(SOFASPHFLUID_CUDA_CUDASPATIALGRIDCONTAINER_CPP)
+extern template class SOFA_SOFASPHFLUID_CUDA_API SpatialGridContainer<sofa::gpu::cuda::CudaVec3fTypes >;
+extern template class SOFA_SOFASPHFLUID_CUDA_API SpatialGrid<sofa::component::container::SpatialGridTypes<sofa::gpu::cuda::CudaVec3fTypes > >;
+
+#ifdef SOFA_GPU_CUDA_DOUBLE
+
+extern template class SOFA_SOFASPHFLUID_CUDA_API SpatialGridContainer< sofa::gpu::cuda::CudaVec3dTypes >;
+extern template class SOFA_SOFASPHFLUID_CUDA_API SpatialGrid< sofa::component::container::SpatialGridTypes< sofa::gpu::cuda::CudaVec3dTypes > >;
+
+#endif // SOFA_GPU_CUDA_DOUBLE
 
+#endif
+
+} // namespace sofa::component::container
 
 #endif
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.inl b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.inl
@@ -34,8 +34,8 @@
 #ifndef SOFA_GPU_CUDA_CUDASPATIALGRIDCONTAINER_INL
 #define SOFA_GPU_CUDA_CUDASPATIALGRIDCONTAINER_INL
 
-#include <sofa/gpu/cuda/CudaSpatialGridContainer.h>
-#include <sofa/gpu/cuda/CudaSort.h>
+#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>
+#include <SofaCUDA/sofa/gpu/cuda/CudaSort.h>
 #include <SofaSphFluid/SpatialGridContainer.inl>
 #include <sofa/gl/template.h>
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#define SOFA_GPU_CUDA_CUDAPARTICLESOURCE_INL`
`24`	`24`
`25`	`25`	`#include "CudaParticleSource.h"`
`26`		`-#include <sofa/gpu/cuda/mycuda.h>`
	`26`	`+#include <SofaCUDA/sofa/gpu/cuda/mycuda.h>`
`27`	`27`
`28`	`28`	`namespace sofa`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`#include "CudaParticlesRepulsionForceField.h"`
`26`	`26`	`#include <SofaSphFluid/ParticlesRepulsionForceField.inl>`
`27`		`-//#include <sofa/gpu/cuda/CudaSpatialGridContainer.inl>`
	`27`	`+//#include <SofaSphFluid/CUDA/CudaSpatialGridContainer.inl>`
`28`	`28`
`29`	`29`	`namespace sofa`
`30`	`30`	`{`