Changeset 150

Timestamp:

06/26/09 20:32:23 (7 years ago)

Author:

mmckerns

Message:

resolved bug reported in (reopened) ticket #69

File:

• pyina/pyina/differential_evolution.py (modified) (7 diffs)

pyina/pyina/differential_evolution.py

@@ -32 +32 @@
 
 """
-#FIXME: only master fcalls[0] checked vs maxfun; should be fcalls for all ranks
-#FIXME: for disp=1, master should print summary of fcalls; not each rank prints
 #FIXME: enable_signal_handler doesn't work.  [Ctrl-C kills the solver]
 #FIXME: make a module level variable MASTER=0 (?) [replaces master=0]
@@ -59 +57 @@
 from pickle import loads, dumps
 from pyina.parallel_map import parallel_map
-from pyina._pyina import bcastString
+from pyina._pyina import bcastString, sendString, receiveString
 
 import mpiconsts
@@ -92 +90 @@
         self.probability   = 0.5
         self.map           = parallel_map
+
+        # MPI #########
+        import mpi
+        size = mpi.world().size
+        ###############
+        self.functioncalls = [0] * size
 
     def SetMapping(self, mapper):
@@ -169 +173 @@
         world = mpi.world()
         size = world.size
+       #comm = pyina._pyina.commDup(world.handle())
         ###############
 
@@ -196 +201 @@
         generation = 0
         for generation in range(self._maxiter):
+
+            # MPI #####BEGIN: summing functioncalls
+            if world.rank == master: # MPI #########
+                self.functioncalls[0] = fcalls[0]
+                for i in range(1,size):
+                    (message,status) = receiveString(world.handle(), MPI_ANY_SOURCE, MPI_ANY_TAG)
+                    sender,anstag = status['MPI_SOURCE'],status['MPI_TAG']
+                    self.functioncalls[sender] = loads(message)
+            else:
+                functioncalls = dumps(fcalls[0])
+                sendString(world.handle(), master, world.rank, functioncalls)
+            # MPI #####END: summing functioncalls
+
             if world.rank == master: # MPI #########
                 StepMonitor(self.bestSolution[:], self.bestEnergy)
-                if fcalls[0] >= self._maxfun:
+                if sum(self.functioncalls) >= self._maxfun:
+               #if fcalls[0] >= self._maxfun:
                     nn = bcastString(world.handle(), master, "stop") # MPI #####
                     break
@@ -263 +282 @@
         warnflag = 0
 
-        if fcalls[0] >= self._maxfun:
+        if sum(self.functioncalls) >= self._maxfun:
+       #if fcalls[0] >= self._maxfun:
             warnflag = 1
             if disp and world.rank == master: # MPI #####
@@ -278 +298 @@
                     print "         Current function value: %f" % fval
                     print "         Iterations: %d" % self.generations
-                print "         Function evaluations: %d (Rank: %d)" % (fcalls[0],world.rank)
+                    print "         Function evaluations: %d" % sum(self.functioncalls)
+                   #print "         Function evaluations: %s" % self.functioncalls #XXX: print fcalls per node
 
         return