Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
dca129bb
Commit
dca129bb
authored
Feb 26, 2015
by
BRAMAS Berenger
Browse files
Make it compile without starpu
parent
c61aaca5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Tests/noDist/testBlockedAlgorithm.cpp
View file @
dca129bb
...
...
@@ -24,6 +24,7 @@
#endif
#ifdef ScalFMM_USE_STARPU
#include
"../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
#include
"../../Src/GroupTree/FStarPUKernelCapacities.hpp"
#endif
#include
"../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
#include
"../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
...
...
@@ -38,8 +39,6 @@
#include
"../../Src/Files/FFmaGenericLoader.hpp"
#include
"../../Src/Core/FFmmAlgorithm.hpp"
#include
"../../Src/GroupTree/FStarPUKernelCapacities.hpp"
int
main
(
int
argc
,
char
*
argv
[]){
const
FParameterNames
LocalOptionBlocSize
{
{
"-bs"
},
...
...
@@ -52,14 +51,16 @@ int main(int argc, char* argv[]){
typedef
FTestCell
GroupCellClass
;
typedef
FGroupTestParticleContainer
GroupContainerClass
;
typedef
FGroupTree
<
GroupCellClass
,
GroupContainerClass
,
2
,
long
long
int
>
GroupOctreeClass
;
typedef
FStarPUAllYesCapacities
<
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>>
GroupKernelClass
;
#ifdef ScalFMM_USE_STARPU
typedef
FStarPUAllYesCapacities
<
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>>
GroupKernelClass
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(ScalFMM_USE_OMP4)
typedef
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>
GroupKernelClass
;
// Set the number of threads
omp_set_num_threads
(
FParameters
::
getValue
(
argc
,
argv
,
FParameterDefinitions
::
NbThreads
.
options
,
omp_get_max_threads
()));
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#else
typedef
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>
GroupKernelClass
;
//typedef FGroupSeqAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass > GroupAlgorithm;
typedef
FGroupTaskAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#endif
...
...
Tests/noDist/testBlockedChebyshev.cpp
View file @
dca129bb
...
...
@@ -32,6 +32,7 @@
#endif
#ifdef ScalFMM_USE_STARPU
#include
"../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
#include
"../../Src/GroupTree/FStarPUKernelCapacities.hpp"
#endif
#include
"../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
...
...
@@ -46,8 +47,6 @@
#include
<memory>
#include
"../../Src/GroupTree/FStarPUKernelCapacities.hpp"
int
main
(
int
argc
,
char
*
argv
[]){
...
...
@@ -64,14 +63,16 @@ int main(int argc, char* argv[]){
typedef
FChebCell
<
ORDER
>
GroupCellClass
;
typedef
FP2PGroupParticleContainer
<>
GroupContainerClass
;
typedef
FGroupTree
<
GroupCellClass
,
GroupContainerClass
,
5
,
FReal
>
GroupOctreeClass
;
typedef
FStarPUAllYesCapacities
<
FChebSymKernel
<
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>>
GroupKernelClass
;
#ifdef ScalFMM_USE_STARPU
typedef
FStarPUAllYesCapacities
<
FChebSymKernel
<
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>>
GroupKernelClass
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(ScalFMM_USE_OMP4)
typedef
FChebSymKernel
<
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>
GroupKernelClass
;
// Set the number of threads
omp_set_num_threads
(
FParameters
::
getValue
(
argc
,
argv
,
FParameterDefinitions
::
NbThreads
.
options
,
omp_get_max_threads
()));
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#else
typedef
FChebSymKernel
<
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>
GroupKernelClass
;
//typedef FGroupSeqAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass > GroupAlgorithm;
typedef
FGroupTaskAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#endif
...
...
Tests/noDist/testBlockedRotation.cpp
View file @
dca129bb
...
...
@@ -28,6 +28,7 @@
#endif
#ifdef ScalFMM_USE_STARPU
#include
"../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
#include
"../../Src/GroupTree/FStarPUKernelCapacities.hpp"
#endif
#include
"../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
...
...
@@ -40,8 +41,6 @@
#include
"../../Src/Core/FFmmAlgorithm.hpp"
#include
"../../Src/GroupTree/FStarPUKernelCapacities.hpp"
#include
<memory>
...
...
@@ -60,14 +59,16 @@ int main(int argc, char* argv[]){
typedef
FRotationCell
<
P
>
GroupCellClass
;
typedef
FP2PGroupParticleContainer
<>
GroupContainerClass
;
typedef
FGroupTree
<
GroupCellClass
,
GroupContainerClass
,
5
,
FReal
>
GroupOctreeClass
;
typedef
FStarPUAllYesCapacities
<
FRotationKernel
<
GroupCellClass
,
GroupContainerClass
,
P
>>
GroupKernelClass
;
#ifdef ScalFMM_USE_STARPU
typedef
FStarPUAllYesCapacities
<
FRotationKernel
<
GroupCellClass
,
GroupContainerClass
,
P
>>
GroupKernelClass
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(ScalFMM_USE_OMP4)
typedef
FRotationKernel
<
GroupCellClass
,
GroupContainerClass
,
P
>
GroupKernelClass
;
// Set the number of threads
omp_set_num_threads
(
FParameters
::
getValue
(
argc
,
argv
,
FParameterDefinitions
::
NbThreads
.
options
,
omp_get_max_threads
()));
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#else
typedef
FRotationKernel
<
GroupCellClass
,
GroupContainerClass
,
P
>
GroupKernelClass
;
//typedef FGroupSeqAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass > GroupAlgorithm;
typedef
FGroupTaskAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#endif
...
...
Tests/noDist/testBlockedTree.cpp
View file @
dca129bb
...
...
@@ -35,12 +35,12 @@
#endif
#ifdef ScalFMM_USE_STARPU
#include
"../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
#include
"../../Src/GroupTree/FStarPUKernelCapacities.hpp"
#endif
#include
"../../Src/GroupTree/FP2PGroupParticleContainer.hpp"
#include
"../../Src/Utils/FParameterNames.hpp"
#include
"../../Src/GroupTree/FStarPUKernelCapacities.hpp"
int
main
(
int
argc
,
char
*
argv
[]){
const
FParameterNames
LocalOptionBlocSize
{
...
...
@@ -97,12 +97,14 @@ int main(int argc, char* argv[]){
typedef
FStarPUAllYesCapacities
<
FRotationKernel
<
CellClass
,
FP2PGroupParticleContainer
<>
,
P
>>
KernelClass
;
#ifdef ScalFMM_USE_STARPU
typedef
FStarPUAllYesCapacities
<
FRotationKernel
<
CellClass
,
FP2PGroupParticleContainer
<>
,
P
>>
KernelClass
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
CellClass
,
KernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
FP2PGroupParticleContainer
<>
>
GroupAlgorithm
;
#elif defined(ScalFMM_USE_OMP4)
typedef
FRotationKernel
<
CellClass
,
FP2PGroupParticleContainer
<>
,
P
>
KernelClass
;
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
CellClass
,
KernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
FP2PGroupParticleContainer
<>
>
GroupAlgorithm
;
#else
typedef
FRotationKernel
<
CellClass
,
FP2PGroupParticleContainer
<>
,
P
>
KernelClass
;
//typedef FGroupSeqAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, CellClass, KernelClass, typename GroupOctreeClass::ParticleGroupClass, FP2PGroupParticleContainer<> > GroupAlgorithm;
typedef
FGroupTaskAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
CellClass
,
KernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
FP2PGroupParticleContainer
<>
>
GroupAlgorithm
;
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment