Merge branch 'master' of https://github.com/neurokernel/neurokernel

neurokernel · Nov 9, 2015 · 7b26e42 · 7b26e42
2 parents 78ceb55 + 029b514
commit 7b26e42
Showing 1 changed file with 26 additions and 19 deletions.
diff --git a/neurokernel/LPU/LPU.py b/neurokernel/LPU/LPU.py
@@ -577,8 +577,10 @@ def post_run(self):
         if self.debug:
             # for file in self.in_gpot_files.itervalues():
             #     file.close()
-            self.gpot_buffer_file.close()
-            self.synapse_state_file.close()
+            if self.my_num_gpot_neurons > 0:
+                self.gpot_buffer_file.close()
+            if self.total_synapses + len(self.input_neuron_list) > 0:
+                self.synapse_state_file.close()
 
         for neuron in self.neurons:
             neuron.post_run()
@@ -611,11 +613,14 @@ def run_step(self):
             self.first_step = False
 
         if self.debug:
-            self.gpot_buffer_file.root.array.append(
-                self.buffer.gpot_buffer.get()
-                    .reshape(1, self.gpot_delay_steps, -1))
-            self.synapse_state_file.root.array.append(
-                self.synapse_state.get().reshape(1, -1))
+            if self.my_num_gpot_neurons > 0:
+                self.gpot_buffer_file.root.array.append(
+                    self.buffer.gpot_buffer.get()
+                        .reshape(1, self.gpot_delay_steps, -1))
+
+            if self.total_synapses + len(self.input_neuron_list) > 0:
+                self.synapse_state_file.root.array.append(
+                    self.synapse_state.get().reshape(1, -1))
 
         self._extract_output()
 
@@ -681,18 +686,20 @@ def _init_objects(self):
                                                         tables.Float64Atom(), (0, num))
 
             '''
-            self.gpot_buffer_file = tables.openFile(self.id + '_buffer.h5','w')
-            self.gpot_buffer_file.createEArray(
-                "/", "array",
-                tables.Float64Atom(), 
-                (0, self.gpot_delay_steps, self.my_num_gpot_neurons))
-
-            self.synapse_state_file = tables.openFile(self.id + '_synapses.h5',
-                                                      'w')
-            self.synapse_state_file.createEArray(
-                "/", "array",
-                tables.Float64Atom(), 
-                (0, self.total_synapses + len(self.input_neuron_list)))
+            if self.my_num_gpot_neurons > 0:
+                self.gpot_buffer_file = tables.openFile(self.id + '_buffer.h5','w')
+                self.gpot_buffer_file.createEArray(
+                    "/", "array",
+                    tables.Float64Atom(), 
+                    (0, self.gpot_delay_steps, self.my_num_gpot_neurons))
+
+            if self.total_synapses + len(self.input_neuron_list) > 0:
+                self.synapse_state_file = tables.openFile(self.id + '_synapses.h5',
+                                                          'w')
+                self.synapse_state_file.createEArray(
+                    "/", "array",
+                    tables.Float64Atom(), 
+                    (0, self.total_synapses + len(self.input_neuron_list)))
 
     def _initialize_gpu_ds(self):
         """