Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit d2d773f3 authored by BRAMAS Berenger's avatar BRAMAS Berenger

Remove some warnings and add the patch for the omp to starpu auto version

parent c46cba15
......@@ -111,8 +111,12 @@ else()
# NOT INTEL
if(NOT ${ScalFMM_USE_MPI})
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -Wzero-as-null-pointer-constant")
else()
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -Wno-literal-suffix")
else()
include(CheckCCompilerFlag)
check_c_compiler_flag(-Wno-literal-suffix HAS_NO_LITERAL_SUFFIX_FLAG)
if(HAS_NO_LITERAL_SUFFIX_FLAG)
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -Wno-literal-suffix")
endif()
endif()
SET(AVX_FLAGS "-mtune=native -march=native")
IF (APPLE)
......
......@@ -118,7 +118,7 @@ int main(int argc, char* argv[])
#ifdef _OPENMP
omp_set_num_threads(NbThreads);
#else
std::cout << "\n>> Sequential version.\n" << std::
std::cout << "\n>> Sequential version.\n" << std::endl;
#endif
std::cout << "Parameters "<< std::endl
......
......@@ -22,6 +22,16 @@ enum FSmartPointerType{
FSmartPointerMemory
};
template <FSmartPointerType MemoryType, class ClassType>
inline typename std::enable_if<(MemoryType == FSmartArrayMemory), void>::type FSmartDeletePointer(ClassType* ptr){
delete ptr;
}
template <FSmartPointerType MemoryType, class ClassType>
inline typename std::enable_if<(MemoryType == FSmartPointerMemory), void>::type FSmartDeletePointer(ClassType* ptr){
delete[] ptr;
}
/** This class is a basic smart pointer class
* Use as FSmartPointer<int> array = new int[5];
* FSmartPointer<int, PointerMemory> pt = new int;
......@@ -87,8 +97,7 @@ public:
if(counter){
(*counter) -= 1;
if( (*counter) == 0 ){
if(MemoryType == FSmartArrayMemory) delete[] pointer;
else if(MemoryType == FSmartPointerMemory) delete pointer;
FSmartDeletePointer<MemoryType>(pointer);
delete counter;
}
pointer = nullptr;
......
......@@ -26,6 +26,14 @@
#include <smmintrin.h> // SSE4
#endif
#ifndef _mm_set_pd1
// Looks like clang's emmintrin.h doesn't have this alternate name.
// But _mm_set1_pd is an equivalent to _mm_set_pd1.
#define _mm_set_pd1 _mm_set1_pd
#endif
#ifdef __SSEPE_INTEL_COMPILER
inline __m128d& operator+=(__m128d& v1, const __m128d& v2){
......
......@@ -231,8 +231,9 @@ int main(int argc, char ** argv){
typedef FRotationKernel< CellClass, ContainerClass,7 > KernelClass;
typedef FFmmAlgorithmThreadProc<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass > FmmClass;
#ifdef VALIDATE_FMM
typedef FFmmAlgorithmThread<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass > FmmClassNoProc;
#endif
///////////////////////What we do/////////////////////////////
std::cout << ">> This executable has to be used to test Proc Rotation algorithm.\n";
......
......@@ -125,7 +125,6 @@ int main(int argc, char ** argv){
// ----------------------------------------------------------------------------------------------------------
// COMPUTATION
// ----------------------------------------------------------------------------------------------------------
FReal denergy = 0.0;
//
// computation
//
......
......@@ -64,7 +64,6 @@ int main(int argc, char ** argv){
typedef FSphericalBlockBlasKernel< CellClass, ContainerClass > KernelClass;
typedef FFmmAlgorithmThreadProc<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass > FmmClass;
typedef FFmmAlgorithmThread<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass > FmmClassNoProc;
///////////////////////What we do/////////////////////////////
......
......@@ -122,7 +122,7 @@ class TestMpiQs : public FUTesterMpi<TestMpiQs> {
////////////////////////////////////////////////////////////
void TestSmallSort(){
const int myRank = app.global().processId();
//const int myRank = app.global().processId();
const int nbProcess = app.global().processCount();
const int nbElements = nbProcess;
......@@ -170,7 +170,7 @@ class TestMpiQs : public FUTesterMpi<TestMpiQs> {
}
void TestSameSort(){
const int myRank = app.global().processId();
//const int myRank = app.global().processId();
const int nbProcess = app.global().processCount();
const int nbElements = nbProcess * 100;
......@@ -219,8 +219,8 @@ class TestMpiQs : public FUTesterMpi<TestMpiQs> {
}
void TestBigSort(){
const int myRank = app.global().processId();
const int nbProcess = app.global().processCount();
//const int myRank = app.global().processId();
//const int nbProcess = app.global().processCount();
const int nbElements = 500;
std::unique_ptr<long[]> elements(new long[nbElements]);
......@@ -245,8 +245,8 @@ class TestMpiQs : public FUTesterMpi<TestMpiQs> {
void TestPivotSort(){
const int myRank = app.global().processId();
const int nbProcess = app.global().processCount();
//const int myRank = app.global().processId();
//const int nbProcess = app.global().processCount();
const int nbElements = 500;
std::unique_ptr<long[]> elements(new long[nbElements]);
......
......@@ -138,7 +138,7 @@ int main(int argc, char ** argv){
}
double boxsize[3] ;
FPoint centre ;
FSize numberofParticles ;
FSize numberofParticles = 0;
double energy = 0.0 ;
FmaRWParticle<8,8>* particlesIn ; //= new FmaRWParticle<8,8>[numberofParticles];
if( FParameters::existParameter(argc, argv, "-energy") ){
......@@ -203,7 +203,7 @@ int main(int argc, char ** argv){
// const --> then shared
//
double totalCharge = 0.0, readEnergy;
double totalCharge = 0.0, readEnergy = 0.0;
//
for(int idxPart = 0 ; idxPart < numberofParticles; ++idxPart){
//
......@@ -241,7 +241,7 @@ int main(int argc, char ** argv){
}
else if( FParameters::existParameter(argc, argv, "-FMM2Ewald") ){
preScaleEnergy = 1.0 ; postScaleEnergy = scaleEnergy ; preScaleForce = 1.0; postScaleForce = scaleForce ;
coeffCorrection = coeffCorrection;
//coeffCorrection = coeffCorrection;
}
else {
std::cout << " -Ewald2FMM or -FMM2Ewald should be set"<<std::endl;
......
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