Fix reporting tests under CI (#284)

 * Adapt report config file to CLI11
 * update dat files to 1.2
 * Add reportinglib to DYLD_LIBRARY_PATH (MacOS compatibility)
 * Enabled reportinglib in CPU builds of coreneuron
 * Added rpath of reportinglib in nrnivmodl_core_makefile

Author: jorblancoa

extra/nrnivmodl_core_makefile.in

@@ -29,6 +29,7 @@ endif
 # - @CORENRN_LINK_DEFS
 LDFLAGS = $(LINKFLAGS) @CORENRN_LINK_DEFS@
 CORENRNLIB_FLAGS = -L$(libdir) -lcoreneuron
+CORENRNLIB_FLAGS += $(if @reportinglib_LIB_DIR@, -W$(subst ;, -W,l,-rpath,@reportinglib_LIB_DIR@),)
 OS_NAME := $(shell uname)
 _cm =,
 

tests/integration/reportinglib/1.conf.in

@@ -1,8 +1,8 @@
---outpath ./
---datpath @CMAKE_CURRENT_SOURCE_DIR@/ring/
---tstop 10.000000
---dt 0.025000
---forwardskip 0.000000
---prcellgid -1
---report-conf @CMAKE_CURRENT_SOURCE_DIR@/reportinglib/1.report
---cell-permute 0
+outpath = ./
+datpath = @CMAKE_CURRENT_SOURCE_DIR@/ring/
+tstop = 10.000000
+dt = 0.025000
+forwardskip = 0.000000
+prcellgid = -1
+report-conf = @CMAKE_CURRENT_SOURCE_DIR@/reportinglib/1.report
+cell-permute = 0

tests/integration/reportinglib/reporting_test.sh.in

@@ -1,6 +1,5 @@
 #! /bin/sh 
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@CMAKE_BINARY_DIR@/lib:@reportinglib_LIB_DIR@
 export OMP_NUM_THREADS=1
 @SRUN_PREFIX@ @CMAKE_BINARY_DIR@/bin/@CMAKE_SYSTEM_PROCESSOR@/special-core --mpi --read-config @[email protected]
 chmod +x ./@[email protected]

tests/integration/ring/12_3.dat

@@ -4,6 +4,10 @@ set -e
 
 source ${JENKINS_DIR:-.}/_env_setup.sh
 
+# Install reportinglib with spack to run reportinglib tests
+spack install reportinglib%intel
+reportinglib_dir=$(spack cd -i reportinglib%intel && pwd)
+
 CORENRN_TYPE="$1"
 
 if [ "${CORENRN_TYPE}" = "GPU-non-unified" ] || [ "${CORENRN_TYPE}" = "GPU-unified" ]; then
@@ -63,6 +67,8 @@ elif [ "${CORENRN_TYPE}" = "AoS" ] || [ "${CORENRN_TYPE}" = "SoA" ]; then
       -DCMAKE_BUILD_TYPE=Debug  \
       -DCORENRN_ENABLE_SOA=$CORENRN_ENABLE_SOA \
       -DCORENRN_ENABLE_OPENMP=$ENABLE_OPENMP \
+      -DCORENRN_ENABLE_REPORTINGLIB=ON \
+      -DCMAKE_PREFIX_PATH=$reportinglib_dir \
       -DTEST_MPI_EXEC_BIN="mpirun" \
       -DTEST_EXEC_PREFIX="mpirun;-n;2" \
       -DAUTO_TEST_WITH_SLURM=OFF \

tests/integration/ring/13_3.dat

@@ -2,7 +2,8 @@
 
 set -e
 source ${JENKINS_DIR:-.}/_env_setup.sh
-module load neuron/develop intel
+module purge
+module load unstable neuron/develop intel hpe-mpi
 
 set -x
 CORENRN_TYPE="$1"
@@ -17,8 +18,11 @@ nrnivmodl ../tests/jenkins/mod
 nrnivmodl-core ../tests/jenkins/mod
 ls -la x86_64
 
+# Unload intel module to avoid issue whith mpirun
+module unload intel
+
 # run test sim with external mechanism
-python $WORKSPACE/tests/jenkins/neuron_direct.py
+mpirun -n 1 nrniv -python $WORKSPACE/tests/jenkins/neuron_direct.py -mpi
 
 # remove build directory
 cd -