This repository was archived by the owner on Mar 20, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +10
-4
lines changed
Expand file tree Collapse file tree 2 files changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -112,20 +112,22 @@ jobs:
112112 export CXX="g++-${GCC_VERSION}" CC="gcc-${GCC_VERSION}";
113113 fi
114114
115+ openmp=" -DCORENRN_ENABLE_OPENMP=ON"
115116 if [[ "${{ startsWith(matrix.os, 'macOS') }}" = "true" ]]; then
116117 export PATH=/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH;
117118 export CXX=g++;
118119 export CC=gcc;
120+ openmp=" -DCORENRN_ENABLE_OPENMP=OFF";
119121 fi
120122
121123 echo "------- Build, Test and Install -------"
122124 mkdir build && cd build
123125 if [[ "$USE_ISPC" == "ON" ]]; then
124- cmake -DCORENRN_ENABLE_ISPC=ON -DCMAKE_ISPC_COMPILER=${{runner.workspace}}/ispc/bin/ispc -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DPYTHON_EXECUTABLE=$(which python3) ..;
126+ cmake ${openmp} -DCORENRN_ENABLE_ISPC=ON -DCMAKE_ISPC_COMPILER=${{runner.workspace}}/ispc/bin/ispc -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DPYTHON_EXECUTABLE=$(which python3) ..;
125127 elif [[ "$USE_NMODL" == "ON" ]]; then
126- cmake -DCORENRN_ENABLE_NMODL=ON -DCORENRN_NMODL_FLAGS="sympy --analytic" -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DPYTHON_EXECUTABLE=$(which python3) ..;
128+ cmake ${openmp} -DCORENRN_ENABLE_NMODL=ON -DCORENRN_NMODL_FLAGS="sympy --analytic" -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DPYTHON_EXECUTABLE=$(which python3) ..;
127129 else
128- cmake ${cmake_option} -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DPYTHON_EXECUTABLE=$(which python3) ..;
130+ cmake ${cmake_option} ${openmp} -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DPYTHON_EXECUTABLE=$(which python3) ..;
129131 fi
130132 make
131133 ctest --output-on-failure
Original file line number Diff line number Diff line change 9797 cd build
9898 # NEURON CMake assumes this is defined.
9999 export SHELL=$(command -v bash)
100+ openMP=" -DCORENRN_ENABLE_OPENMP=ON"
101+ if [[ "${{ startsWith(matrix.os, 'macOS') }}" = "true" ]]; then
102+ openMP=" -DCORENRN_ENABLE_OPENMP=OFF"
103+ fi
100104 cmake .. -G Ninja \
101105 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
102106 -DCMAKE_INSTALL_PREFIX=../install \
@@ -105,7 +109,7 @@ jobs:
105109 -DNRN_ENABLE_INTERVIEWS=OFF \
106110 -DNRN_ENABLE_RX3D=OFF \
107111 -DNRN_ENABLE_MPI_DYNAMIC=ON \
108- -DNRN_ENABLE_TESTS=ON
112+ -DNRN_ENABLE_TESTS=ON ${openMP}
109113
110114 - name : Build NEURON
111115 run : |
You can’t perform that action at this time.
0 commit comments