Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit e7934b0

Browse files
authored
Update to latest nmodl master (#302)
* Update to latest nmodl master * Use latest working PGI to install coreneuron in CI * Update python usage with pip 3
1 parent 94ede63 commit e7934b0

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ addons:
9191
- libboost-all-dev
9292
- libopenmpi-dev
9393
- openmpi-bin
94+
- python3-dev
95+
- python3-pip
9496

9597
# for Mac builds, we use Homebrew
9698
homebrew:
@@ -99,6 +101,7 @@ addons:
99101
- flex
100102
- openmpi
101103
- boost
104+
- python@3
102105
update: true
103106

104107
#=============================================================================
@@ -111,9 +114,7 @@ before_install:
111114
export PATH=/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH;
112115
brew unlink python@2;
113116
brew link --overwrite python;
114-
fi
115-
# when python 3.6.7 is required, ex. NMODL in linux
116-
- if [ -n "$PYTHON_VERSION" ]; then
117+
else
117118
pyenv global $PYTHON_VERSION;
118119
fi
119120
# install NMODL dependencies
@@ -146,9 +147,9 @@ script:
146147
- mkdir build && cd build
147148
- if [[ "$USE_ISPC" == "ON" ]]; then
148149
cmake -DCORENRN_ENABLE_ISPC=ON -DCMAKE_ISPC_COMPILER=../ispc/bin/ispc
149-
-DCMAKE_INSTALL_PREFIX=$HOME/CoreNeuron ..;
150+
-DCMAKE_INSTALL_PREFIX=$HOME/CoreNeuron -DPYTHON_EXECUTABLE=$(which python3) ..;
150151
else
151-
cmake ${cmake_option} -DCMAKE_INSTALL_PREFIX=$HOME/CoreNeuron ..;
152+
cmake ${cmake_option} -DCMAKE_INSTALL_PREFIX=$HOME/CoreNeuron -DPYTHON_EXECUTABLE=$(which python3) ..;
152153
fi
153154
- cmake --build .
154155
- ctest --output-on-failure

external/nmodl

Submodule nmodl updated 64 files

tests/jenkins/install_coreneuron.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ reportinglib_dir=$(spack cd -i reportinglib%intel && pwd)
1010
CORENRN_TYPE="$1"
1111

1212
if [ "${CORENRN_TYPE}" = "GPU-non-unified" ] || [ "${CORENRN_TYPE}" = "GPU-unified" ]; then
13-
module load pgi/19.4 cuda hpe-mpi cmake boost
13+
module load pgi/19.10 cuda hpe-mpi cmake boost
1414

1515
mkdir build_${CORENRN_TYPE}
1616
else

0 commit comments

Comments
 (0)