Changeset 799 for mystic

Timestamp:

06/23/15 10:07:07 (11 months ago)

Author:

mmckerns

Message:

update to use pathos.pools; mirror with mystic.pools

Location:

mystic

Files:

• examples/TEST_ffitPP.py (modified) (1 diff)
• examples/TEST_ffitPP_b.py (modified) (1 diff)
• examples/buckshot_example06.py (modified) (1 diff)
• examples/lattice_example06.py (modified) (1 diff)
• examples/mpmap_desolve.py (modified) (1 diff)
• examples/mpmap_desolve_rosen.py (modified) (1 diff)
• examples/test_twistedgaussian3.py (modified) (1 diff)
• examples_UQ/MM2_surrogate_diam_batchgrid.py (modified) (2 diffs)
• examples_UQ/MM_surrogate_diam.py (modified) (1 diff)
• examples_UQ/MPI2_surrogate_diam_batchgrid.py (modified) (1 diff)
• examples_UQ/PP_surrogate_diam.py (modified) (1 diff)
• examples_UQ/QSUB2_surrogate_diam_batchgrid.py (modified) (1 diff)
• mystic/abstract_launcher.py (modified) (1 diff)
• mystic/pools.py (moved) (moved from mystic/mystic/python.py) (4 diffs)
• tests/test_solver_constraints.py (modified) (1 diff)

mystic/examples/TEST_ffitPP.py

@@ -20 +20 @@
 def main():
     from mystic.solvers import DifferentialEvolutionSolver2
-   #from pathos.multiprocessing import ProcessingPool as Pool
-    from pathos.pp import ParallelPythonPool as Pool
+   #from pathos.pools import ProcessPool as Pool
+    from pathos.pools import ParallelPool as Pool
 
     solver = DifferentialEvolutionSolver2(ND, NP)

mystic/examples/TEST_ffitPP_b.py

@@ -47 +47 @@
 def main(servers,ncpus):
     from mystic.solvers import DifferentialEvolutionSolver2
-   #from pathos.multiprocessing import ProcessingPool as Pool
-    from pathos.pp import ParallelPythonPool as Pool
+   #from pathos.pools import ProcessPool as Pool
+    from pathos.pools import ParallelPool as Pool
 
     solver = DifferentialEvolutionSolver2(ND, NP)

mystic/examples/buckshot_example06.py

@@ -27 +27 @@
 # if available, use a multiprocessing worker pool
 try:
-    from pathos.multiprocessing import ProcessingPool as Pool
-   #from pathos.pp import ParallelPythonPool as Pool
+    from pathos.pools import ProcessPool as Pool
+   #from pathos.pools import ParallelPool as Pool
 except ImportError:
-    from mystic.python import PythonSerial as Pool
+    from mystic.pools import SerialPool as Pool
 
 # tools

mystic/examples/lattice_example06.py

@@ -27 +27 @@
 # if available, use a multiprocessing worker pool
 try:
-    from pathos.multiprocessing import ProcessingPool as Pool
-   #from pathos.pp import ParallelPythonPool as Pool
+    from pathos.pools import ProcessPool as Pool
+   #from pathos.pools import ParallelPool as Pool
 except ImportError:
-    from mystic.python import PythonSerial as Pool
+    from mystic.pools import SerialPool as Pool
 
 # tools

mystic/examples/mpmap_desolve.py

@@ -24 +24 @@
 
 try:
-  from pathos.multiprocessing import ProcessingPool as Pool
+  from pathos.pools import ProcessPool as Pool
 except:
   print __doc__

mystic/examples/mpmap_desolve_rosen.py

@@ -24 +24 @@
 
 try:
-  from pathos.multiprocessing import ProcessingPool as Pool
+  from pathos.pools import ProcessPool as Pool
 except:
   print __doc__

mystic/examples/test_twistedgaussian3.py

@@ -33 +33 @@
     # if available, use a multiprocessing worker pool
     try:
-        from pathos.multiprocessing import ProcessingPool as Pool
+        from pathos.pools import ProcessPool as Pool
         map = Pool().map
     except ImportError:

mystic/examples_UQ/MM2_surrogate_diam_batchgrid.py

@@ -66 +66 @@
 def optimize(cost,lower,upper,nbins):
   from mystic.tools import random_seed
-  from pathos.multiprocessing import ProcessingPool as Pool
+  from pathos.pools import ProcessPool as Pool
   random_seed(123)
 
@@ -110 +110 @@
 #######################################################################
 def UQ(start,end,lower,upper):
- #from pathos.multiprocessing import ProcessingPool as Pool
-  from pathos.multiprocessing import ThreadingPool as Pool
+ #from pathos.pools import ProcessPool as Pool
+  from pathos.pools import ThreadPool as Pool
  #from pool_helper import func_pickle  # if fails to pickle, try using a helper
 

mystic/examples_UQ/MM_surrogate_diam.py

@@ -65 +65 @@
 #######################################################################
 def optimize(cost,lb,ub):
-  from pathos.multiprocessing import ProcessingPool as Pool
+  from pathos.pools import ProcessPool as Pool
   from mystic.solvers import DifferentialEvolutionSolver2
   from mystic.termination import CandidateRelativeTolerance as CRT

mystic/examples_UQ/MPI2_surrogate_diam_batchgrid.py

@@ -111 +111 @@
 def UQ(start,end,lower,upper):
  #from pyina.launchers import Mpi as Pool
-  from pathos.multiprocessing import ProcessingPool as Pool
+  from pathos.pools import ProcessPool as Pool
  #from pool_helper import func_pickle  # if fails to pickle, try using a helper
 

mystic/examples_UQ/PP_surrogate_diam.py

@@ -65 +65 @@
 #######################################################################
 def optimize(cost,lb,ub):
-  from pathos.pp import ParallelPythonPool as Pool
+  from pathos.pools import ParallelPool as Pool
   from mystic.solvers import DifferentialEvolutionSolver2
   from mystic.termination import CandidateRelativeTolerance as CRT

mystic/examples_UQ/QSUB2_surrogate_diam_batchgrid.py

@@ -111 +111 @@
 def UQ(start,end,lower,upper):
  #from pyina.launchers import Mpi as Pool
-  from pathos.multiprocessing import ProcessingPool as Pool
+  from pathos.pools import ProcessPool as Pool
  #from pool_helper import func_pickle  # if fails to pickle, try using a helper
 

mystic/mystic/abstract_launcher.py

@@ -28 +28 @@
 
     >>> # instantiate and configure the worker pool
-    >>> from pathos.multiprocessing import ProcessingPool
-    >>> pool = ProcessingPool(nodes=4)
+    >>> from pathos.pools import ProcessPool
+    >>> pool = ProcessPool(nodes=4)
     >>>
     >>> # do a blocking map on the chosen function

mystic/mystic/pools.py

@@ -22 +22 @@
 
     >>> # instantiate and configure the worker pool
-    >>> from pathos.python import PythonSerial
-    >>> pool = PythonSerial()
+    >>> from pathos.serial import SerialPool
+    >>> pool = SerialPool()
     >>>
     >>> # do a blocking map on the chosen function
-    >>> results = pool.map(pow, [1,2,3,4], [5,6,7,8])
+    >>> print pool.map(pow, [1,2,3,4], [5,6,7,8])
     >>>
     >>> # do a non-blocking map, then extract the results from the iterator
     >>> results = pool.imap(pow, [1,2,3,4], [5,6,7,8])
-    >>> results = list(results)
+    >>> print "..."
+    >>> print list(results)
+    >>>
+    >>> # do one item at a time, using a pipe
+    >>> print pool.pipe(pow, 1, 5)
+    >>> print pool.pipe(pow, 2, 6)
 
 
@@ -43 +48 @@
 
 """
-__all__ = ['PythonSerial']
+__all__ = ['SerialPool']
 
 from abstract_launcher import AbstractWorkerPool
@@ -51 +56 @@
 from __builtin__ import map as _map, apply as _apply
 
-class PythonSerial(AbstractWorkerPool):
+class SerialPool(AbstractWorkerPool):
     """
 Mapper that leverages standard (i.e. serial) python maps.
@@ -78 +83 @@
 
 
+# backward compatibility
+PythonSerial = SerialPool
+
+# EOF

mystic/tests/test_solver_constraints.py

@@ -181 +181 @@
 
   # solver with mapper
- #from pathos.multiprocessing import ProcessingPool as Pool
-  from mystic.python import PythonSerial as Pool
+ #from pathos.pools import ProcessPool as Pool
+  from mystic.pools import SerialPool as Pool
   map = Pool(5).map
   for solver in classes: