Commit ad26bd45 authored by PIACIBELLO Cyrille's avatar PIACIBELLO Cyrille
Browse files
parents 16836b35 b5991826
......@@ -310,7 +310,7 @@ if( ScalFMM_USE_SSE )
TRY_COMPILE(COMPILE_RESULT_VAR ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_MODULE_PATH}/checkSSEpe.cpp COMPILE_DEFINITIONS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}")
IF( NOT ${COMPILE_RESULT_VAR})
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -D__SSEPE_INTEL_COMPILER")
SET(__SSEPE_INTEL_COMPILER ON)
ENDIF()
# SET(ScalFMM_USE_AVX OFF)
ELSE(${COMPILE_SSE})
......@@ -335,7 +335,7 @@ if(ScalFMM_USE_AVX)
TRY_COMPILE(COMPILE_RESULT_AVSPE ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_MODULE_PATH}/checkAVXpe.cpp COMPILE_DEFINITIONS "${CMAKE_CXX_FLAGS} ${AVX_FLAGS}")
IF( NOT ${COMPILE_RESULT_AVSPE})
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -D__AVXPE_INTEL_COMPILER")
SET(__AVXPE_INTEL_COMPILER ON)
ENDIF()
MESSAGE(STATUS ${CMAKE_CXX_FLAGS} )
......
......@@ -230,7 +230,7 @@ public:
// Sort if needed
if(particlesAreSorted == false){
FQuickSort<ParticleSortingStruct, int>::QsOmp(particlesToSort, nbParticles, [&](const ParticleSortingStruct& v1, const ParticleSortingStruct& v2){
FQuickSort<ParticleSortingStruct, int>::QsOmp(particlesToSort, nbParticles, [](const ParticleSortingStruct& v1, const ParticleSortingStruct& v2){
return v1.mindex <= v2.mindex;
});
}
......@@ -407,7 +407,7 @@ public:
// Sort if needed
if(particlesAreSorted == false){
FQuickSort<ParticleSortingStruct, int>::QsOmp(particlesToSort, nbParticles, [&](const ParticleSortingStruct& v1, const ParticleSortingStruct& v2){
FQuickSort<ParticleSortingStruct, int>::QsOmp(particlesToSort, nbParticles, [](const ParticleSortingStruct& v1, const ParticleSortingStruct& v2){
return v1.mindex <= v2.mindex;
});
}
......
......@@ -71,12 +71,14 @@
///////////////////////////////////////////////////////
#cmakedefine ScalFMM_USE_SSE
#cmakedefine __AVXPE_INTEL_COMPILER
///////////////////////////////////////////////////////
// AVX
///////////////////////////////////////////////////////
#cmakedefine ScalFMM_USE_AVX
#cmakedefine __SSEPE_INTEL_COMPILER
///////////////////////////////////////////////////////
// STARPU
......
......@@ -122,7 +122,8 @@ protected:
if(left < right){
const IndexType part = QsPartition(array, left, right, infOrEqual);
if( deep ){
#pragma omp task default(none) firstprivate(array, part, right, deep, infOrEqual)
// default(none) has been removed for clang compatibility
#pragma omp task firstprivate(array, part, right, deep, infOrEqual)
QsOmpTask(array,part + 1,right, deep - 1, infOrEqual);
// #pragma omp task default(none) firstprivate(array, part, right, deep, infOrEqual) // not needed
QsOmpTask(array,left,part - 1, deep - 1, infOrEqual);
......@@ -141,7 +142,7 @@ public:
}
static void QsSequential(SortType array[], const IndexType size){
QsSequential(array, size, [&](const SortType& v1, const SortType& v2){
QsSequential(array, size, [](const SortType& v1, const SortType& v2){
return v1 <= v2;
});
}
......@@ -225,7 +226,7 @@ public:
#endif
static void QsOmp(SortType array[], const IndexType size){
QsOmp(array, size, [&](const SortType& v1, const SortType& v2){
QsOmp(array, size, [](const SortType& v1, const SortType& v2){
return v1 <= v2;
});
}
......
......@@ -23,8 +23,6 @@
#include "../../Src/Containers/FOctree.hpp"
#include "../../Src/Core/FFmmAlgorithm.hpp"
#include "../../Src/Kernels/P2P/FP2PParticleContainer.hpp"
#include "../../Src/Kernels/Rotation/FRotationKernel.hpp"
......@@ -34,10 +32,6 @@
#include "../../Src/Utils/FMemUtils.hpp"
#include "../../Src/Utils/FParameters.hpp"
#include "../../Src/Core/FFmmAlgorithm.hpp"
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmTask.hpp"
#include "../../Src/Files/FFmaGenericLoader.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......
......@@ -217,8 +217,7 @@ struct TempMainStruct{
const FReal*const forcesY = leaf->getTargets()->getForcesY();
const FReal*const forcesZ = leaf->getTargets()->getForcesZ();
const int nbParticlesInLeaf = leaf->getTargets()->getNbParticles();
//
const FVector<int>& indexes = leaf->getTargets()->getIndexes();
//
for(int idxPart = 0 ; idxPart < nbParticlesInLeaf ; ++idxPart){
double pot = 0.0 , xx,yy,zz;
FPoint FF ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment