Merge pull request #2660 from heplesser/fix-2515-macomp

Fix OpenMP issues on CI under macOS and re-activate testing with threads for macOS
nest · Apr 21, 2023 · 0888491 · 0888491
2 parents b905eb9 + 03469fa
commit 0888491
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/nestbuildmatrix.yml b/.github/workflows/nestbuildmatrix.yml
@@ -226,7 +226,6 @@ jobs:
       - name: "Install MacOS system dependencies"
         run: |
           brew install coreutils gsl open-mpi libomp automake autoconf libtool boost
-          brew info python
 
       - name: "Restore pip cache"
         env:

diff --git a/build_support/ci_build.sh b/build_support/ci_build.sh
@@ -178,7 +178,7 @@ if [ "$xNEST_BUILD_TYPE" = "FULL_MACOS" ]; then
     xLTDL=1
     xMPI=1
     xMUSIC=0
-    xOPENMP=0
+    xOPENMP=1
     xPYTHON=1
     xREADLINE=1
     xSIONLIB=0
@@ -196,6 +196,9 @@ echo "MSGBLD0232: Setting configuration variables."
 
 if [ "$xOPENMP" = "1" ] ; then
     CONFIGURE_OPENMP="-Dwith-openmp=ON"
+    if [ "$xNEST_BUILD_TYPE" = "FULL_MACOS" ]; then
+	CONFIGURE_OPENMP="${CONFIGURE_OPENMP} -DOpenMP_ROOT=`brew --prefix libomp`"
+    fi
 else
     CONFIGURE_OPENMP="-Dwith-openmp=OFF"
 fi
@@ -303,6 +306,7 @@ cmake \
     -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
     -Dwith-optimize=ON \
     -Dwith-warning=ON \
+    -Dwith-userdoc=OFF \
     $CONFIGURE_BOOST \
     $CONFIGURE_OPENMP \
     $CONFIGURE_MPI \