Changeset 678 for branches

Timestamp:

06/05/13 07:02:44 (3 years ago)

Author:

mmckerns

Message:

func_pickle not needed for MPI2 either, so commented it out;
added MM2 example, also modified MPI2 example to avoid OOB connection error

Location:

branches/UQ/math/examples

Files:

• MM2_surrogate_diam_batchgrid.py (copied) (copied from branches/UQ/math/examples/MPI2_surrogate_diam_batchgrid.py) (4 diffs)
• MPI2_surrogate_diam_batchgrid.py (modified) (3 diffs)
• QSUB2_surrogate_diam_batchgrid.py (modified) (3 diffs)
• pool_helper.py (moved) (moved from branches/UQ/math/examples/MPI2_helper.py) (2 diffs)

branches/UQ/math/examples/MM2_surrogate_diam_batchgrid.py

@@ -61 +61 @@
 def optimize(cost,lower,upper,nbins):
   from mystic.tools import random_seed
-  from pyina.launchers import Mpi as Pool
+  from pathos.multiprocessing import ProcessingPool as Pool
   random_seed(123)
 
@@ -72 +72 @@
 
   # build a grid of starting points
-  from MPI2_helper import local_optimize
+  from pool_helper import local_optimize
   from mystic.math.grid import gridpts
   initial_values = gridpts(bins)
@@ -105 +105 @@
 #######################################################################
 def UQ(start,end,lower,upper):
-  from pyina.launchers import Mpi as Pool
-  from MPI2_helper import func_pickle
+  from pathos.multiprocessing import ProcessingPool as Pool
+ #from pool_helper import func_pickle  # if fails to pickle, try using a helper
 
   # run optimizer for each subdiameter 
@@ -114 +114 @@
   for i in range(len(nb)): nb[i][-1] = nb[i][i]
   cf = [costFactory(i)     for i in range(start,end+1)]
-  cf = [func_pickle(i)     for i in cf]
-  cn = [cost.name          for cost in cf]
+ #cf = [func_pickle(i)     for i in cf]
+ #cf = [cost.name          for cost in cf]
   nnodes = len(lb)
 
   #construct cost function and run optimizer
-  results = Pool(nnodes).map(optimize, cn,lb,ub,nb)
+  results = Pool(nnodes).map(optimize, cf,lb,ub,nb)
   #print "results = %s" % results
 

branches/UQ/math/examples/MPI2_surrogate_diam_batchgrid.py

@@ -72 +72 @@
 
   # build a grid of starting points
-  from MPI2_helper import local_optimize
+  from pool_helper import local_optimize
   from mystic.math.grid import gridpts
   initial_values = gridpts(bins)
@@ -105 +105 @@
 #######################################################################
 def UQ(start,end,lower,upper):
-  from pyina.launchers import Mpi as Pool
-  from MPI2_helper import func_pickle
+ #from pyina.launchers import Mpi as Pool
+  from pathos.multiprocessing import ProcessingPool as Pool
+ #from pool_helper import func_pickle  # if fails to pickle, try using a helper
 
   # run optimizer for each subdiameter 
@@ -114 +115 @@
   for i in range(len(nb)): nb[i][-1] = nb[i][i]
   cf = [costFactory(i)     for i in range(start,end+1)]
-  cf = [func_pickle(i)     for i in cf]
-  cn = [cost.name          for cost in cf]
+ #cf = [func_pickle(i)     for i in cf]
+ #cf = [cost.name          for cost in cf]
   nnodes = len(lb)
 
   #construct cost function and run optimizer
-  results = Pool(nnodes).map(optimize, cn,lb,ub,nb)
+  results = Pool(nnodes).map(optimize, cf,lb,ub,nb)
   #print "results = %s" % results
 

branches/UQ/math/examples/QSUB2_surrogate_diam_batchgrid.py

@@ -73 +73 @@
   # build a grid of starting points
   from mystic.math.grid import gridpts
-  from MPI2_helper import local_optimize
-  from MPI2_helper import nnodes, queue, timelimit
+  from pool_helper import local_optimize
+  from pool_helper import nnodes, queue, timelimit
   initial_values = gridpts(bins)
 
@@ -106 +106 @@
 def UQ(start,end,lower,upper):
   from pyina.launchers import Mpi as Pool
-  from MPI2_helper import func_pickle
+ #from pool_helper import func_pickle  # if fails to pickle, try using a helper
 
   # run optimizer for each subdiameter 
@@ -114 +114 @@
   for i in range(len(nb)): nb[i][-1] = nb[i][i]
   cf = [costFactory(i)     for i in range(start,end+1)]
-  cf = [func_pickle(i)     for i in cf]
-  cn = [cost.name          for cost in cf]
+ #cf = [func_pickle(i)     for i in cf]
+ #cn = [cost.name          for cost in cf]
   nnodes = len(lb)
 
   #construct cost function and run optimizer
-  results = Pool(nnodes).map(optimize, cn,lb,ub,nb)
+  results = Pool(nnodes).map(optimize, cf,lb,ub,nb)
   #print "results = %s" % results
 

branches/UQ/math/examples/pool_helper.py

@@ -28 +28 @@
   convergence_tol = 1e-4
 
-  def func_unpickle(filename):
-    """ standard pickle.load of function from a File """
-    import dill as pickle
-    return pickle.load(open(filename,'r'))
+ #def func_unpickle(filename):
+ #  """ standard pickle.load of function from a File """
+ #  import dill as pickle
+ #  return pickle.load(open(filename,'r'))
 
  #stepmon = VerboseMonitor(100)
@@ -47 +47 @@
 
   tol = convergence_tol
-  cost = func_unpickle(cost)  #XXX: regenerate cost function from file
+ #cost = func_unpickle(cost)  #XXX: regenerate cost function from file
   solver.Solve(cost, termination=NCOG(tol))