Commit e120810c authored by BRAMAS Berenger's avatar BRAMAS Berenger

Move group file and update headers

parent d627f836
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#ifndef FGROUPATTACHEDLEAF_HPP #ifndef FGROUPATTACHEDLEAF_HPP
#define FGROUPATTACHEDLEAF_HPP #define FGROUPATTACHEDLEAF_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
/** /**
* This class is "attached" to a buffer. * This class is "attached" to a buffer.
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
#ifndef FGROUPOFCELLS_HPP #ifndef FGROUPOFCELLS_HPP
#define FGROUPOFCELLS_HPP #define FGROUPOFCELLS_HPP
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../Utils/FAlignedMemory.hpp" #include "../../Utils/FAlignedMemory.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
#include <list> #include <list>
#include <functional> #include <functional>
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
#define FGROUPOFPARTICLES_HPP #define FGROUPOFPARTICLES_HPP
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FAlignedMemory.hpp" #include "../../Utils/FAlignedMemory.hpp"
#include "FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
#include <list> #include <list>
#include <functional> #include <functional>
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
#ifndef FGROUPSEQALGORITHM_HPP #ifndef FGROUPSEQALGORITHM_HPP
#define FGROUPSEQALGORITHM_HPP #define FGROUPSEQALGORITHM_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Core/FCoreCommon.hpp" #include "../../Core/FCoreCommon.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FLog.hpp" #include "../../Utils/FLog.hpp"
#include "../Utils/FTic.hpp" #include "../../Utils/FTic.hpp"
#include "FOutOfBlockInteraction.hpp" #include "FOutOfBlockInteraction.hpp"
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
#ifndef FGROUPTASKALGORITHM_HPP #ifndef FGROUPTASKALGORITHM_HPP
#define FGROUPTASKALGORITHM_HPP #define FGROUPTASKALGORITHM_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Core/FCoreCommon.hpp" #include "../../Core/FCoreCommon.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FLog.hpp" #include "../../Utils/FLog.hpp"
#include "../Utils/FTic.hpp" #include "../../Utils/FTic.hpp"
#include "FOutOfBlockInteraction.hpp" #include "FOutOfBlockInteraction.hpp"
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
#define FGROUPTASKDEPALGORITHM_HPP #define FGROUPTASKDEPALGORITHM_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Core/FCoreCommon.hpp" #include "../../Core/FCoreCommon.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FLog.hpp" #include "../../Utils/FLog.hpp"
#include "../Utils/FTic.hpp" #include "../../Utils/FTic.hpp"
#include "FOutOfBlockInteraction.hpp" #include "FOutOfBlockInteraction.hpp"
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
#ifndef FGROUPTASKSTARPUALGORITHM_HPP #ifndef FGROUPTASKSTARPUALGORITHM_HPP
#define FGROUPTASKSTARPUALGORITHM_HPP #define FGROUPTASKSTARPUALGORITHM_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Core/FCoreCommon.hpp" #include "../../Core/FCoreCommon.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FLog.hpp" #include "../../Utils/FLog.hpp"
#include "../Utils/FTic.hpp" #include "../../Utils/FTic.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "FOutOfBlockInteraction.hpp" #include "FOutOfBlockInteraction.hpp"
...@@ -19,22 +19,22 @@ ...@@ -19,22 +19,22 @@
#include <omp.h> #include <omp.h>
#include <starpu.h> #include <starpu.h>
#include "FStarPUUtils.hpp" #include "../StarPUUtils/FStarPUUtils.hpp"
#ifdef STARPU_USE_CPU #ifdef STARPU_USE_CPU
#include "FStarPUCpuWrapper.hpp" #include "../StarPUUtils/FStarPUCpuWrapper.hpp"
#endif #endif
#ifdef ScalFMM_ENABLE_CUDA_KERNEL #ifdef ScalFMM_ENABLE_CUDA_KERNEL
#include "FStarPUCudaWrapper.hpp" #include "../StarPUUtils/FStarPUCudaWrapper.hpp"
#include "Cuda/FCudaEmptyKernel.hpp" #include "../Cuda/FCudaEmptyKernel.hpp"
#include "Cuda/FCudaGroupAttachedLeaf.hpp" #include "../Cuda/FCudaGroupAttachedLeaf.hpp"
#include "Cuda/FCudaGroupOfParticles.hpp" #include "../Cuda/FCudaGroupOfParticles.hpp"
#include "Cuda/FCudaGroupOfCells.hpp" #include "../Cuda/FCudaGroupOfCells.hpp"
#include "Cuda/FCudaEmptyCell.hpp" #include "../Cuda/FCudaEmptyCell.hpp"
#endif #endif
#ifdef ScalFMM_ENABLE_OPENCL_KERNEL #ifdef ScalFMM_ENABLE_OPENCL_KERNEL
#include "FStarPUOpenClWrapper.hpp" #include "../StarPUUtils/FStarPUOpenClWrapper.hpp"
#include "OpenCl/FOpenCLDeviceWrapper.hpp" #include "../OpenCl/FOpenCLDeviceWrapper.hpp"
#endif #endif
......
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
#ifndef FGROUPTASKSTARPUMPIALGORITHM_HPP #ifndef FGROUPTASKSTARPUMPIALGORITHM_HPP
#define FGROUPTASKSTARPUMPIALGORITHM_HPP #define FGROUPTASKSTARPUMPIALGORITHM_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Core/FCoreCommon.hpp" #include "../../Core/FCoreCommon.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FLog.hpp" #include "../../Utils/FLog.hpp"
#include "../Utils/FTic.hpp" #include "../../Utils/FTic.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../Utils/FAlignedMemory.hpp" #include "../../Utils/FAlignedMemory.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../Utils/FMpi.hpp" #include "../../Utils/FMpi.hpp"
#include "FOutOfBlockInteraction.hpp" #include "FOutOfBlockInteraction.hpp"
...@@ -24,21 +24,21 @@ ...@@ -24,21 +24,21 @@
#include <starpu.h> #include <starpu.h>
#include <starpu_mpi.h> #include <starpu_mpi.h>
#include "FStarPUUtils.hpp" #include "../StarPUUtils/FStarPUUtils.hpp"
#ifdef STARPU_USE_CPU #ifdef STARPU_USE_CPU
#include "FStarPUCpuWrapper.hpp" #include "../StarPUUtils/FStarPUCpuWrapper.hpp"
#endif #endif
#ifdef ScalFMM_ENABLE_CUDA_KERNEL #ifdef ScalFMM_ENABLE_CUDA_KERNEL
#include "FStarPUCudaWrapper.hpp" #include "../StarPUUtils/FStarPUCudaWrapper.hpp"
#include "Cuda/FCudaEmptyKernel.hpp" #include "../Cuda/FCudaEmptyKernel.hpp"
#include "Cuda/FCudaGroupAttachedLeaf.hpp" #include "../Cuda/FCudaGroupAttachedLeaf.hpp"
#include "Cuda/FCudaGroupOfParticles.hpp" #include "../Cuda/FCudaGroupOfParticles.hpp"
#include "Cuda/FCudaGroupOfCells.hpp" #include "../Cuda/FCudaGroupOfCells.hpp"
#endif #endif
#ifdef ScalFMM_ENABLE_OPENCL_KERNEL #ifdef ScalFMM_ENABLE_OPENCL_KERNEL
#include "FStarPUOpenClWrapper.hpp" #include "../StarPUUtils/FStarPUOpenClWrapper.hpp"
#include "OpenCl/FOpenCLDeviceWrapper.hpp" #include "../OpenCl/FOpenCLDeviceWrapper.hpp"
#endif #endif
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
#include <vector> #include <vector>
#include <functional> #include <functional>
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../Utils/FPoint.hpp" #include "../../Utils/FPoint.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "FGroupOfCells.hpp" #include "FGroupOfCells.hpp"
#include "FGroupOfParticles.hpp" #include "FGroupOfParticles.hpp"
......
#ifndef FOUTOFBLOCKINTERACTION_HPP #ifndef FOUTOFBLOCKINTERACTION_HPP
#define FOUTOFBLOCKINTERACTION_HPP #define FOUTOFBLOCKINTERACTION_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
struct alignas(FStarPUDefaultAlign::StructAlign) OutOfBlockInteraction{ struct alignas(FStarPUDefaultAlign::StructAlign) OutOfBlockInteraction{
MortonIndex outIndex; MortonIndex outIndex;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "../../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../FOutOfBlockInteraction.hpp" #include "../Core/FOutOfBlockInteraction.hpp"
#include "FCudaStructParams.hpp" #include "FCudaStructParams.hpp"
template <class CellClass, class CellContainerClass, class ParticleContainerGroupClass, class ParticleGroupClass, class CudaKernelClass> template <class CellClass, class CellContainerClass, class ParticleContainerGroupClass, class ParticleGroupClass, class CudaKernelClass>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "../../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
struct alignas(FStarPUDefaultAlign::StructAlign) FCudaEmptyCell { struct alignas(FStarPUDefaultAlign::StructAlign) FCudaEmptyCell {
MortonIndex mortonIndex; MortonIndex mortonIndex;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "FCudaGlobal.hpp" #include "FCudaGlobal.hpp"
#include "../FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
/** /**
* @brief The FCudaGroupOfCells class manages the cells in block allocation. * @brief The FCudaGroupOfCells class manages the cells in block allocation.
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define FCUDAGROUPOFPARTICLES_HPP #define FCUDAGROUPOFPARTICLES_HPP
#include "FCudaGlobal.hpp" #include "FCudaGlobal.hpp"
#include "../FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
template <unsigned NbAttributesPerParticle, class AttributeClass = FReal> template <unsigned NbAttributesPerParticle, class AttributeClass = FReal>
class FCudaGroupOfParticles { class FCudaGroupOfParticles {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#ifndef FCUDASTRUCTPARAMS_HPP #ifndef FCUDASTRUCTPARAMS_HPP
#define FCUDASTRUCTPARAMS_HPP #define FCUDASTRUCTPARAMS_HPP
#include "../FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
#include "FCudaGlobal.hpp" #include "FCudaGlobal.hpp"
template <class ArrayType, const int Size> template <class ArrayType, const int Size>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// Return the same thing as FEmptyKernel.cl // Return the same thing as FEmptyKernel.cl
#include "../FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
class FEmptyOpenCLCode{ class FEmptyOpenCLCode{
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#include "../../Utils/FAlignedMemory.hpp" #include "../../Utils/FAlignedMemory.hpp"
#include "../../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../FOutOfBlockInteraction.hpp" #include "../Core/FOutOfBlockInteraction.hpp"
#include "FEmptyOpenCLCode.hpp" #include "FEmptyOpenCLCode.hpp"
#include "../FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
#include <starpu.h> #include <starpu.h>
......
...@@ -4,20 +4,20 @@ ...@@ -4,20 +4,20 @@
#define FSTARPUCPUWRAPPER_HPP #define FSTARPUCPUWRAPPER_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Core/FCoreCommon.hpp" #include "../../Core/FCoreCommon.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FLog.hpp" #include "../../Utils/FLog.hpp"
#include "../Utils/FTic.hpp" #include "../../Utils/FTic.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../Utils/FAlignedMemory.hpp" #include "../../Utils/FAlignedMemory.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "FOutOfBlockInteraction.hpp" #include "../Core/FOutOfBlockInteraction.hpp"
#ifdef ScalFMM_USE_MPI #ifdef ScalFMM_USE_MPI
#include "../Utils/FMpi.hpp" #include "../../Utils/FMpi.hpp"
#endif #endif
#include <vector> #include <vector>
......
...@@ -2,20 +2,20 @@ ...@@ -2,20 +2,20 @@
#ifndef FSTARPUCUDAWRAPPER_HPP #ifndef FSTARPUCUDAWRAPPER_HPP
#define FSTARPUCUDAWRAPPER_HPP #define FSTARPUCUDAWRAPPER_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Core/FCoreCommon.hpp" #include "../../Core/FCoreCommon.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FLog.hpp" #include "../../Utils/FLog.hpp"
#include "../Utils/FTic.hpp" #include "../../Utils/FTic.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../Utils/FAlignedMemory.hpp" #include "../../Utils/FAlignedMemory.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "FOutOfBlockInteraction.hpp" #include "../Core/FOutOfBlockInteraction.hpp"
#ifdef ScalFMM_USE_MPI #ifdef ScalFMM_USE_MPI
#include "../Utils/FMpi.hpp" #include "../../Utils/FMpi.hpp"
#endif #endif
#include <vector> #include <vector>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <starpu_mpi.h> #include <starpu_mpi.h>
#endif #endif
#include "Cuda/FCudaDeviceWrapper.hpp" #include "../Cuda/FCudaDeviceWrapper.hpp"
#include "FStarPUUtils.hpp" #include "FStarPUUtils.hpp"
......
...@@ -5,20 +5,20 @@ ...@@ -5,20 +5,20 @@
#define FSTARPUOPENCLWRAPPER_HPP #define FSTARPUOPENCLWRAPPER_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Core/FCoreCommon.hpp" #include "../../Core/FCoreCommon.hpp"
#include "../Utils/FQuickSort.hpp" #include "../../Utils/FQuickSort.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "../Utils/FLog.hpp" #include "../../Utils/FLog.hpp"
#include "../Utils/FTic.hpp" #include "../../Utils/FTic.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "../Utils/FAlignedMemory.hpp" #include "../../Utils/FAlignedMemory.hpp"
#include "../Utils/FAssert.hpp" #include "../../Utils/FAssert.hpp"
#include "FOutOfBlockInteraction.hpp" #include "../Core/FOutOfBlockInteraction.hpp"
#ifdef ScalFMM_USE_MPI #ifdef ScalFMM_USE_MPI
#include "../Utils/FMpi.hpp" #include "../../Utils/FMpi.hpp"
#endif #endif
#include <vector> #include <vector>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#define FSTARPUUTILS_HPP #define FSTARPUUTILS_HPP
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#ifndef FCUDATESTKERNEL_HPP #ifndef FCUDATESTKERNEL_HPP
#define FCUDATESTKERNEL_HPP #define FCUDATESTKERNEL_HPP
#include "FCudaGlobal.hpp" #include "../Cuda/FCudaGlobal.hpp"
// We need to describe this cell // We need to describe this cell
#include "../../Components/FTestCell.hpp" #include "../../Components/FTestCell.hpp"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#ifndef FGROUPTESTPARTICLECONTAINER_HPP #ifndef FGROUPTESTPARTICLECONTAINER_HPP
#define FGROUPTESTPARTICLECONTAINER_HPP #define FGROUPTESTPARTICLECONTAINER_HPP
#include "FGroupAttachedLeaf.hpp" #include "../Core/FGroupAttachedLeaf.hpp"
class FGroupTestParticleContainer : public FGroupAttachedLeaf<2, long long int> { class FGroupTestParticleContainer : public FGroupAttachedLeaf<2, long long int> {
typedef FGroupAttachedLeaf<2, long long int> Parent; typedef FGroupAttachedLeaf<2, long long int> Parent;
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#ifndef FTESTCELLPOD_HPP #ifndef FTESTCELLPOD_HPP
#define FTESTCELLPOD_HPP #define FTESTCELLPOD_HPP
#include "../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../Containers/FTreeCoordinate.hpp" #include "../../Containers/FTreeCoordinate.hpp"
#include "FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"
struct alignas(FStarPUDefaultAlign::StructAlign) FTestCellPODCore { struct alignas(FStarPUDefaultAlign::StructAlign) FTestCellPODCore {
MortonIndex mortonIndex; MortonIndex mortonIndex;
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
#define FTESTOPENCLCODE_HPP #define FTESTOPENCLCODE_HPP
#include "../../Utils/FGlobal.hpp" #include "../../Utils/FGlobal.hpp"
#include "../FStarPUDefaultAlign.hpp" #include "../StarPUUtils/FStarPUDefaultAlign.hpp"