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

Commit 956bde6

Browse files
author
Nicolas Cornu
authored
Always enable report in gitlab tests (#758)
* Always enable report in gitlab * Add transitive deps * Put back comments about RelWithDebInfo
1 parent ee26e59 commit 956bde6

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,16 @@ build:coreneuron:mod2c:nvhpc:acc:
8282
extends: [.build, .spack_nvhpc]
8383
variables:
8484
SPACK_PACKAGE: coreneuron
85-
# +report pulls in a lot of dependencies and the tests fail.
8685
# See https://github.com/BlueBrain/CoreNeuron/issues/518 re: build_type
87-
SPACK_PACKAGE_SPEC: +gpu+openmp+tests~legacy-unit~report build_type=RelWithDebInfo
86+
SPACK_PACKAGE_SPEC: +gpu+openmp+tests~legacy-unit build_type=RelWithDebInfo
8887

8988
# Build CoreNEURON with Unified Memory on GPU
9089
build:coreneuron:mod2c:nvhpc:acc:unified:
9190
extends: [.build, .spack_nvhpc]
9291
variables:
9392
SPACK_PACKAGE: coreneuron
94-
# +report pulls in a lot of dependencies and the tests fail.
9593
# See https://github.com/BlueBrain/CoreNeuron/issues/518 re: build_type
96-
SPACK_PACKAGE_SPEC: +gpu+unified+openmp+tests~legacy-unit~report build_type=RelWithDebInfo
94+
SPACK_PACKAGE_SPEC: +gpu+unified+openmp+tests~legacy-unit build_type=RelWithDebInfo
9795

9896
.build_coreneuron_nmodl:
9997
extends: [.build]
@@ -113,19 +111,17 @@ build:coreneuron:nmodl:nvhpc:omp:
113111
extends: [.build_coreneuron_nmodl, .spack_nvhpc]
114112
variables:
115113
SPACK_PACKAGE: coreneuron
116-
# +report pulls in a lot of dependencies and the tests fail.
117114
# See https://github.com/BlueBrain/CoreNeuron/issues/518 re: build_type
118-
SPACK_PACKAGE_SPEC: +nmodl+openmp+gpu+tests~legacy-unit~report~sympy build_type=RelWithDebInfo
115+
SPACK_PACKAGE_SPEC: +nmodl+openmp+gpu+tests~legacy-unit~sympy build_type=RelWithDebInfo
119116
needs: ["build:nmodl"]
120117

121118
build:coreneuron:nmodl:nvhpc:acc:
122119
extends: [.build_coreneuron_nmodl, .spack_nvhpc]
123120
variables:
124121
SPACK_PACKAGE: coreneuron
125-
# +report pulls in a lot of dependencies and the tests fail.
126122
# See https://github.com/BlueBrain/CoreNeuron/issues/518 re: build_type
127123
# Sympy + OpenMP target offload does not currently work with NVHPC
128-
SPACK_PACKAGE_SPEC: +nmodl~openmp+gpu+tests~legacy-unit~report+sympy build_type=RelWithDebInfo
124+
SPACK_PACKAGE_SPEC: +nmodl~openmp+gpu+tests~legacy-unit+sympy build_type=RelWithDebInfo
129125
needs: ["build:nmodl"]
130126

131127
build:coreneuron:mod2c:intel:

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNORE_UNKNOWN_PRAGMA_FLAGS}")
433433
# =============================================================================
434434
add_subdirectory(coreneuron)
435435

436+
if(CORENRN_ENABLE_GPU)
437+
get_target_property(CORENRN_LINK_LIBRARIES coreneuron INTERFACE_LINK_LIBRARIES)
438+
foreach(LIB ${CORENRN_LINK_LIBRARIES})
439+
set_property(GLOBAL APPEND_STRING PROPERTY CORENEURON_LIB_LINK_FLAGS " ${LIB}")
440+
endforeach()
441+
endif()
442+
436443
include(MakefileBuildOptions)
437444
add_subdirectory(extra)
438445

0 commit comments

Comments
 (0)