Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix OpenMP issues on CI under macOS and re-activate testing with threads for macOS #2660

Merged
merged 1 commit into from
Apr 21, 2023
Merged

Fix OpenMP issues on CI under macOS and re-activate testing with threads for macOS #2660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/nestbuildmatrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion build_support/ci_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 \
Expand Down