Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
solverstack
ScalFMM
Commits
8d876dce
Commit
8d876dce
authored
Mar 01, 2018
by
COULAUD Olivier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improvements with Intel compiler. Still compilation problem
parent
5eccb5e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
Examples/ChebyshevInterpolationAdaptiveFMM.cpp
Examples/ChebyshevInterpolationAdaptiveFMM.cpp
+4
-2
Src/Adaptive/FAdaptiveTask.hpp
Src/Adaptive/FAdaptiveTask.hpp
+4
-2
Src/Adaptive/FVariadicParticleContainer.hpp
Src/Adaptive/FVariadicParticleContainer.hpp
+3
-2
No files found.
Examples/ChebyshevInterpolationAdaptiveFMM.cpp
View file @
8d876dce
...
...
@@ -74,8 +74,8 @@ using LeafClass = typename OctreeClass::node_t;
using
MatrixKernelClass
=
FInterpMatrixKernelR
<
FReal
>
;
using
KernelClass
=
FAdaptChebKernel
<
FReal
,
CellClass
,
ContainerClass
,
MatrixKernelClass
,
ORDER
>
;
//
using
FmmClass
=
FAdaptiveTask
<
OctreeClass
,
KernelClass
>
;
using
FmmClassSeq
=
FAdaptiveSequential
<
OctreeClass
,
KernelClass
>
;
using
FmmClass
=
FAdaptiveTask
<
OctreeClass
,
KernelClass
>
;
using
FmmClassSeq
=
FAdaptiveSequential
<
OctreeClass
,
KernelClass
>
;
namespace
FPD
=
FParameterDefinitions
;
namespace
FParameterDefinitions
{
...
...
@@ -179,6 +179,8 @@ int main(int argc, char* argv[]) {
#ifndef __INTEL_COMPILER
FmmClass
algo
(
&
tree
,
&
kernel
);
algo
.
execute
();
// FMM algorithm call
#else
std
::
cerr
<<
" No FMM algorithm with Intel compiler"
<<
std
::
endl
;
#endif
}
...
...
Src/Adaptive/FAdaptiveTask.hpp
View file @
8d876dce
...
...
@@ -126,9 +126,10 @@ public:
* \param tree The tree to run over
* \param kernel The kernel to use
*/
FAdaptiveTask
(
tree_t
*
tree
,
kernel_t
*
kernel
)
:
_tree
(
*
tree
)
FAdaptiveTask
(
tree_t
*
tree
,
kernel_t
*
kernel
)
:
_tree
(
*
tree
)
{
// Place kernel objects near their threads in memory to avoid NUMA
// latency
#pragma omp parallel
...
...
@@ -140,6 +141,7 @@ public:
#pragma omp barrier
}
}
}
std
::
string
name
()
const
override
{
...
...
Src/Adaptive/FVariadicParticleContainer.hpp
View file @
8d876dce
...
...
@@ -132,8 +132,9 @@ public:
position
,
args
...);
}
template
<
typename
Position
,
typename
...
Args
,
std
::
size_t
...
Is
,
std
::
size_t
...
Js
,
typename
...
Ts
>
template
<
typename
Position
,
typename
...
Args
,
std
::
size_t
...
Is
,
std
::
size_t
...
Js
>
//, typename... Ts >
void
push_impl
(
inria
::
index_sequence
<
Is
...
>
,
inria
::
index_sequence
<
Js
...
>
,
const
Position
&
position
,
...
...
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