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

Commit ea242eb

Browse files
authored
Fix caliper link lines for nrnivmodl-core (#450)
- if caliper profiling is enabled then nrnivmodl-core should add path to lib directory of caliper - change order of mpi and caliper libraries due to issue llnl/Caliper/issues/176
1 parent c664748 commit ea242eb

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

coreneuron/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ add_library(scopmath STATIC ${CORENEURON_HEADER_FILES} ${SCOPMATH_CODE_FILES})
144144

145145
target_link_libraries(
146146
coreneuron
147-
${MPI_C_LIBRARIES}
148147
${reportinglib_LIBRARY}
149148
${sonatareport_LIBRARY}
150149
${link_cudacoreneuron}
151150
${CUDA_LIBRARIES}
152151
${CALIPER_LIB}
153152
${CALIPER_MPI_LIB}
154-
${likwid_LIBRARIES})
153+
${likwid_LIBRARIES}
154+
${MPI_C_LIBRARIES})
155155
target_include_directories(coreneuron SYSTEM
156156
PRIVATE ${CORENEURON_PROJECT_SOURCE_DIR}/external/Random123/include)
157157
target_include_directories(coreneuron SYSTEM

extra/nrnivmodl_core_makefile.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ LDFLAGS = $(LINKFLAGS) @CORENRN_LINK_DEFS@
3939
CORENRNLIB_FLAGS = -L$(CORENRN_LIB_DIR) -lcoreneuron
4040
CORENRNLIB_FLAGS += $(if @reportinglib_LIB_DIR@, -W$(subst ;, -W,l,-rpath,@reportinglib_LIB_DIR@),)
4141
CORENRNLIB_FLAGS += $(if @sonatareport_LIB_DIR@, -W$(subst ;, -W,l,-rpath,@sonatareport_LIB_DIR@),)
42+
CORENRNLIB_FLAGS += $(if @caliper_LIB_DIR@, -W$(subst ;, -W,l,-rpath,@caliper_LIB_DIR@),)
43+
CORENRNLIB_FLAGS += $(if @caliper_LIB_DIR@,-L@caliper_LIB_DIR@,)
4244

4345
# Includes paths gathered by CMake
4446
INCLUDES = $(INCFLAGS) -I$(CORENRN_INC_DIR) -I$(CORENRN_INC_DIR)/coreneuron/utils/randoms

0 commit comments

Comments
 (0)