Fix compilotion error with Intel

CMakeLists.txt

@@ -109,9 +109,9 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
     option( OPENMP_SUPPORT_PRIORITY  "Set to ON to enable tasks priority (KSTAR/StarPU compiler only)" OFF )
     option( OPENMP_SUPPORT_TASK_NAME "Set to ON to enable a taskname clause for tasks (KSTAR/StarPU compiler only)" OFF )
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      option( SCALFMM_DISABLE_NATIVE_OMP4 "Set to ON to disable the gcc/intel omp4"    OFF )
+      option( SCALFMM_USE_OMP4 "Set to ON to disable the gcc/intel omp4"    OFF )
     else()
-      option( SCALFMM_DISABLE_NATIVE_OMP4 "Set to ON to disable the gcc/intel omp4"    ON )
+      option( SCALFMM_USE_OMP4 "Set to ON to disable the gcc/intel omp4"    ON )
     endif()
     option( SCALFMM_TIME_OMPTASKS "Set to ON to time omp4 tasks and generate output file"    OFF )
 # SIMGRID and peformance models options
@@ -616,6 +616,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
   list(APPEND FUSE_LIST "STARPU")
   list(APPEND FUSE_LIST "CUDA")
   list(APPEND FUSE_LIST "OPENCL")
+  list(APPEND FUSE_LIST "OMP4")
 
   ##################################################################
   #                         Use SSE                                #
@@ -959,6 +960,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
   message(STATUS "SCALFMM_CXX_FLAGS     =  ${SCALFMM_CXX_FLAGS}")
   message(STATUS "SCALFMM_LIBRARIES     =  ${SCALFMM_LIBRARIES}")
   message(STATUS "SCALFMM_INCLUDES      =  ${SCALFMM_INCLUDES}")
+  message(STATUS "FUSE_LIST             =  ${FUSE_LIST}")
   #
   ##################################################################
   #                               END                              #

ScalFMMConfig.cmake.in

@@ -27,18 +27,18 @@ SET(SCALFMM_BUILD_TYPE     "@CMAKE_BUILD_TYPE@")
 #
 # SCALFMM Options
 #
+SET(SCALFMM_USE_ADDONS           "@SCALFMM_USE_ADDONS@")
 SET(SCALFMM_USE_MPI              "@SCALFMM_USE_MPI@")
 SET(SCALFMM_USE_BLAS             "@SCALFMM_USE_BLAS@")
 SET(SCALFMM_USE_FFT              "@SCALFMM_USE_FFT@")
 SET(SCALFMM_USE_MKL              "@SCALFMM_USE_MKL_AS_BLAS@")
-SET(SCALFMM_USE_MEM_STATS        "@SCALFMM_USE_MEM_STATS@") 
-SET(SCALFMM_USE_SSE              "@SCALFMM_USE_SSE@")
 SET(SCALFMM_FLAGS                "@SCALFMM_FLAGS_OPTI@")
-SET(SCALFMM_USE_ADDONS           "@SCALFMM_USE_ADDONS@")
+SET(SCALFMM_USE_MEM_STATS        "@SCALFMM_USE_MEM_STATS@") 
 SET(SCALFMM_USE_LOG              "@SCALFMM_USE_LOG@")
+SET(SCALFMM_USE_OMP4             "@SCALFMM_USE_OMP4@")
 SET(SCALFMM_USE_STARPU           "@SCALFMM_USE_STARPU@")
-SET(SCALFMM_USE_SSE 			  "@SCALFMM_USE_SSE@")
-SET(SCALFMM_USE_AVX             "@SCALFMM_USE_AVX@")
+SET(SCALFMM_USE_SSE              "@SCALFMM_USE_SSE@")
+SET(SCALFMM_USE_AVX              "@SCALFMM_USE_AVX@")
 #
 SET(SCALFMM_DOC_TAGS           "@CMAKE_BINARY_DIR@/Doc/scalfmm.tag")
 

Tests/Utils/testChebInterpolator.cpp

@@ -16,6 +16,7 @@
 
 // ==== CMAKE =====
 // @FUSE_BLAS
+// @FUSE_OMP4
 // ================
 
 

Tests/Utils/testFmmAlgorithmOmp4.cpp

@@ -18,7 +18,7 @@
 // "http://www.gnu.org/licenses".
 // ===================================================================================
 
-// @SCALFMM_PRIVATE
+// @   SCALFMM_PRIVATE
 
 // @FUSE_OMP4
 

UTests/FUKernelTester.hpp

@@ -96,7 +96,7 @@ public:
         // Run FMM computation
         /////////////////////////////////////////////////////////////////////////////////////////////////
         Print("Fmm...");
-        std::unique_ptr<KernelClass> kernels(GetKernelFunc(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(),&MatrixKernel));
+	std::unique_ptr<KernelClass> kernels(GetKernelFunc(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(),&MatrixKernel));
         FmmClass algo(&tree,kernels.get());
         algo.execute();
         //
@@ -118,12 +118,12 @@ public:
 
             tree.forEachLeaf([&](LeafClass* leaf){
                 const FReal*const potentials        = leaf->getTargets()->getPotentials();
-                const FReal*const physicalValues = leaf->getTargets()->getPhysicalValues();
-                const FReal*const forcesX            = leaf->getTargets()->getForcesX();
-                const FReal*const forcesY            = leaf->getTargets()->getForcesY();
-                const FReal*const forcesZ            = leaf->getTargets()->getForcesZ();
-                const FSize nbParticlesInLeaf           = leaf->getTargets()->getNbParticles();
-                const FVector<FSize>& indexes = leaf->getTargets()->getIndexes();
+                const FReal*const physicalValues    = leaf->getTargets()->getPhysicalValues();
+                const FReal*const forcesX           = leaf->getTargets()->getForcesX();
+                const FReal*const forcesY           = leaf->getTargets()->getForcesY();
+                const FReal*const forcesZ           = leaf->getTargets()->getForcesZ();
+                const FSize nbParticlesInLeaf       = leaf->getTargets()->getNbParticles();
+                const FVector<FSize>& indexes       = leaf->getTargets()->getIndexes();
 
                 for(FSize idxPart = 0 ; idxPart < nbParticlesInLeaf ; ++idxPart){
                     const FSize indexPartOrig = indexes[idxPart];

UTests/utestChebyshev.cpp

@@ -34,65 +34,65 @@
 #include "Kernels/P2P/FP2PParticleContainerIndexed.hpp"
 /*
   In this test we compare the Chebyschev fmm results and the direct results.
- */
+*/
 
 /** the test class
  *
  */
 class TestChebyshevDirect : public FUKernelTester<TestChebyshevDirect> {
 
-	///////////////////////////////////////////////////////////
-	// Set the tests!
-	///////////////////////////////////////////////////////////
-
-
-	/** TestChebKernel */
-	void TestChebKernel(){
-        typedef double FReal;
-		const unsigned int ORDER = 6;
-		typedef FP2PParticleContainerIndexed<FReal> ContainerClass;
-		typedef FSimpleLeaf<FReal, ContainerClass> LeafClass;
-		typedef FInterpMatrixKernelR<FReal> MatrixKernelClass;
-		typedef FChebCell<FReal,ORDER> CellClass;
-		typedef FOctree<FReal, CellClass,ContainerClass,LeafClass> OctreeClass;
-		typedef FChebKernel<FReal,CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
-		typedef FFmmAlgorithm<OctreeClass,CellClass,ContainerClass,KernelClass,LeafClass> FmmClass;
-		// run test
+  ///////////////////////////////////////////////////////////
+  // Set the tests!
+  ///////////////////////////////////////////////////////////
+
+
+  /** TestChebKernel */
+  void TestChebKernel(){
+    typedef double FReal;
+    const unsigned int ORDER = 6;
+    typedef FP2PParticleContainerIndexed<FReal> ContainerClass;
+    typedef FSimpleLeaf<FReal, ContainerClass> LeafClass;
+    typedef FInterpMatrixKernelR<FReal> MatrixKernelClass;
+    typedef FChebCell<FReal,ORDER> CellClass;
+    typedef FOctree<FReal, CellClass,ContainerClass,LeafClass> OctreeClass;
+    typedef FChebKernel<FReal,CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
+    typedef FFmmAlgorithm<OctreeClass,CellClass,ContainerClass,KernelClass,LeafClass> FmmClass;
+    // run test
     RunTest<FReal,CellClass,ContainerClass,KernelClass,MatrixKernelClass,LeafClass,OctreeClass,FmmClass>(
-                                                                                     [&](int NbLevels, FReal boxWidth, FPoint<FReal> centerOfBox, const MatrixKernelClass *const MatrixKernel){
-                                                                                       return std::unique_ptr<KernelClass>(new KernelClass(NbLevels, boxWidth, centerOfBox, MatrixKernel));
-        });
-	}
-
-	/** TestChebSymKernel */
-	void TestChebSymKernel(){
-        typedef double FReal;
-		const unsigned int ORDER = 6;
-		typedef FP2PParticleContainerIndexed<FReal> ContainerClass;
-		typedef FSimpleLeaf<FReal, ContainerClass> LeafClass;
-		typedef FInterpMatrixKernelR<FReal> MatrixKernelClass;
-		typedef FChebCell<FReal,ORDER> CellClass;
-		typedef FOctree<FReal, CellClass,ContainerClass,LeafClass> OctreeClass;
-		typedef FChebSymKernel<FReal,CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
-		typedef FFmmAlgorithm<OctreeClass,CellClass,ContainerClass,KernelClass,LeafClass> FmmClass;
-		// run test
+													 [&](int NbLevels, FReal boxWidth, FPoint<FReal> centerOfBox, const MatrixKernelClass *const MatrixKernel){
+													   return std::unique_ptr<KernelClass>(new KernelClass(NbLevels, boxWidth, centerOfBox, MatrixKernel));
+													 });
+  }
+
+  /** TestChebSymKernel */
+  void TestChebSymKernel(){
+    typedef double FReal;
+    const unsigned int ORDER = 6;
+    typedef FP2PParticleContainerIndexed<FReal> ContainerClass;
+    typedef FSimpleLeaf<FReal, ContainerClass> LeafClass;
+    typedef FInterpMatrixKernelR<FReal> MatrixKernelClass;
+    typedef FChebCell<FReal,ORDER> CellClass;
+    typedef FOctree<FReal, CellClass,ContainerClass,LeafClass> OctreeClass;
+    typedef FChebSymKernel<FReal,CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
+    typedef FFmmAlgorithm<OctreeClass,CellClass,ContainerClass,KernelClass,LeafClass> FmmClass;
+    // run test
     RunTest<FReal,CellClass,ContainerClass,KernelClass,MatrixKernelClass,LeafClass,OctreeClass,FmmClass>(
-                    [&](int NbLevels, FReal boxWidth, FPoint<FReal> centerOfBox, const MatrixKernelClass *const MatrixKernel){
-            return std::unique_ptr<KernelClass>(new KernelClass(NbLevels, boxWidth, centerOfBox, MatrixKernel));
-        });
-	}
+													 [&](int NbLevels, FReal boxWidth, FPoint<FReal> centerOfBox, const MatrixKernelClass *const MatrixKernel){
+													   return std::unique_ptr<KernelClass>(new KernelClass(NbLevels, boxWidth, centerOfBox, MatrixKernel));
+													 });
+  }
 
 
 
-	///////////////////////////////////////////////////////////
-	// Set the tests!
-	///////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////
+  // Set the tests!
+  ///////////////////////////////////////////////////////////
 
-	/** set test */
-	void SetTests(){
-		AddTest(&TestChebyshevDirect::TestChebKernel,"Test Chebyshev Kernel with one big SVD");
-		AddTest(&TestChebyshevDirect::TestChebSymKernel,"Test Chebyshev Kernel with 16 small SVDs and symmetries");
-	}
+  /** set test */
+  void SetTests(){
+    AddTest(&TestChebyshevDirect::TestChebKernel,"Test Chebyshev Kernel with one big SVD");
+    AddTest(&TestChebyshevDirect::TestChebSymKernel,"Test Chebyshev Kernel with 16 small SVDs and symmetries");
+  }
 };