Update mod2c to latest module and nmodl args bug fix (#459)

* Update mod2c to latest module
  * mod2c now aborts when mod files is not threadsafe
  * this avoids confusing compilation errors for end users
* BB5 CI : Specify multiple partitions and remove skl constraint
* COMPILE_OPTIONS doesnt work with CMake v3.10; COMPILE_DEFINITIONS works fine
* Update nmodl submodule
* Bug fix in previous commit : NMODL should run inline pass

Author: pramodk

CMake/MakefileBuildOptions.cmake

@@ -9,10 +9,11 @@ set(CMAKE_ISPC_FLAGS "${CMAKE_ISPC_FLAGS} --pic")
 # NMODL CLI options : common and backend specific
 # =============================================================================
 # if user pass arguments then use those as common arguments
+# note that inlining is done by default
+set(NMODL_COMMON_ARGS "passes --inline")
+
 if ("${CORENRN_NMODL_FLAGS}" STREQUAL "")
-  set(NMODL_COMMON_ARGS "passes --inline")
-else()
-  set(NMODL_COMMON_ARGS ${CORENRN_NMODL_FLAGS})
+  set(NMODL_COMMON_ARGS "${NMODL_COMMON_ARGS} ${CORENRN_NMODL_FLAGS}")
 endif()
 
 set(NMODL_CPU_BACKEND_ARGS "host --c")

coreneuron/CMakeLists.txt

@@ -102,8 +102,8 @@ set(LegacyFR_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/apps/main1.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/io/global_vars.cpp)
 
-set_property(SOURCE ${LegacyFR_FILES} APPEND PROPERTY COMPILE_OPTIONS
-                              "-DCORENRN_USE_LEGACY_UNITS=${CORENRN_USE_LEGACY_UNITS}")
+set_property(SOURCE ${LegacyFR_FILES} APPEND PROPERTY COMPILE_DEFINITIONS
+                              "CORENRN_USE_LEGACY_UNITS=${CORENRN_USE_LEGACY_UNITS}")
 
 # =============================================================================
 # run KINDERIV_PYTHON_SCRIPT to generate _kinderiv.h

external/mod2c

@@ -22,14 +22,7 @@ else
     mkdir build_${CORENRN_TYPE} build_intel_${CORENRN_TYPE}
 fi
 
-# default partition is interactive. during night use production
-hour=`date +%H`
-weekday=`date +%u`
-if [ "$hour" -ge "19" ] || [ "$hour" -lt "8" ] || [ $weekday -gt 5 ]; then
-  export SALLOC_PARTITION="prod";
-else
-  export SALLOC_PARTITION="interactive"
-fi
+export SALLOC_PARTITION="prod,pre_prod,interactive";
 
 cd $WORKSPACE/build_${CORENRN_TYPE}
 
@@ -39,8 +32,8 @@ if [ "${CORENRN_TYPE}" = "GPU-non-unified" ]; then
         -DCORENRN_ENABLE_GPU=ON \
         -DCORENRN_ENABLE_CUDA_UNIFIED_MEMORY=OFF \
         -DCMAKE_INSTALL_PREFIX=$WORKSPACE/install_${CORENRN_TYPE}/ \
-        -DTEST_MPI_EXEC_BIN="srun;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta,skl;--gres=gpu:2;--mem;0;-t;00:05:00" \
-        -DTEST_EXEC_PREFIX="srun;-n;6;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta,skl;--gres=gpu:2;--mem;0;-t;00:05:00" \
+        -DTEST_MPI_EXEC_BIN="srun;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta;--gres=gpu:2;--mem;0;-t;00:05:00" \
+        -DTEST_EXEC_PREFIX="srun;-n;6;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta;--gres=gpu:2;--mem;0;-t;00:05:00" \
         -DAUTO_TEST_WITH_SLURM=OFF \
         -DAUTO_TEST_WITH_MPIEXEC=OFF \
         $WORKSPACE/
@@ -49,8 +42,8 @@ elif [ "${CORENRN_TYPE}" = "GPU-unified" ]; then
         -DCORENRN_ENABLE_GPU=ON \
         -DCORENRN_ENABLE_CUDA_UNIFIED_MEMORY=ON \
         -DCMAKE_INSTALL_PREFIX=$WORKSPACE/install_${CORENRN_TYPE}/ \
-        -DTEST_MPI_EXEC_BIN="srun;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta,skl;--gres=gpu:2;--mem;0;-t;00:05:00" \
-        -DTEST_EXEC_PREFIX="srun;-n;6;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta,skl;--gres=gpu:2;--mem;0;-t;00:05:00" \
+        -DTEST_MPI_EXEC_BIN="srun;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta;--gres=gpu:2;--mem;0;-t;00:05:00" \
+        -DTEST_EXEC_PREFIX="srun;-n;6;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta;--gres=gpu:2;--mem;0;-t;00:05:00" \
         -DAUTO_TEST_WITH_SLURM=OFF \
         -DAUTO_TEST_WITH_MPIEXEC=OFF \
         $WORKSPACE/