Add a way to enable NRN_PRCELLSTATE inside nrnivmodl-core (#604)

* Add a way to enable NRN_PRCELLSTATE inside nrnivmodl-core
* CMake default option disabled
* update nmodl submodule to grab PRCELLSTATE

Author: alkino

CMakeLists.txt

@@ -94,6 +94,7 @@ option(CORENRN_ENABLE_UNIT_TESTS "Enable unit tests execution" ON)
 option(CORENRN_ENABLE_GPU "Enable GPU support using OpenACC" OFF)
 option(CORENRN_ENABLE_SHARED "Enable shared library build" ON)
 option(CORENRN_ENABLE_LEGACY_UNITS "Enable legacy FARADAY, R, etc" OFF)
+option(CORENRN_ENABLE_PRCELLSTATE "Enable NRN_PRCELLSTATE debug feature" OFF)
 
 set(CORENRN_GPU_CUDA_COMPUTE_CAPABILITY
     "60" "70"
@@ -249,6 +250,11 @@ set(NMODL_ENABLE_LEGACY_UNITS
     ${CORENRN_ENABLE_LEGACY_UNITS}
     CACHE BOOL "" FORCE)
 
+if(CORENRN_ENABLE_PRCELLSTATE)
+  set(CORENRN_NRN_PRCELLSTATE 1)
+else()
+  set(CORENRN_NRN_PRCELLSTATE 0)
+endif()
 if(MINGW)
   add_definitions("-DMINGW")
 endif()

external/nmodl

@@ -25,12 +25,13 @@ ROOT_DIR=$(@PERL_EXECUTABLE@ -e "use Cwd 'abs_path'; print abs_path('$PARENT_DIR
 PARALLEL_BUILDS=4
 params_MODS_PATH="."
 params_BUILD_TYPE="@COMPILE_LIBRARY_TYPE@"
+params_NRN_PRCELLSTATE="@CORENRN_NRN_PRCELLSTATE@"
 
 # prefix for common options : make sure to rename these if options are changed.
-MAKE_OPTIONS="MECHLIB_SUFFIX MOD2CPP_BINARY MOD2CPP_RUNTIME_FLAGS DESTDIR INCFLAGS LINKFLAGS MODS_PATH VERBOSE BUILD_TYPE"
+MAKE_OPTIONS="MECHLIB_SUFFIX MOD2CPP_BINARY MOD2CPP_RUNTIME_FLAGS DESTDIR INCFLAGS LINKFLAGS MODS_PATH VERBOSE BUILD_TYPE NRN_PRCELLSTATE"
 
 # parse CLI args
-while getopts "n:m:a:d:i:l:Vp:b:h" OPT; do
+while getopts "n:m:a:d:i:l:Vp:r:b:h" OPT; do
     case "$OPT" in
     n)
         # suffix for mechanism library
@@ -59,6 +60,9 @@ while getopts "n:m:a:d:i:l:Vp:b:h" OPT; do
     b)
         # make with verbose
         params_BUILD_TYPE="$OPTARG";;
+    r)
+        # enable NRN_PRCELLSTATE mechanism
+        params_NRN_PRCELLSTATE="$OPTARG";;
     h)
         echo "$APP_NAME [options, ...] [mods_path]"
         echo "Options:"
@@ -68,6 +72,7 @@ while getopts "n:m:a:d:i:l:Vp:b:h" OPT; do
         echo "  -i <incl_flags>           Definitions passed to the compiler, typically '-I dir..'"
         echo "  -l <link_flags>           Definitions passed to the linker, typically '-Lx -lylib..'"
         echo "  -d <dest_dir>             Install to dest_dir. Default: Off."
+        echo "  -r <0|1>                  Enable NRN_PRCELLSTATE mechanism. Default: @CORENRN_NRN_PRCELLSTATE@."
         echo "  -V                        Verbose: show commands executed by make"
         echo "  -p <n_procs>              Number of parallel builds (Default: $PARALLEL_BUILDS)"
         echo "  -b <STATIC|SHARED>        libcorenrnmech library type"

extra/nrnivmodl-core.in

@@ -210,7 +210,7 @@ coremech_lib_static: $(ALL_OBJS) $(ENGINEMECH_OBJ) build_always
 
 # compile cpp files to .o
 $(MOD_OBJS_DIR)/%.o: $(MOD_TO_CPP_DIR)/%.cpp $(KINDERIV_H_PATH) | $(MOD_OBJS_DIR)
-	$(CXX_COMPILE_CMD) -c $< -o $@
+	$(CXX_COMPILE_CMD) -c $< -o $@ -DNRN_PRCELLSTATE=$(NRN_PRCELLSTATE)
 
 # compile ispc files to .obj
 $(MOD_OBJS_DIR)/%.obj: $(MOD_TO_CPP_DIR)/%.ispc | $(MOD_OBJS_DIR)