Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
solverstack
ScalFMM
Commits
1366284e
Commit
1366284e
authored
May 05, 2015
by
COULAUD Olivier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Intel options are now ok. Now static is Dynamic per default in thread algorithm
parent
7ba6f704
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
CMakeLists.txt
CMakeLists.txt
+3
-3
Examples/ChebyshevInterpolationFMM.cpp
Examples/ChebyshevInterpolationFMM.cpp
+2
-1
Src/Core/FFmmAlgorithmThread.hpp
Src/Core/FFmmAlgorithmThread.hpp
+2
-2
No files found.
CMakeLists.txt
View file @
1366284e
...
...
@@ -547,11 +547,11 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
try_compile
(
COMPILE_RESULT_AVSPE
${
CMAKE_CURRENT_BINARY_DIR
}
${
SCALFMM_CMAKE_MODULE_PATH
}
/checkAVXpe.cpp
COMPILE_DEFINITIONS
"
${
CMAKE_CXX_FLAGS
}
${
AVX_FLAGS
}
"
)
#
if( NOT ${COMPILE_RESULT_AVSPE})
if
(
NOT
${
COMPILE_RESULT_AVSPE
}
)
set
(
__AVXPE_INTEL_COMPILER ON
)
#
endif()
endif
()
message
(
STATUS
${
CMAKE_CXX_FLAGS
}
)
else
(
${
COMPILE_AVX
}
)
...
...
@@ -776,7 +776,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
#set(CMAKE_CXX_FLAGS "${SCALFMM_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
message
(
STATUS
"SCALFMM_USE_BLAS =
${
SCALFMM_USE_BLAS
}
"
)
message
(
STATUS
"SCALFMM_USE_FFT =
${
SCALFMM_USE_FFT
}
"
)
message
(
STATUS
"SCALFMM_USE_MKL =
TODO
"
)
message
(
STATUS
"SCALFMM_USE_MKL =
${
SCALFMM_USE_MKL
}
"
)
#
message
(
STATUS
"CMAKE_CXX_FLAGS =
${
CMAKE_CXX_FLAGS
}
"
)
message
(
STATUS
"SCALFMM_CXX_FLAGS =
${
SCALFMM_CXX_FLAGS
}
"
)
...
...
Examples/ChebyshevInterpolationFMM.cpp
View file @
1366284e
...
...
@@ -150,7 +150,8 @@ int main(int argc, char* argv[])
//
KernelClass
kernels
(
TreeHeight
,
loader
.
getBoxWidth
(),
loader
.
getCenterOfBox
(),
&
MatrixKernel
);
//
FmmClass
algo
(
&
tree
,
&
kernels
);
// false : dynamic schedule.
FmmClass
algo
(
&
tree
,
&
kernels
,
true
);
//
algo
.
execute
();
// Here the call of the FMM algorithm
//
...
...
Src/Core/FFmmAlgorithmThread.hpp
View file @
1366284e
...
...
@@ -80,12 +80,12 @@ public:
* The constructor needs the octree and the kernels used for computation.
* \param inTree the octree to work on.
* \param inKernels the kernels to call.
* \param inStaticSchedule Whether to use static or dynamic OpenMP scheduling.
* \param inStaticSchedule Whether to use static or dynamic OpenMP scheduling.
default is dynamic.
*
* \except An exception is thrown if one of the arguments is NULL.
*/
FFmmAlgorithmThread
(
OctreeClass
*
const
inTree
,
KernelClass
*
const
inKernels
,
const
bool
inStaticSchedule
=
tru
e
,
const
int
inLeafLevelSeperationCriteria
=
1
)
const
bool
inStaticSchedule
=
fals
e
,
const
int
inLeafLevelSeperationCriteria
=
1
)
:
tree
(
inTree
)
,
kernels
(
nullptr
),
iterArray
(
nullptr
),
leafsNumber
(
0
),
MaxThreads
(
omp_get_max_threads
()),
OctreeHeight
(
tree
->
getHeight
()),
staticSchedule
(
inStaticSchedule
),
leafLevelSeperationCriteria
(
inLeafLevelSeperationCriteria
)
{
...
...
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