Add mod2c as subdirectory instead of external project (#409)

* Add mod2c as add_subdirectory instead of external project
* unset PMI_RANK inside nrnivmodl-core
* Fix nrnunits.lib path for install
* Update mod2c to latest master

Author: Nicolas Cornu

CMake/AddMod2cSubmodule.cmake

@@ -4,7 +4,6 @@
 # See top-level LICENSE file for details.
 # =============================================================================
 
-include(ExternalProject)
 find_package(FindPkgConfig QUIET)
 
 find_path(
@@ -29,14 +28,4 @@ else()
   message(STATUS "Using mod2c submodule from ${MOD2C_PROJ}")
 endif()
 
-set(ExternalProjectCMakeArgs
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-    -DCMAKE_C_COMPILER=${CORENRN_FRONTEND_C_COMPILER}
-    -DCMAKE_CXX_COMPILER=${CORENRN_FRONTEND_CXX_COMPILER})
-
-ExternalProject_Add(
-  mod2c
-  BUILD_ALWAYS 1
-  SOURCE_DIR ${CORENEURON_PROJECT_SOURCE_DIR}/external/mod2c
-  GIT_SUBMODULES
-  CMAKE_ARGS ${ExternalProjectCMakeArgs})
+add_subdirectory(${CORENEURON_PROJECT_SOURCE_DIR}/external/mod2c)

CMakeLists.txt

@@ -275,7 +275,7 @@ if(CORENRN_ENABLE_NMODL)
   separate_arguments(NMODL_EXTRA_FLAGS_LIST UNIX_COMMAND "${CORENRN_NMODL_FLAGS}")
 else()
   include(AddMod2cSubmodule)
-  set(CORENRN_NMODL_BINARY ${CMAKE_BINARY_DIR}/bin/mod2c_core${CMAKE_EXECUTABLE_SUFFIX})
+  set(CORENRN_NMODL_BINARY ${CMAKE_BINARY_DIR}/external/mod2c/src/mod2c_core/mod2c_core${CMAKE_EXECUTABLE_SUFFIX})
   set(CORENRN_NMODL_INCLUDE ${CMAKE_BINARY_DIR}/include)
 endif()
 

coreneuron/CMakeLists.txt

@@ -50,7 +50,7 @@ set(MODFUNC_PERL_SCRIPT "mechanism/mech/mod_func.c.pl")
 set(KINDERIV_PYTHON_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/kinderiv.py")
 set(KINDERIV_HEADER_FILE "${CMAKE_CURRENT_BINARY_DIR}/_kinderiv.h")
 
-set(NMODL_UNITS_FILE "${CMAKE_BINARY_DIR}/share/nrnunits.lib")
+set(NMODL_UNITS_FILE "${CMAKE_BINARY_DIR}/share/mod2c/nrnunits.lib")
 
 # copy inbuilt mod files to share
 file(COPY ${CORENEURON_PROJECT_SOURCE_DIR}/coreneuron/mechanism/mech/modfile
@@ -153,6 +153,7 @@ set_target_properties(
 add_custom_target(
   nrniv-core ALL
   COMMAND ${CMAKE_BINARY_DIR}/bin/nrnivmodl-core -b STATIC
+          -m ${CORENRN_NMODL_BINARY}
           ${CORENEURON_PROJECT_SOURCE_DIR}/tests/integration/ring_gap/mod
   WORKING_DIRECTORY
     ${CMAKE_BINARY_DIR}/bin
@@ -198,17 +199,6 @@ endforeach()
 configure_file("utils/profile/profiler_interface.h"
                ${CMAKE_BINARY_DIR}/include/coreneuron/nrniv/profiler_interface.h COPYONLY)
 
-if(NOT CORENRN_ENABLE_NMODL)
-  # ~~~
-  # MOD2C puts UNITS_FILE in share, but we need to see it in share/mod2c We create
-  # a link since we know neither the source location nor when its copied
-  # ~~~
-  file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/share/mod2c/")
-  add_custom_target(link_units ALL COMMAND ${CMAKE_COMMAND} -E create_symlink "${NMODL_UNITS_FILE}"
-                                           "${CMAKE_BINARY_DIR}/share/mod2c/nrnunits.lib")
-  add_dependencies(nrniv-core link_units)
-endif()
-
 # main program required for building special-core
 file(COPY apps/coreneuron.cpp DESTINATION ${CMAKE_BINARY_DIR}/share/coreneuron)
 

external/mod2c

@@ -7,6 +7,12 @@
 
 set -e
 
+# TODO : mod2c_core can be linked with (HPE-)MPI library
+# and running that under slurm allocation result into
+# runtime error. For now, unset PMI_RANK variable
+# which is sufficint to avoid issue with HPE-MPI+SLURM.
+unset PMI_RANK
+
 # name of the script
 APP_NAME=$(basename $0)