Skip to content
GitLab
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
5987c581
Commit
5987c581
authored
Nov 25, 2014
by
BRAMAS Berenger
Browse files
Update to support starpu
parent
6afa580c
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
5987c581
...
...
@@ -255,6 +255,14 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
endif
()
endif
()
endif
()
if
(
ScalFMM_USE_STARPU
)
SET
(
STARPU_LIBRARIES
" -L$ENV{STARPU_LIB}; -lstarpu-1.1"
)
# CACHE STRING "Set your STARPU flags"
SET
(
STARPU_INCLUDES
"$ENV{STARPU_INC}"
)
# CACHE STRING "Set your STARPU flags"
SET
(
SCALFMM_LIBRARIES
"
${
SCALFMM_LIBRARIES
}
;
${
STARPU_LIBRARIES
}
"
)
# SET(SCALFMM_INCLUDES "${SCALFMM_INCLUDES}; ${STARPU_INCLUDES}")
include_directories
(
${
STARPU_INCLUDES
}
)
endif
(
ScalFMM_USE_STARPU
)
##############################################################################
##############################################################################
...
...
Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp
0 → 100644
View file @
5987c581
This diff is collapsed.
Click to expand it.
Tests/noDist/testBlockedAlgorithm.cpp
View file @
5987c581
...
...
@@ -15,6 +15,7 @@
#include
"../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
#include
"../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
#include
"../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
#include
"../../Src/Utils/FParameterNames.hpp"
...
...
@@ -39,7 +40,7 @@ int main(int argc, char* argv[]){
typedef
FGroupTree
<
GroupCellClass
,
GroupContainerClass
,
2
,
long
long
int
>
GroupOctreeClass
;
typedef
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>
GroupKernelClass
;
#ifdef ScalFMM_USE_STARPU
typedef
FGroupStar
PU
Algorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
typedef
FGroup
Task
Star
pu
Algorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(ScalFMM_USE_OMP4)
// Set the number of threads
omp_set_num_threads
(
FParameters
::
getValue
(
argc
,
argv
,
FParameterDefinitions
::
NbThreads
.
options
,
omp_get_max_threads
()));
...
...
Tests/noDist/testBlockedChebyshev.cpp
View file @
5987c581
...
...
@@ -21,6 +21,7 @@
#include
"../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
#include
"../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
#include
"../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
#include
"../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
#include
"../../Src/Utils/FParameterNames.hpp"
...
...
@@ -52,7 +53,7 @@ int main(int argc, char* argv[]){
typedef
FGroupTree
<
GroupCellClass
,
GroupContainerClass
,
5
,
FReal
>
GroupOctreeClass
;
typedef
FChebSymKernel
<
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>
GroupKernelClass
;
#ifdef ScalFMM_USE_STARPU
typedef
FGroupStar
PU
Algorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
typedef
FGroup
Task
Star
pu
Algorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(ScalFMM_USE_OMP4)
// Set the number of threads
omp_set_num_threads
(
FParameters
::
getValue
(
argc
,
argv
,
FParameterDefinitions
::
NbThreads
.
options
,
omp_get_max_threads
()));
...
...
Tests/noDist/testBlockedRotation.cpp
View file @
5987c581
...
...
@@ -20,6 +20,7 @@
#include
"../../Src/GroupTree/FGroupSeqAlgorithm.hpp"
#include
"../../Src/GroupTree/FGroupTaskAlgorithm.hpp"
#include
"../../Src/GroupTree/FGroupTaskDepAlgorithm.hpp"
#include
"../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
#include
"../../Src/Utils/FParameterNames.hpp"
...
...
@@ -50,7 +51,7 @@ int main(int argc, char* argv[]){
typedef
FGroupTree
<
GroupCellClass
,
GroupContainerClass
,
5
,
FReal
>
GroupOctreeClass
;
typedef
FRotationKernel
<
GroupCellClass
,
GroupContainerClass
,
P
>
GroupKernelClass
;
#ifdef ScalFMM_USE_STARPU
typedef
FGroupStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
typedef
FGroup
Task
StarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(ScalFMM_USE_OMP4)
// Set the number of threads
omp_set_num_threads
(
FParameters
::
getValue
(
argc
,
argv
,
FParameterDefinitions
::
NbThreads
.
options
,
omp_get_max_threads
()));
...
...
Tests/noDist/testBlockedTree.cpp
View file @
5987c581
...
...
@@ -21,6 +21,7 @@
#include
"../../Src/Core/FFmmAlgorithm.hpp"
#include
"../../Src/Core/FFmmAlgorithmThread.hpp"
#include
"../../Src/Core/FFmmAlgorithmTask.hpp"
#include
"../../Src/GroupTree/FGroupTaskStarpuAlgorithm.hpp"
#include
"../../Src/Files/FFmaGenericLoader.hpp"
...
...
@@ -88,7 +89,7 @@ int main(int argc, char* argv[]){
typedef
FRotationKernel
<
CellClass
,
FP2PGroupParticleContainer
<>
,
P
>
KernelClass
;
#ifdef ScalFMM_USE_STARPU
typedef
FGroupStar
PU
Algorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
CellClass
,
KernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
FP2PGroupParticleContainer
<>
>
GroupAlgorithm
;
typedef
FGroup
Task
Star
pu
Algorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
CellClass
,
KernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
FP2PGroupParticleContainer
<>
>
GroupAlgorithm
;
#elif defined(ScalFMM_USE_OMP4)
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
CellClass
,
KernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
FP2PGroupParticleContainer
<>
>
GroupAlgorithm
;
#else
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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