Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit 1b70db7d authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

Update CUDA blocked part

parent 0371713b
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
template <class OctreeClass, class CellContainerClass, class KernelClass, class ParticleGroupClass, class StarPUCpuWrapperClass template <class OctreeClass, class CellContainerClass, class KernelClass, class ParticleGroupClass, class StarPUCpuWrapperClass
#ifdef ScalFMM_ENABLE_CUDA_KERNEL #ifdef ScalFMM_ENABLE_CUDA_KERNEL
, class StarPUCudaWrapperClass = FStarPUCudaWrapper<KernelClass, FCudaEmptyCellSymb, int, int, FCudaGroupOfCells<FCudaEmptyCellSymb, int, int>, , class StarPUCudaWrapperClass = FStarPUCudaWrapper<KernelClass, FCudaEmptyCellSymb, int, int, FCudaGroupOfCells<FCudaEmptyCellSymb, int, int>,
FCudaGroupOfParticles<0, 0, int>, FCudaGroupAttachedLeaf<0, 0, int>, FCudaEmptyKernel> FCudaGroupOfParticles<int, 0, 0, int>, FCudaGroupAttachedLeaf<int, 0, 0, int>, FCudaEmptyKernel<int> >
#endif #endif
#ifdef ScalFMM_ENABLE_OPENCL_KERNEL #ifdef ScalFMM_ENABLE_OPENCL_KERNEL
, class StarPUOpenClWrapperClass = FStarPUOpenClWrapper<KernelClass, FOpenCLDeviceWrapper<KernelClass>> , class StarPUOpenClWrapperClass = FStarPUOpenClWrapper<KernelClass, FOpenCLDeviceWrapper<KernelClass>>
......
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
/** /**
* This class defines what should be a Cuda kernel. * This class defines what should be a Cuda kernel.
*/ */
template <class FReal>
class FCudaEmptyKernel { class FCudaEmptyKernel {
protected: protected:
public: public:
typedef FCudaGroupAttachedLeaf<0,0,int> ContainerClass; typedef FCudaGroupAttachedLeaf<FReal,0,0,int> ContainerClass;
typedef FCudaCompositeCell<FCudaEmptyCellSymb,int,int> CellClass; typedef FCudaCompositeCell<FCudaEmptyCellSymb,int,int> CellClass;
__device__ void P2M(CellClass /*pole*/, const ContainerClass* const /*particles*/) { __device__ void P2M(CellClass /*pole*/, const ContainerClass* const /*particles*/) {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
class FTestCudaKernels { class FTestCudaKernels {
public: public:
typedef FCudaCompositeCell<FTestCellPODCore, FTestCellPODData, FTestCellPODData> CellClass; typedef FCudaCompositeCell<FTestCellPODCore, FTestCellPODData, FTestCellPODData> CellClass;
typedef FCudaGroupAttachedLeaf<0, 1, long long int> ContainerClass; typedef FCudaGroupAttachedLeaf<FReal, 0, 1, long long int> ContainerClass;
/** Before upward */ /** Before upward */
__device__ void P2M(CellClass pole, const ContainerClass* const particles) { __device__ void P2M(CellClass pole, const ContainerClass* const particles) {
......
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
class FTestCudaKernels; class FTestCudaKernels;
template <unsigned NbSymbAttributes, unsigned NbAttributesPerParticle, class AttributeClass> template <class FReal, unsigned NbSymbAttributes, unsigned NbAttributesPerParticle, class AttributeClass>
class FCudaGroupAttachedLeaf; class FCudaGroupAttachedLeaf;
template <unsigned NbSymbAttributes, unsigned NbAttributesPerParticle, class AttributeClass> template <class FReal, unsigned NbSymbAttributes, unsigned NbAttributesPerParticle, class AttributeClass>
class FCudaGroupOfParticles; class FCudaGroupOfParticles;
template <class SymboleCellClass, class PoleCellClass, class LocalCellClass> template <class SymboleCellClass, class PoleCellClass, class LocalCellClass>
...@@ -86,7 +86,7 @@ int main(int argc, char* argv[]){ ...@@ -86,7 +86,7 @@ int main(int argc, char* argv[]){
typedef FStarPUCpuWrapper<typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass> GroupCpuWrapper; typedef FStarPUCpuWrapper<typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass> GroupCpuWrapper;
typedef FStarPUCudaWrapper<GroupKernelClass, GroupCellSymbClass, GroupCellUpClass, GroupCellDownClass, typedef FStarPUCudaWrapper<GroupKernelClass, GroupCellSymbClass, GroupCellUpClass, GroupCellDownClass,
FCudaGroupOfCells<GroupCellSymbClass, GroupCellUpClass, GroupCellDownClass>, FCudaGroupOfCells<GroupCellSymbClass, GroupCellUpClass, GroupCellDownClass>,
FCudaGroupOfParticles<0, 1, long long int>, FCudaGroupAttachedLeaf<0, 1, long long int>, FTestCudaKernels> GroupCudaWrapper; FCudaGroupOfParticles<FReal, 0, 1, long long int>, FCudaGroupAttachedLeaf<FReal, 0, 1, long long int>, FTestCudaKernels > GroupCudaWrapper;
typedef FGroupTaskStarPUAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, typedef FGroupTaskStarPUAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass,
GroupCpuWrapper, GroupCudaWrapper> GroupAlgorithm; GroupCpuWrapper, GroupCudaWrapper> GroupAlgorithm;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment