Merge branch 'hotfix/0.12.3'

* hotfix/0.12.3: Version 0.12.3 Fix ninja warning Fix bamboo leap42 again Fix bamboo leap42 link fail to boost/cgal Fix bamboo leap42 ATLAS-146 Fix OpenMP stubs with clang ATLAS-146 Fix OpenMP stubs
ecmwf · Jan 26, 2018 · 0599b8a · 0599b8a
2 parents e38b9b8 + c2b70cb
commit 0599b8a
Show file tree

Hide file tree

Showing 12 changed files with 174 additions and 306 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -6,5 +6,5 @@
 # granted to it by virtue of its status as an intergovernmental organisation nor
 # does it submit to any jurisdiction.
 
-set  ( ${PROJECT_NAME}_VERSION_STR  "0.12.2" )
+set  ( ${PROJECT_NAME}_VERSION_STR  "0.12.3" )
 
diff --git a/bamboo/CLANG-env.sh b/bamboo/CLANG-env.sh
@@ -4,6 +4,11 @@
 if [[ ! $(command -v module > /dev/null 2>&1) ]]; then
   . /usr/local/apps/module/init/bash
 fi
+
 module unload grib_api
 module unload eccodes
-module switch gnu clang/3.6.2
+module unload emos
+module unload fftw
+module unload libemos
+
+module switch gnu clang
diff --git a/bamboo/CLANG-flags.cmake b/bamboo/CLANG-flags.cmake
@@ -3,3 +3,4 @@ set( ENABLE_MPI                 OFF CACHE BOOL "Disable MPI under Clang compilat
 set( ENABLE_TRANS               ON  CACHE BOOL "Enable TRANS" )
 set( ENABLE_ATLAS_TEST_GRIDSPEC ON  CACHE BOOL "Enable atlas_test_gridspec")
 set( ENABLE_BOUNDSCHECKING      ON  CACHE BOOL "Enable bounds checking")
+set( ENABLE_TESSELATION         OFF CACHE BOOL "Disable CGAL" ) # cgal is old in leap42
diff --git a/bamboo/INTEL-env.sh b/bamboo/INTEL-env.sh
@@ -8,4 +8,5 @@ module unload eccodes
 module unload emos
 module unload fftw
 module unload libemos
+
 module switch gnu intel/16.0.3
diff --git a/bamboo/INTEL-flags.cmake b/bamboo/INTEL-flags.cmake
@@ -3,3 +3,4 @@ set( ENABLE_MPI                 OFF CACHE BOOL "Disable MPI under Intel compilat
 set( ENABLE_TRANS               ON  CACHE BOOL "Enable TRANS" )
 set( ENABLE_ATLAS_TEST_GRIDSPEC ON  CACHE BOOL "Enable atlas_test_gridspec")
 set( ENABLE_BOUNDSCHECKING      ON  CACHE BOOL "Enable bounds checking")
+set( ENABLE_TESSELATION         OFF CACHE BOOL "Disable CGAL" ) # cgal is old in leap42
diff --git a/bamboo/opensuse131-env.sh → bamboo/leap42-env.sh b/bamboo/opensuse131-env.sh → bamboo/leap42-env.sh
diff --git a/bamboo/opensuse131-flags.cmake → bamboo/leap42-flags.cmake b/bamboo/opensuse131-flags.cmake → bamboo/leap42-flags.cmake
@@ -3,3 +3,4 @@ set( ENABLE_MPI                 OFF CACHE BOOL "Disable MPI" )
 set( ENABLE_TRANS               ON  CACHE BOOL "Enable TRANS" )
 set( ENABLE_ATLAS_TEST_GRIDSPEC ON  CACHE BOOL "Enable atlas_test_gridspec")
 set( ENABLE_BOUNDSCHECKING      ON  CACHE BOOL "Enable bounds checking")
+set( ENABLE_TESSELATION         OFF CACHE BOOL "Disable CGAL" ) # cgal is old in leap42
diff --git a/src/apps/atlas-benchmark.cc b/src/apps/atlas-benchmark.cc
@@ -209,7 +209,7 @@ void AtlasBenchmark::execute(const Args& args)
   haloexchange_timer = TimerStats("halo-exchange");
 
   if( omp_threads > 0 )
-    omp_set_num_threads(omp_threads);
+    atlas_omp_set_num_threads(omp_threads);
 
   Log::info() << "atlas-benchmark\n" << endl;
   Log::info() << Library::instance().info() << endl;
@@ -219,7 +219,7 @@ void AtlasBenchmark::execute(const Args& args)
   Log::info() << "  niter: " << niter << endl;
   Log::info() << endl;
   Log::info() << "  MPI tasks: "<<parallel::mpi::comm().size()<<endl;
-  Log::info() << "  OpenMP threads per MPI task: " << omp_get_max_threads() << endl;
+  Log::info() << "  OpenMP threads per MPI task: " << atlas_omp_get_max_threads() << endl;
   Log::info() << endl;
 
   Log::info() << "Timings:" << endl;