Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
5
Issues
5
List
Boards
Labels
Milestones
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
58c7d39e
Commit
58c7d39e
authored
Mar 14, 2017
by
Berenger Bramas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make it compile
parent
98d24a41
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
64 additions
and
60 deletions
+64
-60
Src/Files/FGenerateDistribution.hpp
Src/Files/FGenerateDistribution.hpp
+6
-2
Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
+43
-43
Tests/GroupTree/testBlockedAlgorithm.cpp
Tests/GroupTree/testBlockedAlgorithm.cpp
+1
-1
Tests/GroupTree/testBlockedAlgorithmDyn.cpp
Tests/GroupTree/testBlockedAlgorithmDyn.cpp
+1
-1
Tests/GroupTree/testBlockedChebyshev.cpp
Tests/GroupTree/testBlockedChebyshev.cpp
+1
-1
Tests/GroupTree/testBlockedChebyshevMartin.cpp
Tests/GroupTree/testBlockedChebyshevMartin.cpp
+3
-3
Tests/GroupTree/testBlockedImplicitAlgorithm.cpp
Tests/GroupTree/testBlockedImplicitAlgorithm.cpp
+1
-1
Tests/GroupTree/testBlockedImplicitChebyshev.cpp
Tests/GroupTree/testBlockedImplicitChebyshev.cpp
+1
-1
Tests/GroupTree/testBlockedImplicitUniform.cpp
Tests/GroupTree/testBlockedImplicitUniform.cpp
+1
-1
Tests/GroupTree/testBlockedRotation.cpp
Tests/GroupTree/testBlockedRotation.cpp
+1
-1
Tests/GroupTree/testBlockedRotationCompare.cpp
Tests/GroupTree/testBlockedRotationCompare.cpp
+1
-1
Tests/GroupTree/testBlockedTaylor.cpp
Tests/GroupTree/testBlockedTaylor.cpp
+1
-1
Tests/GroupTree/testBlockedTree.cpp
Tests/GroupTree/testBlockedTree.cpp
+1
-1
Tests/GroupTree/testBlockedUniformBench.cpp
Tests/GroupTree/testBlockedUniformBench.cpp
+1
-1
Tests/GroupTree/testBlockedUniformCompare.cpp
Tests/GroupTree/testBlockedUniformCompare.cpp
+1
-1
No files found.
Src/Files/FGenerateDistribution.hpp
View file @
58c7d39e
...
...
@@ -124,8 +124,7 @@ void unifRandomPointsInBall(const FSize N, const FReal R, FReal* points) {
* \param points array of size 4*N and stores data as follow x,y,z,0,x,y,z,0....
*/
template
<
class
FReal
>
void
nonunifRandomPointsOnElipsoid
(
const
FSize
N
,
const
FReal
&
a
,
const
FReal
&
b
,
const
FReal
&
c
,
FReal
*
points
)
void
nonunifRandomPointsOnElipsoid
(
const
FSize
N
,
const
FReal
&
a
,
const
FReal
&
b
,
const
FReal
&
c
,
FReal
*
points
)
{
#ifdef SCALFMM_OLD_ELLIPSOID
FReal
u
,
v
,
cosu
;
...
...
@@ -193,6 +192,11 @@ void nonunifRandomPointsOnElipsoid(const FSize N, const FReal& a, const FReal& b
}
template
<
class
FReal
>
void
nonunifRandomPointsOnElipsoid
(
const
FSize
N
,
const
FReal
&
a
,
const
FReal
&
b
,
FReal
*
points
){
nonunifRandomPointsOnElipsoid
(
N
,
a
,
b
,
FReal
(
1
),
points
);
}
/**
* \brief Generate N points uniformly distributed on the ellipsoid of aspect ratio a:a:c
*
...
...
Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
View file @
58c7d39e
This diff is collapsed.
Click to expand it.
Tests/GroupTree/testBlockedAlgorithm.cpp
View file @
58c7d39e
...
...
@@ -65,7 +65,7 @@ int main(int argc, char* argv[]){
#ifdef SCALFMM_USE_STARPU
typedef
FStarPUAllCpuCapacities
<
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(SCALFMM_USE_OMP4)
typedef
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>
GroupKernelClass
;
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
...
...
Tests/GroupTree/testBlockedAlgorithmDyn.cpp
View file @
58c7d39e
...
...
@@ -193,7 +193,7 @@ int main(int argc, char* argv[]){
#ifdef SCALFMM_USE_STARPU
typedef
FStarPUAllCpuCapacities
<
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(SCALFMM_USE_OMP4)
typedef
FTestKernels
<
GroupCellClass
,
GroupContainerClass
>
GroupKernelClass
;
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
...
...
Tests/GroupTree/testBlockedChebyshev.cpp
View file @
58c7d39e
...
...
@@ -71,7 +71,7 @@ int main(int argc, char* argv[]){
#ifdef SCALFMM_USE_STARPU
typedef
FStarPUAllCpuCapacities
<
FChebSymKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(SCALFMM_USE_OMP4)
typedef
FChebSymKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>
GroupKernelClass
;
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
...
...
Tests/GroupTree/testBlockedChebyshevMartin.cpp
View file @
58c7d39e
...
...
@@ -74,7 +74,7 @@ int main(int argc, char* argv[]){
#ifdef SCALFMM_USE_STARPU
typedef
FStarPUAllCpuCapacities
<
FChebSymKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(SCALFMM_USE_OMP4)
typedef
FChebSymKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>
GroupKernelClass
;
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
...
...
@@ -101,10 +101,10 @@ int main(int argc, char* argv[]){
#ifdef RANDOM_PARTICLES
setSeed
(
1
);
FReal
*
tmpParticles
=
new
FReal
[
4
*
loader
.
getNumberOfParticles
()];
if
(
FParameters
::
existParameter
(
argc
,
argv
,
"-ellipsoid"
))
{
if
(
FParameters
::
existParameter
(
argc
,
argv
,
"-ellipsoid"
))
{
nonunifRandomPointsOnElipsoid
(
loader
.
getNumberOfParticles
(),
loader
.
getBoxWidth
()
/
2
,
loader
.
getBoxWidth
()
/
4
,
tmpParticles
);
}
else
if
(
FParameters
::
existParameter
(
argc
,
argv
,
"-plummer"
))
{
else
if
(
FParameters
::
existParameter
(
argc
,
argv
,
"-plummer"
))
{
//The M argument is not used in the algorithm of the plummer distribution
unifRandomPlummer
(
loader
.
getNumberOfParticles
(),
loader
.
getBoxWidth
()
/
2
,
tmpParticles
)
;
}
...
...
Tests/GroupTree/testBlockedImplicitAlgorithm.cpp
View file @
58c7d39e
...
...
@@ -28,7 +28,7 @@ using namespace std;
#include "../../Src/GroupTree/Core/FP2PGroupParticleContainer.hpp"
#include "../../Src/GroupTree/Core/FGroupTaskAlgorithm.hpp"
#include "../../Src/
BalanceTree
/FLeafBalance.hpp"
#include "../../Src/
Utils
/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
...
...
Tests/GroupTree/testBlockedImplicitChebyshev.cpp
View file @
58c7d39e
...
...
@@ -34,7 +34,7 @@ using namespace std;
#include "../../Src/Kernels/Chebyshev/FChebCell.hpp" //For validation
#include "../../Src/Core/FFmmAlgorithm.hpp" //For validation
#include "../../Src/
BalanceTree
/FLeafBalance.hpp"
#include "../../Src/
Utils
/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
...
...
Tests/GroupTree/testBlockedImplicitUniform.cpp
View file @
58c7d39e
...
...
@@ -36,7 +36,7 @@ using namespace std;
#include "../../Src/Core/FFmmAlgorithm.hpp" //For validation
#include "../../Src/
BalanceTree
/FLeafBalance.hpp"
#include "../../Src/
Utils
/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
...
...
Tests/GroupTree/testBlockedRotation.cpp
View file @
58c7d39e
...
...
@@ -57,7 +57,7 @@ int main(int argc, char* argv[]){
#ifdef SCALFMM_USE_STARPU
typedef
FStarPUAllCpuCapacities
<
FRotationKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
P
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(SCALFMM_USE_OMP4)
typedef
FRotationKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
P
>
GroupKernelClass
;
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
...
...
Tests/GroupTree/testBlockedRotationCompare.cpp
View file @
58c7d39e
...
...
@@ -619,7 +619,7 @@ struct RunContainer{
if
(
FParameters
::
existParameter
(
argc
,
argv
,
LocalOptionGroupStarPU
.
options
)){
typedef
FStarPUAllCpuCapacities
<
FRotationKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
ORDER
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
std
::
cout
<<
"Using FGroupTaskStarPUAlgorithm"
<<
std
::
endl
;
GroupKernelClass
groupkernel
(
NbLevels
,
loader
.
getBoxWidth
(),
loader
.
getCenterOfBox
());
GroupAlgorithm
groupalgo
(
&
groupedTree
,
&
groupkernel
);
...
...
Tests/GroupTree/testBlockedTaylor.cpp
View file @
58c7d39e
...
...
@@ -57,7 +57,7 @@ int main(int argc, char* argv[]){
#ifdef SCALFMM_USE_STARPU
typedef
FStarPUAllCpuCapacities
<
FTaylorKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
P
,
1
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(SCALFMM_USE_OMP4)
typedef
FTaylorKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
P
,
1
>
GroupKernelClass
;
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
...
...
Tests/GroupTree/testBlockedTree.cpp
View file @
58c7d39e
...
...
@@ -107,7 +107,7 @@ int main(int argc, char* argv[]){
#ifdef SCALFMM_USE_STARPU
typedef
FStarPUAllCpuCapacities
<
FRotationKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
P
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
#elif defined(SCALFMM_USE_OMP4)
typedef
FRotationKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
P
>
GroupKernelClass
;
typedef
FGroupTaskDepAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
...
...
Tests/GroupTree/testBlockedUniformBench.cpp
View file @
58c7d39e
...
...
@@ -74,7 +74,7 @@ int main(int argc, char* argv[]){
typedef
FStarPUAllCpuCapacities
<
FUnifKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
// Get params
const
int
NbLevels
=
FParameters
::
getValue
(
argc
,
argv
,
FParameterDefinitions
::
OctreeHeight
.
options
,
5
);
...
...
Tests/GroupTree/testBlockedUniformCompare.cpp
View file @
58c7d39e
...
...
@@ -643,7 +643,7 @@ struct RunContainer{
#ifdef SCALFMM_USE_STARPU
typedef
FStarPUAllCpuCapacities
<
FUnifKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>>
GroupKernelClass
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
,
GroupContainerClass
>
GroupAlgorithm
;
std
::
cout
<<
"Using FGroupTaskStarPUAlgorithm"
<<
std
::
endl
;
#elif defined(SCALFMM_USE_OMP4)
typedef
FUnifKernel
<
FReal
,
GroupCellClass
,
GroupContainerClass
,
MatrixKernelClass
,
ORDER
>
GroupKernelClass
;
...
...
Write
Preview
Markdown
is supported
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