allow omp4 to be turned off

12460cdb · BRAMAS Berenger · 137e8fa7 · 12460cdb · 12460cdb · 12460cdb
Commit 12460cdb authored Jul 06, 2015 by BRAMAS Berenger
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +1 -0

Src/ScalFmmConfig.h.cmake Src/ScalFmmConfig.h.cmake +1 -0

Src/Utils/FGlobal.hpp Src/Utils/FGlobal.hpp +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
    option( OPENMP_SUPPORT_COMMUTE   "Set to ON to let tasks commute (KSTAR/StarPU compiler only)" OFF )
    option( SCALFMM_USE_STARPU  "Set to ON to build SCALFMM with StarPU" OFF )
    option( SCALFMM_BUILD_UTILS "Set to ON to build utils Tests"    OFF )
+    option( SCALFMM_DISABLE_NATIVE_OMP4 "Set to ON to disable the gcc/intel omp4"    OFF )
  endif()
  if( SCALFMM_USE_MPI )
    try_compile(COMPILE_INTEL ${CMAKE_CURRENT_BINARY_DIR}

--- a/Src/ScalFmmConfig.h.cmake
+++ b/Src/ScalFmmConfig.h.cmake
@@ -65,6 +65,7 @@
 ///////////////////////////////////////////////////////

 #cmakedefine SCALFMM_USE_STARPU
+#cmakedefine SCALFMM_DISABLE_NATIVE_OMP4

 ///////////////////////////////////////////////////////
 // SSE

--- a/Src/Utils/FGlobal.hpp
+++ b/Src/Utils/FGlobal.hpp
@@ -99,7 +99,7 @@ typedef long long MortonIndex;
 // Test OMP4
 ///////////////////////////////////////////////////////

-#if _OPENMP >= 201307
+#if _OPENMP >= 201307 && !defined(SCALFMM_DISABLE_NATIVE_OMP4)
 #ifndef __INTEL_COMPILER
 #define SCALFMM_USE_OMP4
 #endif