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

Commit b34ba52

Browse files
authored
Enable GPU builds under Jenkins (#212)
- set missing LIBRARY_OUTPUT_DIRECTORY for libcudacoreneuron
1 parent 2b329db commit b34ba52

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ With the latest master branch, the workflow of building CoreNEURON is same as th
6868

6969
## Building with GPU support
7070

71-
CoreNEURON has support for GPUs using the OpenACC programming model when enabled with `-DENABLE_OPENACC=ON`. Below are the steps to compile with PGI compiler:
71+
CoreNEURON has support for GPUs using the OpenACC programming model when enabled with `-DCORENRN_ENABLE_GPU=ON`. Below are the steps to compile with PGI compiler:
7272

7373
```bash
7474
module purge
@@ -83,7 +83,7 @@ cmake .. -DCMAKE_C_FLAGS:STRING="-O2" \
8383
-DCOMPILE_LIBRARY_TYPE=STATIC \
8484
-DCUDA_HOST_COMPILER=`which gcc` \
8585
-DCUDA_PROPAGATE_HOST_FLAGS=OFF \
86-
-DENABLE_OPENACC=ON
86+
-DCORENRN_ENABLE_GPU=ON
8787
```
8888

8989
Note that the CUDA Toolkit version should be compatible with PGI compiler installed on your system. Otherwise you have to add extra C/C++ flags. For example, if we are using CUDA Toolkit 9.0 installation but PGI default target is CUDA 8.0 then we have to add :
@@ -229,4 +229,4 @@ See [contributors](https://github.com/BlueBrain/CoreNeuron/graphs/contributors).
229229

230230
## Funding
231231

232-
CoreNEURON is developed in a joint collaboration between the Blue Brain Project and Yale University. This work has been funded by the EPFL Blue Brain Project (funded by the Swiss ETH board), NIH grant number R01NS11613 (Yale University), the European Union Seventh Framework Program (FP7/20072013) under grant agreement n◦ 604102 (HBP) and the Eu- ropean Union’s Horizon 2020 Framework Programme for Research and Innovation under Grant Agreement n◦ 720270 (Human Brain Project SGA1) and Grant Agreement n◦ 785907 (Human Brain Project SGA2).
232+
CoreNEURON is developed in a joint collaboration between the Blue Brain Project and Yale University. This work has been funded by the EPFL Blue Brain Project (funded by the Swiss ETH board), NIH grant number R01NS11613 (Yale University), the European Union Seventh Framework Program (FP7/20072013) under grant agreement n◦ 604102 (HBP) and the Eu- ropean Union’s Horizon 2020 Framework Programme for Research and Innovation under Grant Agreement n◦ 720270 (Human Brain Project SGA1) and Grant Agreement n◦ 785907 (Human Brain Project SGA2).

coreneuron/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ target_link_libraries(coreneuron
170170

171171
target_link_libraries(corenrnmech scopmath coreneuron)
172172

173-
set_target_properties(coreneuron corenrnmech scopmath
173+
set_target_properties(coreneuron corenrnmech scopmath ${link_cudacoreneuron}
174174
PROPERTIES ARCHIVE_OUTPUT_DIRECTORY
175175
${CMAKE_BINARY_DIR}/lib
176176
LIBRARY_OUTPUT_DIRECTORY

tests/jenkins/install_coreneuron.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ if [ "${CORENRN_TYPE}" = "GPU-non-unified" ]; then
2828
-DCOMPILE_LIBRARY_TYPE=STATIC \
2929
-DCUDA_HOST_COMPILER=`which gcc` \
3030
-DCUDA_PROPAGATE_HOST_FLAGS=OFF \
31-
-DENABLE_SELECTIVE_GPU_PROFILING=ON \
32-
-DENABLE_OPENACC=ON \
33-
-DENABLE_UNIFIED=OFF \
31+
-DCORENRN_ENABLE_GPU=ON \
32+
-DCORENRN_ENABLE_CUDA_UNIFIED_MEMORY=OFF \
3433
-DCMAKE_INSTALL_PREFIX=$WORKSPACE/install_${CORENRN_TYPE}/ \
3534
-DTEST_MPI_EXEC_BIN="srun;--exclusive;--account=proj16;--partition=interactive;--constraint=volta;--gres=gpu:1;--mem;0;-t;00:05:00" \
3635
-DTEST_EXEC_PREFIX="srun;-n;6;--exclusive;--account=proj16;--partition=interactive;--constraint=volta;--gres=gpu:1;--mem;0;-t;00:05:00" \
@@ -44,9 +43,8 @@ elif [ "${CORENRN_TYPE}" = "GPU-unified" ]; then
4443
-DCOMPILE_LIBRARY_TYPE=STATIC \
4544
-DCUDA_HOST_COMPILER=`which gcc` \
4645
-DCUDA_PROPAGATE_HOST_FLAGS=OFF \
47-
-DENABLE_SELECTIVE_GPU_PROFILING=ON \
48-
-DENABLE_OPENACC=ON \
49-
-DENABLE_UNIFIED=ON \
46+
-DCORENRN_ENABLE_GPU=ON \
47+
-DCORENRN_ENABLE_CUDA_UNIFIED_MEMORY=ON \
5048
-DCMAKE_INSTALL_PREFIX=$WORKSPACE/install_${CORENRN_TYPE}/ \
5149
-DTEST_MPI_EXEC_BIN="srun;--exclusive;--account=proj16;--partition=interactive;--constraint=volta;--gres=gpu:1;--mem;0;-t;00:05:00" \
5250
-DTEST_EXEC_PREFIX="srun;-n;6;--exclusive;--account=proj16;--partition=interactive;--constraint=volta;--gres=gpu:1;--mem;0;-t;00:05:00" \

0 commit comments

Comments
 (0)