Give SpikeMonitor.i, t and count a groupname and make them ArrayVariable

rather than Variable
brian-team · Sep 8, 2013 · e34eb36 · e34eb36
1 parent 9523444
commit e34eb36
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/brian2/devices/cpp_standalone/device.py b/brian2/devices/cpp_standalone/device.py
@@ -89,7 +89,6 @@ def build(self, net):
         # Write the arrays            
         array_specs = [(k, c_data_type(v.dtype), len(v)) for k, v in self.arrays.iteritems()]
         dynamic_array_specs = [(k, c_data_type(v.dtype)) for k, v in self.dynamic_arrays.iteritems()]
-        print self.dynamic_arrays.keys()
         arr_tmp = CPPStandaloneCodeObject.templater.arrays(None, array_specs=array_specs,
                                                            dynamic_array_specs=dynamic_array_specs)
         open('output/arrays.cpp', 'w').write(arr_tmp.cpp_file)
@@ -99,7 +98,7 @@ def build(self, net):
         code_object_defs = defaultdict(list)
         for codeobj in self.code_objects.values():
             for k, v in codeobj.nonconstant_values:
-                if k=='t' or k=='_spikes' or k=='_num_spikes':
+                if k=='t':
                     pass
                 elif v.im_class is ArrayVariable:
                     # find the corresponding array

diff --git a/brian2/devices/cpp_standalone/templates/arrays.cpp b/brian2/devices/cpp_standalone/templates/arrays.cpp
@@ -1,6 +1,7 @@
 {% macro cpp_file() %}
 
 #include<stdint.h>
+#include<vector>
 #include "arrays.h"
 
 // static arrays
@@ -22,6 +23,7 @@ std::vector<{{dtype_spec}}> {{varname}};
 #ifndef _BRIAN_ARRAYS_H
 #define _BRIAN_ARRAYS_H
 
+#include<vector>
 #include<stdint.h>
 
 // static arrays

diff --git a/brian2/monitors/spikemonitor.py b/brian2/monitors/spikemonitor.py
@@ -63,10 +63,9 @@ def __init__(self, source, record=True, when=None, name='spikemonitor*',
                            # DynamicArray here, having access to the underlying
                            # array is not enough since we want to do the resize
                            # in the template
-                           '_i': Variable(Unit(1), self._i),
-                           '_t': Variable(Unit(1), self._t),
-                           '_count': ArrayVariable('_count', Unit(1),
-                                                   self.count),
+                           '_i': ArrayVariable('_i', Unit(1), self._i, group_name=self.name),
+                           '_t': ArrayVariable('_t', Unit(1), self._t, group_name=self.name),
+                           '_count': ArrayVariable('_count', Unit(1), self.count, group_name=self.name),
                            '_source_start': Variable(Unit(1), start,
                                                      constant=True),
                            '_source_end': Variable(Unit(1), end,

diff --git a/dev/ideas/devices/cpp_standalone.py b/dev/ideas/devices/cpp_standalone.py
@@ -24,11 +24,11 @@
 # Use a NeuronGroup to fake the whole process
 G = NeuronGroup(N, eqs, reset=reset, threshold=threshold, refractory=refractory, name='gp')
 M = SpikeMonitor(G)
-G2 = NeuronGroup(1, eqs, reset=reset, threshold=threshold, refractory=refractory, name='gp2')
+#G2 = NeuronGroup(1, eqs, reset=reset, threshold=threshold, refractory=refractory, name='gp2')
 # Run the network for 0 seconds to generate the code
 net = Network(G,
-              M,
-              G2,
+              #M,
+              #G2,
               )
 
 net.run(0*second)

diff --git a/examples/phase_locking.py b/examples/phase_locking.py
@@ -6,6 +6,7 @@
 from brian2 import *
 
 #brian_prefs.codegen.target = 'weave'
+BrianLogger.log_level_debug()
 
 tau = 20 * ms
 N = 100