Changeset 801

Timestamp:

06/27/15 14:10:35 (11 months ago)

Author:

mmckerns

Message:

windows comparibility in getch, and pathos; added better read_import

Location:

mystic

Files:

• examples/TEST_ffitPP.py (modified) (1 diff)
• examples/TEST_ffitPP_b.py (modified) (1 diff)
• examples/buckshot_example06.py (modified) (2 diffs)
• examples/lattice_example06.py (modified) (2 diffs)
• examples/mpmap_desolve.py (modified) (1 diff)
• examples/mpmap_desolve_rosen.py (modified) (1 diff)
• examples/test_twistedgaussian3.py (modified) (2 diffs)
• mystic/abstract_solver.py (modified) (1 diff)
• mystic/munge.py (modified) (2 diffs)
• mystic/tools.py (modified) (1 diff)
• scripts/support_hypercube_scenario.py (modified) (1 diff)
• tests/test_symbolic_basic.py (modified) (1 diff)

mystic/examples/TEST_ffitPP.py

@@ -43 +43 @@
 
 if __name__ == '__main__':
+    from pathos.helpers import freeze_support
+    freeze_support() # help Windows use multiprocessing
     solution = main()
     print_solution(solution)

mystic/examples/TEST_ffitPP_b.py

@@ -71 +71 @@
 
 if __name__ == '__main__':
+    from pathos.helpers import freeze_support
+    freeze_support() # help Windows use multiprocessing
 
     # number of local processors

mystic/examples/buckshot_example06.py

@@ -25 +25 @@
 from mystic.models.poly import chebyshev8coeffs
 
-# if available, use a multiprocessing worker pool
+# if available, use a pathos worker pool
 try:
     from pathos.pools import ProcessPool as Pool
@@ -68 +68 @@
 
 if __name__ == '__main__':
+    from pathos.helpers import freeze_support
+    freeze_support() # help Windows use multiprocessing
 
     print "Powell's Method"

mystic/examples/lattice_example06.py

@@ -25 +25 @@
 from mystic.models.poly import chebyshev8coeffs
 
-# if available, use a multiprocessing worker pool
+# if available, use a pathos worker pool
 try:
     from pathos.pools import ProcessPool as Pool
@@ -68 +68 @@
 
 if __name__ == '__main__':
+    from pathos.helpers import freeze_support
+    freeze_support() # help Windows use multiprocessing
 
     print "Powell's Method"

mystic/examples/mpmap_desolve.py

@@ -49 +49 @@
 
 if __name__=='__main__':
+    from pathos.helpers import freeze_support
+    freeze_support() # help Windows use multiprocessing
+
     def print_solution(func):
         print poly1d(func)

mystic/examples/mpmap_desolve_rosen.py

@@ -50 +50 @@
 
 if __name__=='__main__':
+    from pathos.helpers import freeze_support
+    freeze_support() # help Windows use multiprocessing
+
     def print_solution(func):
         print func

mystic/examples/test_twistedgaussian3.py

@@ -21 +21 @@
 
 def scemmap(Q):
+    from test_twistedgaussian import scem
     Cs, As, Sk, Sak, target, cn = Q
     niter = 1000
@@ -33 +34 @@
     # if available, use a multiprocessing worker pool
     try:
+        from pathos.helpers import freeze_support
+        freeze_support() # help Windows use multiprocessing
         from pathos.pools import ProcessPool as Pool
         map = Pool().map

mystic/mystic/abstract_solver.py

@@ -668 +668 @@
         """save solver state to a restart file"""
         import dill
+        fd = None
         if filename is None: # then check if already has registered file
             if self._state is None: # then create a new one
-                import tempfile
-                self._state = tempfile.mkstemp(suffix='.pkl')[-1]
+                import os, tempfile
+                fd, self._state = tempfile.mkstemp(suffix='.pkl')
+                os.close(fd)
             filename = self._state
         self._state = filename

mystic/mystic/munge.py

@@ -46 +46 @@
         params, cost = raw_to_support(params, cost)
     except:
-        exec "from %s import params" % source
-        exec "from %s import cost" % source
+        params, cost = read_import(source+'.py', 'params', 'cost')
     return params, cost
 
@@ -145 +144 @@
 
 def read_raw_file(file_in):
-  import re
-  file_in = re.sub('\.py*.$', '', file_in)  #XXX: strip off .py* extension
-  exec "from %s import params as steps" % file_in
-  exec "from %s import cost as energy" % file_in
-  return steps, energy
+  steps, energy = read_import(file_in, "params", "cost")
+  return steps, energy  # was 'from file_in import params as steps', etc
+
+def read_import(file, *targets):
+  "import the targets; targets are name strings"
+  import re, os, sys
+  _dir, file = os.path.split(file)
+  file = re.sub('\.py*.$', '', file) #XXX: strip .py* extension
+  curdir = os.path.abspath(os.curdir)
+  sys.path.append('.')
+  results = []
+  try:
+    if _dir: os.chdir(_dir)
+    if len(targets):
+      for target in targets:
+        exec "from %s import %s" % (file, target)
+        exec "results.append(%s)" % target
+    else:
+        exec "import %s" % file
+        exec "results.append(%s)" % file
+  except ImportError:
+    raise RuntimeError('File: %s not found' % file)
+  finally:
+    if _dir: os.chdir(curdir)
+    sys.path.pop()
+  if not len(results): return None
+  return results[-1] if (len(results) == 1) else results
 
 def read_converge_file(file_in):

mystic/mystic/tools.py

@@ -236 +236 @@
        if str is not None:
           print str
-       subprocess.call('stty raw', shell=True)
+       if sys.platform[:3] != 'win':
+          raw,cooked = 'stty raw','stty cooked'
+       else:
+          raw,cooked = '',''
+       subprocess.call(raw, shell=True)
        a = sys.stdin.read(1)
-       subprocess.call('stty cooked', shell=True)
+       subprocess.call(cooked, shell=True)
        return a
     else:

mystic/scripts/support_hypercube_scenario.py

@@ -343 +343 @@
     npts = parsed_opts.dim
     if "None" == npts: # npts may have been logged
-      import re
-      file = re.sub('\.py*.$', '', parsed_args[0]) #XXX: strip .py* extension
-      exec "from %s import npts" % file
+      from mystic.munge import read_import
+      npts = read_import(parsed_args[0], 'npts')
     else: npts = tuple(int(i) for i in dim.split(",")) # format is "1,1,1"
   except:

mystic/tests/test_symbolic_basic.py

@@ -128 +128 @@
 
     x0 = [1., 1., 1.]
-    assert almostEqual(pf(cn(x0)), 0.0, tol=1e-7)
+    assert almostEqual(pf(cn(x0)), 0.0, tol=1e-2)
     #XXX: implement: wrap_constraint( as_constraint(pf), sum, ctype='inner') ?