Remove ISPC that is no more supported by nmodl (#865)

Author: Nicolas Cornu

.github/workflows/coreneuron-ci.yml

@@ -38,7 +38,6 @@ jobs:
           - {cmake_option: "-DCORENRN_ENABLE_MPI=OFF"}
           - {use_nmodl: ON, py_version: 3.7}
           - {use_nmodl: ON}
-          - {use_ispc: ON, py_version: 3.7}
         include:
           - os: ubuntu-20.04
             config:
@@ -88,24 +87,8 @@ jobs:
         env:
           PYTHON_VERSION: ${{matrix.config.py_version || env.DEFAULT_PY_VERSION}}
 
-      - name: Install ISPC
-        if: ${{ matrix.config.use_ispc == 'ON' }}
-        working-directory: ${{runner.workspace}}
-        run: |
-          ispc_version="v1.12.0";
-          if [ "${{ startsWith(matrix.os, 'ubuntu') }}" == "true" ]; then
-            url_os="linux";
-            ispc_version_suffix="b";
-          else
-            url_os="macOS";
-            ispc_version_suffix="";
-          fi;
-          url="https://github.com/ispc/ispc/releases/download/${ispc_version}/ispc-${ispc_version}${ispc_version_suffix}-${url_os}.tar.gz";
-          wget -O ispc.tar.gz $url;
-          mkdir ispc && tar -xvzf ispc.tar.gz -C ispc --strip 1;
-
       - name: Install NMODL dependencies
-        if: ${{ matrix.config.use_nmodl == 'ON' ||  matrix.config.use_ispc == 'ON' }}
+        if: ${{ matrix.config.use_nmodl == 'ON' }}
         run: |
           python3 -m pip install --upgrade pip jinja2 pyyaml pytest sympy
 
@@ -178,9 +161,7 @@ jobs:
           
           echo "------- Build, Test and Install -------"
           mkdir build && cd build
-          if [[ "$USE_ISPC" == "ON" ]]; then
-              cmake_args+=(-DCORENRN_ENABLE_ISPC=ON -DCMAKE_ISPC_COMPILER=${{runner.workspace}}/ispc/bin/ispc)
-          elif [[ "$USE_NMODL" == "ON" ]]; then
+          if [[ "$USE_NMODL" == "ON" ]]; then
               cmake_args+=(-DCORENRN_ENABLE_NMODL=ON "-DCORENRN_NMODL_FLAGS=sympy --analytic")
           fi
           cmake .. -G Ninja "${cmake_args[@]}" \
@@ -206,7 +187,6 @@ jobs:
         env:
           CCACHE_BASEDIR: ${{runner.workspace}}/CoreNeuron
           CCACHE_DIR: ${{runner.workspace}}/ccache
-          USE_ISPC: ${{matrix.config.use_ispc}}
           USE_NMODL: ${{matrix.config.use_nmodl}}
 
       - uses: actions/upload-artifact@v3

CMake/CMakeDetermineISPCCompiler.cmake

@@ -4,13 +4,6 @@
 # See top-level LICENSE file for details.
 # =============================================================================
 
-# =============================================================================
-# Common CXX and ISPC flags
-# =============================================================================
-
-# ISPC should compile with --pic by default
-set(CMAKE_ISPC_FLAGS "${CMAKE_ISPC_FLAGS} --pic")
-
 # =============================================================================
 # NMODL CLI options : common and backend specific
 # =============================================================================
@@ -25,7 +18,6 @@ if(NOT "${CORENRN_NMODL_FLAGS}" STREQUAL "")
 endif()
 
 set(NMODL_CPU_BACKEND_ARGS "host --c")
-set(NMODL_ISPC_BACKEND_ARGS "host --ispc")
 set(NMODL_ACC_BACKEND_ARGS "host --c acc --oacc")
 
 # =============================================================================

CMake/CMakeISPCCompiler.cmake.in

@@ -35,7 +35,7 @@ find_program(
   NAMES nmodl${CMAKE_EXECUTABLE_SUFFIX}
   HINTS "${CORENRN_NMODL_DIR}/bin" QUIET)
 
-find_path(nmodl_INCLUDE "nmodl/fast_math.ispc" HINTS "${CORENRN_NMODL_DIR}/include")
+find_path(nmodl_INCLUDE "nmodl/fast_math.hpp" HINTS "${CORENRN_NMODL_DIR}/include")
 find_path(nmodl_PYTHONPATH "nmodl/__init__.py" HINTS "${CORENRN_NMODL_DIR}/lib")
 
 # Checks 'REQUIRED', 'QUIET' and versions.

CMake/CMakeISPCInformation.cmake

@@ -131,7 +131,6 @@ option(CORENRN_ENABLE_MPI_DYNAMIC "Enable dynamic MPI support" OFF)
 option(CORENRN_ENABLE_HOC_EXP "Enable wrapping exp with hoc_exp()" OFF)
 option(CORENRN_ENABLE_SPLAYTREE_QUEUING "Enable use of Splay tree for spike queuing" ON)
 option(CORENRN_ENABLE_NET_RECEIVE_BUFFER "Enable event buffering in net_receive function" ON)
-option(CORENRN_ENABLE_ISPC "Enable ispc interoperability structs and data" OFF)
 option(CORENRN_ENABLE_NMODL "Enable external nmodl source-to-source compiler" OFF)
 option(CORENRN_ENABLE_CALIPER_PROFILING "Enable Caliper instrumentation" OFF)
 option(CORENRN_ENABLE_LIKWID_PROFILING "Enable LIKWID instrumentation" OFF)
@@ -299,11 +298,6 @@ else()
   set(COMPILE_LIBRARY_TYPE "STATIC")
 endif()
 
-if(CORENRN_ENABLE_ISPC)
-  enable_language(ISPC)
-  set(CORENRN_ENABLE_NMODL ON)
-endif()
-
 if(CORENRN_ENABLE_MPI)
   find_package(MPI REQUIRED)
   list(APPEND CORENRN_COMPILE_DEFS NRNMPI=1)
@@ -584,7 +578,6 @@ message(STATUS "OpenMP              | ${CORENRN_ENABLE_OPENMP}")
 message(STATUS "Use legacy units    | ${CORENRN_ENABLE_LEGACY_UNITS}")
 message(STATUS "NMODL               | ${CORENRN_ENABLE_NMODL}")
 if(CORENRN_ENABLE_NMODL)
-  message(STATUS "  ISPC              | ${CORENRN_ENABLE_ISPC}")
   message(STATUS "  FLAGS             | ${CORENRN_NMODL_FLAGS}")
 endif()
 message(STATUS "MOD2CPP PATH        | ${CORENRN_MOD2CPP_BINARY}")

CMake/CMakeTestISPCCompiler.cmake

@@ -351,7 +351,7 @@ configure_file(engine.h.in ${CMAKE_BINARY_DIR}/include/coreneuron/engine.h @ONLY
 file(
   GLOB_RECURSE main_headers
   RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-  *.h *.hpp *.ispc)
+  *.h *.hpp)
 
 configure_file("${CORENEURON_PROJECT_BINARY_DIR}/generated/coreneuron/config/neuron_version.hpp"
                "${CMAKE_BINARY_DIR}/include/coreneuron/config/neuron_version.hpp" COPYONLY)
@@ -384,8 +384,7 @@ install(
   DESTINATION include/
   FILES_MATCHING
   PATTERN "*.h*"
-  PATTERN "*.ipp"
-  PATTERN "*.ispc")
+  PATTERN "*.ipp")
 install(FILES ${MODFUNC_PERL_SCRIPT} ${ENGINEMECH_CODE_FILE} DESTINATION share/coreneuron)
 
 # copy mod2c/nmodl for nrnivmodl-core