Changeset 1004

Timestamp:

10/31/11 17:01:18 (7 months ago)

Author:

apdavison

Message:

Fixed a couple of bugs in nest/connectors.py

Location:

trunk

Files:

• src/nest/connectors.py (modified) (2 diffs)
• test/benchmarks/connectors_benchmark.py (modified) (2 diffs)

trunk/src/nest/connectors.py

@@ -31 +31 @@
         if self.delays is None:
             self.delays = projection._simulator.state.min_delay
-        self.N                 = projection.pre.size   
-        idx                    = numpy.arange(self.N*rank(), self.N*(rank()+1))        
-        self.M                 = num_processes()*self.N
+        self.N                 = projection.pre.size
+        mpi_rank               = projection._simulator.state.mpi_rank
+        num_processes          = projection._simulator.state.num_processes
+        idx                    = numpy.arange(self.N*mpi_rank, self.N*(mpi_rank+1))        
+        self.M                 = num_processes*self.N
         self.local             = numpy.ones(self.N, bool)        
         self.local_long        = numpy.zeros(self.M, bool)
@@ -119 +121 @@
         for count, tgt in enumerate(projection.post.local_cells):
             connector._probabilistic_connect(tgt, self.p_connect)
-            self.progression(count)
+            self.progression(count, projection._simulator.state.mpi_rank)
             
 

trunk/test/benchmarks/connectors_benchmark.py

@@ -1 +1 @@
 from pylab import *
 from pyNN.utility import get_script_args, Timer
-from pyNN.common import rank
-from pyNN.space import *
-from pyNN.recording import files
 import os
 
 simulator_name = get_script_args(1)[0]
 exec("from pyNN.%s import *" % simulator_name)
+
+from pyNN.recording import files
+from pyNN.space import *
+
 timer = Timer()
 def draw_rf(cell, positions, connections, color='k'):
@@ -111 +112 @@
             x.save_positions('Results/positions.dat')          
         end()
+        
         if node_id == 0 and render and to_file:
             figure()