Changeset 784

Timestamp:

02/18/15 18:10:28 (15 months ago)

Author:

mmckerns

Message:

added SolverInterrupt? as termination; pull _EARLYEXIT into CheckTermination?

Location:

mystic/mystic

Files:

• abstract_ensemble_solver.py (modified) (2 diffs)
• abstract_solver.py (modified) (8 diffs)
• differential_evolution.py (modified) (8 diffs)
• ensemble.py (modified) (12 diffs)
• scipy_optimize.py (modified) (6 diffs)
• termination.py (modified) (1 diff)

mystic/mystic/abstract_ensemble_solver.py

@@ -229 +229 @@
         # check for termination messages
         msg = termination(solver, info=True)
+        sig = "SolverInterrupt with %s" % {}
         lim = "EvaluationLimits with %s" % {'evaluations':solver._maxfun,
                                             'generations':solver._maxiter}
@@ -242 +243 @@
             if disp:
                 print "Warning: Maximum number of iterations has been exceeded"
+        elif solver._EARLYEXIT: #XXX: self or solver ?
+            msg = sig
+            if disp:
+                print "Warning: Optimization terminated with signal interrupt."
         elif msg and disp:
             print "Optimization terminated successfully."

mystic/mystic/abstract_solver.py

@@ -422 +422 @@
         return
 
-    def enable_signal_handler(self):
+    def enable_signal_handler(self):#, callback='*'):
         """enable workflow interrupt handler while solver is running"""
+        """ #XXX: disabled, as would add state to solver
+input::
+    - if a callback function is provided, generate a new handler with
+      the given callback.  If callback is None, do not use a callback.
+      If callback is not provided, just turn on the existing handler.
+"""
+       ## always _generate handler on first call
+       #if (self.signal_handler is None) and callback == '*':
+       #    callback = None
+       ## when a new callback is given, generate a new handler
+       #if callback != '*':
+       #    self._generateHandler(callback)
         self._handle_sigint = True
 
@@ -546 +558 @@
         # check for termination messages
         msg = termination(self, info=True)
+        sig = "SolverInterrupt with %s" % {}
         lim = "EvaluationLimits with %s" % {'evaluations':self._maxfun,
                                             'generations':self._maxiter}
@@ -559 +572 @@
             if disp:
                 print "Warning: Maximum number of iterations has been exceeded"
+        elif self._EARLYEXIT:
+            msg = sig
+            if disp:
+                print "Warning: Optimization terminated with signal interrupt."
         elif msg and disp:
             print "Optimization terminated successfully."
@@ -671 +688 @@
         return settings
 
-    def Solve(self, cost=None, termination=None, sigint_callback=None,
-                                                 ExtraArgs=None, **kwds):
+    def Solve(self, cost=None, termination=None, ExtraArgs=None, **kwds):
         """Minimize a 'cost' function with given termination conditions.
 
@@ -687 +703 @@
 
     termination -- callable object providing termination conditions.
+    ExtraArgs -- extra arguments for cost.
+
+Further Inputs:
+
     sigint_callback -- callback function for signal handler.
-    ExtraArgs -- extra arguments for cost.
-
-Further Inputs:
-
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is
@@ -700 +716 @@
         cost = self._bootstrap_objective(cost, ExtraArgs)
         # process and activate input settings
+        sigint_callback = kwds.pop('sigint_callback', None)
         settings = self._process_inputs(kwds)
         for key in settings:
@@ -705 +722 @@
 
         # set up signal handler
+        self._EARLYEXIT = False  #XXX: why not use EARLYEXIT singleton?
+        self._generateHandler(sigint_callback)
+
+        # activate signal handler
         import signal
-        self._EARLYEXIT = False  #XXX: why not use EARLYEXIT singleton?
-        self._generateHandler(sigint_callback) 
         if self._handle_sigint: signal.signal(signal.SIGINT,self.signal_handler)
 
@@ -721 +740 @@
 
         # the main optimization loop
-        while not self.CheckTermination() and not self._EARLYEXIT:
+        while not self.CheckTermination():
             self.Step(**settings)  # includes settings['callback']
         else: self._exitMain()
 
-        # handle signal interrupts
+        # restore default handler for signal interrupts
         signal.signal(signal.SIGINT,signal.default_int_handler)
 

mystic/mystic/differential_evolution.py

@@ -291 +291 @@
         return settings
 
-    def Solve(self, cost=None, termination=None, sigint_callback=None,
-                                                 ExtraArgs=None, **kwds):
+    def Solve(self, cost=None, termination=None, ExtraArgs=None, **kwds):
         """Minimize a function using differential evolution.
 
@@ -307 +306 @@
 
     termination -- callable object providing termination conditions.
-    sigint_callback -- callback function for signal handler.
     ExtraArgs -- extra arguments for cost.
 
@@ -318 +316 @@
     ScalingFactor -- multiplier for the impact of mutations on the
         trial solution [default = 0.8]
+    sigint_callback -- callback function for signal handler.
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is
@@ -324 +323 @@
         """
         super(DifferentialEvolutionSolver, self).Solve(cost, termination,\
-                                      sigint_callback, ExtraArgs, **kwds)
+                                                       ExtraArgs, **kwds)
         return
 
@@ -461 +460 @@
         return settings
 
-    def Solve(self, cost=None, termination=None, sigint_callback=None,
-                                                 ExtraArgs=None, **kwds):
+    def Solve(self, cost=None, termination=None, ExtraArgs=None, **kwds):
         """Minimize a function using differential evolution.
 
@@ -478 +476 @@
 
     termination -- callable object providing termination conditions.
-    sigint_callback -- callback function for signal handler.
     ExtraArgs -- extra arguments for cost.
 
@@ -489 +486 @@
     ScalingFactor -- multiplier for the impact of mutations on the
         trial solution [default = 0.8]
+    sigint_callback -- callback function for signal handler.
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is
@@ -495 +493 @@
         """
         super(DifferentialEvolutionSolver2, self).Solve(cost, termination,\
-                                      sigint_callback, ExtraArgs, **kwds)
+                                                        ExtraArgs, **kwds)
         return 
 

mystic/mystic/ensemble.py

@@ -57 +57 @@
 
     #FIXME: should take cost=None, ExtraArgs=None... and utilize Step
-    def Solve(self, cost, termination=None, sigint_callback=None,
-                                            ExtraArgs=(), **kwds):
+    def Solve(self, cost, termination=None, ExtraArgs=(), **kwds):
         """Minimize a function using batch grid optimization.
 
@@ -73 +72 @@
 
     termination -- callable object providing termination conditions.
+    ExtraArgs -- extra arguments for cost.
+
+Further Inputs:
+
     sigint_callback -- callback function for signal handler.
-    ExtraArgs -- extra arguments for cost.
-
-Further Inputs:
-
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is the
@@ -84 +83 @@
         """
         # process and activate input settings
+        sigint_callback = kwds.pop('sigint_callback', None)
         settings = self._process_inputs(kwds)
         disp = settings.get('disp', False)
@@ -93 +93 @@
         #-------------------------------------------------------------
 
-        import signal
-       #self._EARLYEXIT = False
-
        #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
         from python_map import python_map
@@ -103 +100 @@
             self._fcalls, cost = wrap_function(cost, ExtraArgs, self._evalmon)
 
-        #generate signal_handler
+        # set up signal handler
+       #self._EARLYEXIT = False
         self._generateHandler(sigint_callback) 
+
+        # activate signal_handler
+        import signal
         if self._handle_sigint: signal.signal(signal.SIGINT,self.signal_handler)
 
@@ -222 +223 @@
         #-------------------------------------------------------------
 
+        # restore default handler for signal interrupts
         signal.signal(signal.SIGINT,signal.default_int_handler)
 
@@ -248 +250 @@
         self._termination = NormalizedChangeOverGeneration(convergence_tol)
 
-    def Solve(self, cost, termination=None, sigint_callback=None,
-                                            ExtraArgs=(), **kwds):
+    def Solve(self, cost, termination=None, ExtraArgs=(), **kwds):
         """Minimize a function using buckshot optimization.
 
@@ -264 +265 @@
 
     termination -- callable object providing termination conditions.
+    ExtraArgs -- extra arguments for cost.
+
+Further Inputs:
+
     sigint_callback -- callback function for signal handler.
-    ExtraArgs -- extra arguments for cost.
-
-Further Inputs:
-
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is the
@@ -275 +276 @@
         """
         # process and activate input settings
+        sigint_callback = kwds.pop('sigint_callback', None)
         settings = self._process_inputs(kwds)
         disp = settings.get('disp', False)
@@ -284 +286 @@
         #-------------------------------------------------------------
 
-        import signal
-       #self._EARLYEXIT = False
-
        #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
         from python_map import python_map
@@ -294 +293 @@
             self._fcalls, cost = wrap_function(cost, ExtraArgs, self._evalmon)
 
-        #generate signal_handler
+        # set up signal handler
+       #self._EARLYEXIT = False
         self._generateHandler(sigint_callback) 
+
+        # activate signal_handler
+        import signal
         if self._handle_sigint: signal.signal(signal.SIGINT,self.signal_handler)
 
@@ -406 +409 @@
         #-------------------------------------------------------------
 
+        # restore default handler for signal interrupts
         signal.signal(signal.SIGINT,signal.default_int_handler)
 

mystic/mystic/scipy_optimize.py

@@ -270 +270 @@
         return settings
 
-    def Solve(self, cost=None, termination=None, sigint_callback=None,
-                                                 ExtraArgs=None, **kwds):
+    def Solve(self, cost=None, termination=None, ExtraArgs=None, **kwds):
         """Minimize a function using the downhill simplex algorithm.
 
@@ -286 +285 @@
 
     termination -- callable object providing termination conditions.
+    ExtraArgs -- extra arguments for cost.
+
+Further Inputs:
+
     sigint_callback -- callback function for signal handler.
-    ExtraArgs -- extra arguments for cost.
-
-Further Inputs:
-
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is the
@@ -298 +297 @@
 """
         super(NelderMeadSimplexSolver, self).Solve(cost, termination,\
-                                  sigint_callback, ExtraArgs, **kwds)
+                                                   ExtraArgs, **kwds)
         return
 
@@ -593 +592 @@
         return settings
 
-    def Solve(self, cost=None, termination=None, sigint_callback=None,
-                                                 ExtraArgs=None, **kwds):
+    def Solve(self, cost=None, termination=None, ExtraArgs=None, **kwds):
         """Minimize a function using modified Powell's method.
 
@@ -609 +607 @@
 
     termination -- callable object providing termination conditions.
+    ExtraArgs -- extra arguments for cost.
+
+Further Inputs:
+
     sigint_callback -- callback function for signal handler.
-    ExtraArgs -- extra arguments for cost.
-
-Further Inputs:
-
     callback -- an optional user-supplied function to call after each
         iteration.  It is called as callback(xk), where xk is the
@@ -622 +620 @@
 """
         super(PowellDirectionalSolver, self).Solve(cost, termination,\
-                                  sigint_callback, ExtraArgs, **kwds)
+                                                   ExtraArgs, **kwds)
         return
 

mystic/mystic/termination.py

@@ -349 +349 @@
     return _EvaluationLimits
 
+def SolverInterrupt(): #XXX: enable = True ?
+    """handler is enabled and interrupt is given:
+
+_EARLYEXIT == True"""
+    doc = "SolverInterrupt with %s" % {}
+    def _SolverInterrupt(inst, info=False):
+        if info: info = lambda x:x
+        else: info = bool
+        if inst._EARLYEXIT: return info(doc)
+        return info(null)
+    _SolverInterrupt.__doc__ = doc
+    return _SolverInterrupt
+
 # end of file