Merge branch 'release-v0.6'

.gitignore

@@ -37,5 +37,7 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 
+cscope.out
+tags
 # travis build file
 .travis.yml

AUTHORS

@@ -1,6 +1,9 @@
-Package created by Friedemann Zenke
+Auryn package created by Friedemann Zenke <[email protected]>
 
-Contributors Lorric Ziegler, Ankur Sinha
+Contributors: 
+Lorric Ziegler <[email protected]>
+Ankur Sinha <[email protected]>
+Emre Neftci <[email protected]>
 
 
 

ChangeLog

@@ -1,4 +1,31 @@
-xxxx-xx-xx Friedemann Zenke <[email protected]>
+2015-07-01 Friedemann Zenke <[email protected]>
+ * Added PairInteractionConnection to implement arbitrary (pairwise)
+ STDP windows
+ * Added backend to implement current based synapses with temporal dynamics
+ * Added code to stimulate with currents generated from a Wiener process
+ (NormalStimulator)
+ * Added the AdEx neuron model
+ * Added the SIFGroup neuron model
+ * Implemented load/save to netstate files of Checkers
+ * Changed backend of WeightMonitor to avoid segfaults after loading the
+ network state
+ * Implementation of moving average for progress bar moved 
+ to System class to disambiguate from Checkers
+ * Fixed some problems in ComplexMatrix
+ * Bug fixes
+
+2015-02-06 Friedemann Zenke <[email protected]>
+ * SpikingGroups and Connections are now serializeable and as a consequence
+ the network state can be saved to a single file per rank.
+ * SimpleMatrix has been replaced by ComplexMatrix which creates the
+ basis for the implementation of connection models with multiple
+ internal synaptic states.
+ * Basis for Monitors writing to binary files for increased performance was
+ created (e.g. BinarySpikeMonitor).
+ * Auryn compiles to a statically linkable library per default now, which
+ facilitates to decouple simulation code from simulator code.  * A simplified
+ STDPConnection was added along with a tutorial of how to implement own new
+ plasticity and synapse models.
  * Adds integrate-and-fire model for exclusive use with current based synapses
  (CubaIFGroup).
  * Adds an example simulation for short-term-plasticity (STPConnection).

examples/sim_background.cpp

@@ -615,6 +615,7 @@ int main(int ac, char* av[])
 		for ( int i = 0 ; i < 5 ; ++i ) {
 			for ( int j = 0 ; j < 5 ; ++j ) {
 				vector<neuron_pair> sublist = con_ee->get_block(i*psize,(i+1)*psize,j*psize,(j+1)*psize);
+				sublist.resize(50); // only record a maximum of 50 connections from each block
 				wmon->add_to_list(sublist);
 			}
 		}
@@ -645,6 +646,10 @@ int main(int ac, char* av[])
 
 	RateChecker * chk = new RateChecker( neurons_e , 0.1 , 20.*kappa , tau_chk);
 
+	// Use the same time constant for the online rate estimate in the progress bar
+	sys->set_online_rate_monitor_id(0);
+	sys->set_online_rate_monitor_tau(tau_chk);
+
 
 
 	if ( scaling && (errcode==0) ) {

src/AdExGroup.cpp

@@ -0,0 +1,224 @@
+/* 
+* Copyright 2014-2015 Ankur Sinha and Friedemann Zenke 
+*
+* This file is part of Auryn, a simulation package for plastic
+* spiking neural networks.
+* 
+* Auryn is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* Auryn is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with Auryn.  If not, see <http://www.gnu.org/licenses/>.
+*
+* If you are using Auryn or parts of it for your work please cite:
+* Zenke, F. and Gerstner, W., 2014. Limits to high-speed simulations 
+* of spiking neural networks using general-purpose computers. 
+* Front Neuroinform 8, 76. doi: 10.3389/fninf.2014.00076
+*/
+
+#include "AdExGroup.h"
+
+AdExGroup::AdExGroup(NeuronID size) : NeuronGroup(size)
+{
+    sys->register_spiking_group(this);
+    if ( evolve_locally() ) init();
+}
+
+void AdExGroup::calculate_scale_constants()
+{
+    scale_mem  = dt/tau_mem;
+    scale_w = dt/tau_w;
+    scale_ampa = exp(-dt/tau_ampa);
+    scale_gaba = exp(-dt/tau_gaba);
+}
+
+void AdExGroup::init()
+{
+    g_leak = 10e-9;
+    e_rest = -70e-3;
+    e_reset = -58e-3;
+    e_rev_ampa = 0;
+    e_rev_gaba = -80e-3;
+    e_thr = -50e-3;
+    tau_ampa = 5e-3;
+    tau_gaba = 10e-3;
+    tau_w = 30e-3;
+    c_mem = 200e-12;
+    tau_mem = c_mem/g_leak;
+    deltat = 2e-3;
+    a = 2e-9/g_leak;
+    b = 0./g_leak;
+
+    w = get_state_vector("w");
+
+    calculate_scale_constants();
+    bg_current = get_state_vector("bg_current");
+
+    t_g_ampa = auryn_vector_float_ptr ( g_ampa , 0 );
+    t_g_gaba = auryn_vector_float_ptr ( g_gaba , 0 );
+    t_bg_cur = auryn_vector_float_ptr ( bg_current , 0 );
+    t_mem = auryn_vector_float_ptr ( mem , 0 );
+    t_w = auryn_vector_float_ptr ( w , 0 );
+
+    clear();
+
+}
+
+void AdExGroup::clear()
+{
+    clear_spikes();
+    for (NeuronID i = 0; i < get_rank_size(); i++) {
+       auryn_vector_float_set (mem, i, e_rest);
+       auryn_vector_float_set (g_ampa, i, 0.);
+       auryn_vector_float_set (g_gaba, i, 0.);
+       auryn_vector_float_set (bg_current, i, 0.);
+    }
+}
+
+
+AdExGroup::~AdExGroup()
+{
+}
+
+
+void AdExGroup::evolve()
+{
+
+	// TODO we should vectorize this code and use some fast SSE 
+	// library such as http://gruntthepeon.free.fr/ssemath/
+	// for the exponential
+    for (NeuronID i = 0 ; i < get_rank_size() ; ++i ) {
+        t_w[i] += scale_w * (a * (t_mem[i]-e_rest) - t_w[i]);
+
+        t_mem[i] += scale_mem * (
+                e_rest-t_mem[i]
+                + deltat * exp((t_mem[i]-e_thr)/deltat)
+                - t_g_ampa[i] * (t_mem[i]-e_rev_ampa)
+                - t_g_gaba[i] * (t_mem[i]-e_rev_gaba)
+                + t_bg_cur[i]-t_w[i]);
+
+
+        if (t_mem[i]>0.0) {
+            push_spike(i);
+            t_mem[i] = e_reset;
+            t_w[i] += b;
+        }
+    }
+
+    auryn_vector_float_scale(scale_ampa,g_ampa);
+    auryn_vector_float_scale(scale_gaba,g_gaba);
+}
+
+void AdExGroup::set_bg_current(NeuronID i, AurynFloat current) 
+{
+    if ( localrank(i) )
+        auryn_vector_float_set ( bg_current , global2rank(i) , current ) ;
+}
+
+void AdExGroup::set_tau_w(AurynFloat tauw)
+{
+    tau_w = tauw;
+    calculate_scale_constants();
+}
+
+void AdExGroup::set_b(AurynFloat _b)
+{
+    b = _b;
+}
+
+void AdExGroup::set_e_reset(AurynFloat ereset)
+{
+    e_reset = ereset;
+}
+
+void AdExGroup::set_e_thr(AurynFloat ethr)
+{
+    e_thr = ethr;
+}
+void AdExGroup::set_e_rest(AurynFloat erest)
+{
+    e_rest = erest;
+    for (NeuronID i = 0; i < get_rank_size(); i++)
+        auryn_vector_float_set (mem, i, e_rest);
+}
+
+void AdExGroup::set_a(AurynFloat _a)
+{
+    a = _a;
+}
+
+void AdExGroup::set_delta_t(AurynFloat d)
+{
+    deltat = d;
+}
+
+void AdExGroup::set_g_leak(AurynFloat g)
+{
+    g_leak = g;
+    tau_mem = c_mem/g_leak;
+    calculate_scale_constants();
+}
+
+void AdExGroup::set_c_mem(AurynFloat cm)
+{
+    c_mem = cm;
+    tau_mem = c_mem/g_leak;
+    calculate_scale_constants();
+}
+
+AurynFloat AdExGroup::get_bg_current(NeuronID i) {
+    if ( localrank(i) )
+        return auryn_vector_float_get ( bg_current , global2rank(i) ) ;
+    else 
+        return 0;
+}
+
+string AdExGroup::get_output_line(NeuronID i)
+{
+    stringstream oss;
+    oss << get_mem(i) << " " << get_ampa(i) << " " << get_gaba(i) << " " 
+        << auryn_vector_float_get (bg_current, i) <<"\n";
+    return oss.str();
+}
+
+void AdExGroup::load_input_line(NeuronID i, const char * buf)
+{
+        float vmem,vampa,vgaba,vbgcur;
+        sscanf (buf,"%f %f %f %f",&vmem,&vampa,&vgaba,&vbgcur);
+        if ( localrank(i) ) {
+            NeuronID trans = global2rank(i);
+            set_mem(trans,vmem);
+            set_ampa(trans,vampa);
+            set_gaba(trans,vgaba);
+            auryn_vector_float_set (bg_current, trans, vbgcur);
+        }
+}
+
+void AdExGroup::set_tau_ampa(AurynFloat taum)
+{
+    tau_ampa = taum;
+    calculate_scale_constants();
+}
+
+AurynFloat AdExGroup::get_tau_ampa()
+{
+    return tau_ampa;
+}
+
+void AdExGroup::set_tau_gaba(AurynFloat taum)
+{
+    tau_gaba = taum;
+    calculate_scale_constants();
+}
+
+AurynFloat AdExGroup::get_tau_gaba()
+{
+    return tau_gaba;
+}