Fixes compilation error with reportinglib (#474)

* Fixed compilation issue with reportinglib
* Enable reportinglib in coreneuron CI
* Add libsonata reports tests to the CI

Author: iomaganaris

CMakeLists.txt

@@ -211,11 +211,9 @@ if(CORENRN_ENABLE_REPORTING)
     add_definitions("-DENABLE_SONATA_REPORTS")
   elseif(reportinglib_FOUND)
     add_definitions("-DENABLE_BIN_REPORTS")
-    set(ENABLE_BIN_REPORTS ON)
   else() # sonata_FOUND
     if(TARGET sonata::sonata_report)
       add_definitions("-DENABLE_SONATA_REPORTS")
-      set(ENABLE_SONATA_REPORTS ON)
       set(reportinglib_INCLUDE_DIR "")
       set(reportinglib_LIBRARY "")
     else()

coreneuron/io/reports/report_handler.cpp

@@ -13,7 +13,7 @@
 namespace coreneuron {
 
 void ReportHandler::create_report(double dt, double tstop, double delay) {
-#if defined(ENABLE_BIN_REPORTSLIB) || defined(ENABLE_SONATA_REPORTS)
+#if defined(ENABLE_BIN_REPORTS) || defined(ENABLE_SONATA_REPORTS)
     if (m_report_config.start < t) {
         m_report_config.start = t;
     }
@@ -75,10 +75,10 @@ void ReportHandler::create_report(double dt, double tstop, double delay) {
         std::cerr << "[WARNING] : Reporting is disabled. Please recompile with either libsonata or "
                      "reportinglib. \n";
     }
-#endif  // defined(ENABLE_BIN_REPORTSLIB) || defined(ENABLE_SONATA_REPORTS)
+#endif  // defined(ENABLE_BIN_REPORTS) || defined(ENABLE_SONATA_REPORTS)
 }
 
-#if defined(ENABLE_BIN_REPORTSLIB) || defined(ENABLE_SONATA_REPORTS)
+#if defined(ENABLE_BIN_REPORTS) || defined(ENABLE_SONATA_REPORTS)
 void ReportHandler::register_soma_report(const NrnThread& nt,
                                          ReportConfiguration& config,
                                          const VarsToReport& vars_to_report) {
@@ -323,6 +323,6 @@ std::vector<int> ReportHandler::map_gids(const NrnThread& nt) const {
     }
     return nodes_gid;
 }
-#endif  // defined(ENABLE_BIN_REPORTSLIB) || defined(ENABLE_SONATA_REPORTS)
+#endif  // defined(ENABLE_BIN_REPORTS) || defined(ENABLE_SONATA_REPORTS)
 
 }  // Namespace coreneuron

tests/jenkins/install_coreneuron.sh

@@ -6,6 +6,7 @@ set -x
 source ${JENKINS_DIR:-.}/_env_setup.sh
 
 reportinglib_dir=$(spack location --install-dir --latest reportinglib%intel)
+libsonata_report_dir=$(spack location --install-dir --latest libsonata-report%intel)
 
 CORENRN_TYPE="$1"
 
@@ -61,8 +62,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_BIN_REPORTS=ON \
-      -DCMAKE_PREFIX_PATH=$reportinglib_dir \
+      -DCORENRN_ENABLE_REPORTING=ON \
+      -DCMAKE_PREFIX_PATH="$reportinglib_dir;$libsonata_report_dir" \
       -DTEST_MPI_EXEC_BIN="mpirun" \
       -DTEST_EXEC_PREFIX="mpirun;-n;2" \
       -DAUTO_TEST_WITH_SLURM=OFF \

tests/jenkins/install_neuron_reportinglib.sh

@@ -22,8 +22,9 @@ set -e
 set -x
 source ${JENKINS_DIR:-.}/_env_setup.sh
 
-# Install reportinglib with spack to run reportinglib tests
+# Install reportinglib & libsonata with spack to run reporting tests
 spack install reportinglib%intel
+spack install libsonata-report%intel
 
 patch_neuron
 spack install neuron+debug@develop~legacy-unit