Refactor Connection Generator Interface

.travis.yml

@@ -1,22 +1,22 @@
 language: generic
 
-
 #For Ubuntu Trusty (14.04 LTS)
 sudo: required
 dist: trusty
 
 env:
   matrix:
     # We don't have to run a full matrix here, because most of the options are
-    # independent. This means that we can test them together in the full build.
+    # independent. This means we only need a minimal and maximal configuration
+    # and some additional jobs for interdependent options.
     # See also https://docs.travis-ci.com/user/caching/#Caches-and-build-matrices
-    - xTHREADING=0 xMPI=0 xGSL=0 xLTDL=0 xREADLINE=0 xPYTHON=0 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # minimal
-    - xTHREADING=0 xMPI=1 xGSL=0 xLTDL=1 xREADLINE=1 xPYTHON=0 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # only MPI
-    - xTHREADING=1 xMPI=0 xGSL=0 xLTDL=1 xREADLINE=1 xPYTHON=0 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # only threading
-    - xTHREADING=1 xMPI=0 xGSL=0 xLTDL=0 xREADLINE=0 xPYTHON=1 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # Python & Threading
-    - xTHREADING=0 xMPI=1 xGSL=0 xLTDL=0 xREADLINE=0 xPYTHON=1 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # Python & MPI
-    - xTHREADING=0 xMPI=0 xGSL=0 xLTDL=0 xREADLINE=0 xPYTHON=1 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # only Python
-    - xTHREADING=1 xMPI=1 xGSL=1 xLTDL=1 xREADLINE=1 xPYTHON=1 xMUSIC=1 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # full
+    - xTHREADING=0 xMPI=0 xGSL=0 xLIBNEUROSIM=0 xLTDL=0 xREADLINE=0 xPYTHON=0 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # minimal
+    - xTHREADING=0 xMPI=1 xGSL=0 xLIBNEUROSIM=0 xLTDL=1 xREADLINE=1 xPYTHON=0 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # only MPI
+    - xTHREADING=1 xMPI=0 xGSL=0 xLIBNEUROSIM=0 xLTDL=1 xREADLINE=1 xPYTHON=0 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # only threading
+    - xTHREADING=1 xMPI=0 xGSL=0 xLIBNEUROSIM=0 xLTDL=0 xREADLINE=0 xPYTHON=1 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # Python & Threading
+    - xTHREADING=0 xMPI=1 xGSL=0 xLIBNEUROSIM=0 xLTDL=0 xREADLINE=0 xPYTHON=1 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # Python & MPI
+    - xTHREADING=0 xMPI=0 xGSL=0 xLIBNEUROSIM=0 xLTDL=0 xREADLINE=0 xPYTHON=1 xMUSIC=0 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # only Python
+    - xTHREADING=1 xMPI=1 xGSL=1 xLIBNEUROSIM=1 xLTDL=1 xREADLINE=1 xPYTHON=1 xMUSIC=1 xSTATIC_ANALYSIS=1 CACHE_NAME=JOB   # full
 matrix:
   # do notify immediately about it when a job of a build fails.
   fast_finish: true
@@ -29,16 +29,17 @@ before_install:
   - cd $HOME/build
   - echo $PATH
 
-  # update package repository status (-qq is more quiet)
+  # Update package repository status
   - sudo rm -rf /var/lib/apt/lists/*
   - ls /etc/apt/sources.list.d/
   - sudo apt-get update -qq
 
-  # remove any obsolete libraries
+  # Remove obsolete packages
   - sudo apt-get autoremove
 
-  # from installation webpage http://www.nest-simulator.org/installation-2/#Standard_configuration
-  - sudo apt-get install -y build-essential cmake libltdl7-dev libreadline6-dev libncurses5-dev libgsl0-dev python-all-dev python-numpy python-scipy python-matplotlib ipython
+  # Install dependencies (see http://www.nest-simulator.org/installation)
+  - sudo apt-get install -y build-essential cmake libltdl7-dev libreadline6-dev libncurses5-dev
+    libgsl0-dev python-all-dev python-numpy python-scipy python-matplotlib ipython
 
   # Install pip and cython
   - wget https://bootstrap.pypa.io/get-pip.py
@@ -61,6 +62,22 @@ before_install:
   # process json output from github api
   - sudo apt-get install -y jq
 
+  # Install libneurosim
+  - git clone https://github.com/INCF/libneurosim.git
+  - cd libneurosim
+  - ./autogen.sh
+  - ./configure --prefix=$HOME/.cache/libneurosim.install --with-mpi
+  - make
+  - make install
+  - cd $HOME/build
+
+  # Install csa
+  - git clone https://github.com/INCF/csa.git
+  - cd csa
+  - ./autogen.sh
+  - ./configure --with-libneurosim=$HOME/.cache/libneurosim.install --prefix=$HOME/.cache/csa.install
+  - cd $HOME/build
+
   # Install MUSIC
   - sudo apt-get install -y python-mpi4py
   - git clone https://github.com/INCF/MUSIC.git music

build.sh

@@ -62,6 +62,12 @@ else
     CONFIGURE_READLINE="-Dwith-readline=OFF"
 fi
 
+if [ "$xLIBNEUROSIM" = "1" ] ; then
+    CONFIGURE_LIBNEUROSIM="-Dwith-libneurosim=$HOME/.cache/libneurosim.install"
+else
+    CONFIGURE_LIBNEUROSIM="-Dwith-libneurosim=OFF"
+fi
+
 
 
 NEST_VPATH=build
@@ -228,6 +234,7 @@ cmake \
   $CONFIGURE_GSL \
   $CONFIGURE_LTDL \
   $CONFIGURE_READLINE \
+  $CONFIGURE_LIBNEUROSIM \
   ..
 echo "======= Configure NEST end ======="
 
@@ -240,6 +247,7 @@ make install
 echo "======= Install NEST end ======="
 
 echo "======= Test NEST start ======="
+export PYTHONPATH=$HOME/.cache/csa.install/lib/python2.7/site-packages:$PYTHONPATH
 make installcheck
 echo "======= Test NEST end ======="
 

conngen/CMakeLists.txt

@@ -17,10 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with NEST.  If not, see <http://www.gnu.org/licenses/>.
 set( conngen_sources
-    conngenmodule.h
-    conngenmodule.cpp
-    cg_connect.h
-    cg_connect.cpp
+    conngenmodule.h conngenmodule.cpp
     conngendatum.h conngendatum.cpp
     conngen.h conngen.cpp
     )