Merge pull request #7 from jsiirola/fix-pyro-ref

Update PyroAsynchronousActionManager import to reflect move into PySP

.github/workflows/pr_master_test.yml

@@ -277,6 +277,7 @@ jobs:
       run: |
         IPOPT_DIR=$TPL_DIR/ipopt
         echo "$IPOPT_DIR" >> $GITHUB_PATH
+        echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$IPOPT_DIR" >> $GITHUB_ENV
         mkdir -p $IPOPT_DIR
         IPOPT_TAR=${DOWNLOAD_DIR}/ipopt.tar.gz
         if test ! -e $IPOPT_TAR; then

pysp/drive_lagrangian_cc.py

@@ -34,7 +34,7 @@ def run(args=None):
 ##########################================================#########
    # to import plugins
    import pyomo.environ
-   import pyomo.solvers.plugins.smanager.pyro
+   import pysp.pyro.smanager_pyro
    import pysp.plugins.phpyro
 
    def partialLagrangeParametric(args=None):

pysp/ef_writer_script.py

@@ -49,6 +49,7 @@
      IPySPSolutionLoaderExtension)
 from pysp.solutionwriter import ISolutionWriterExtension
 from pysp.ef import write_ef, create_ef_instance
+import pysp.pyro.smanager_pyro
 
 logger = logging.getLogger('pysp')
 
@@ -202,8 +203,7 @@ def close(self):
         self.destroy_ef()
         if self._solver_manager is not None:
             if isinstance(self._solver_manager,
-                          pyomo.solvers.plugins.smanager.\
-                          pyro.SolverManager_Pyro):
+                          pysp.pyro.smanager_pyro.SolverManager_Pyro):
                 if self.get_option("pyro_shutdown_workers"):
                       self._solver_manager.shutdown_workers()
         self._solver_manager = None
@@ -220,7 +220,7 @@ def close(self):
         self.solve_time = undefined
 
     def __init__(self, manager, *args, **kwds):
-        import pyomo.solvers.plugins.smanager.pyro
+        import pysp.pyro.smanager_pyro
         super(ExtensiveFormAlgorithm, self).__init__(*args, **kwds)
 
         # TODO: after PH moves over to the new code

pysp/ph.py

@@ -55,7 +55,7 @@
 from pysp import phsolverserverutils
 
 from pyomo.opt.parallel.local import SolverManager_Serial
-import pyomo.solvers.plugins.smanager
+import pysp.pyro.smanager_pyro
 
 from six import iterkeys, itervalues, iteritems
 from six.moves import xrange

pysp/phinit.py

@@ -672,7 +672,7 @@ def GenerateScenarioTreeForPH(options,
 def PHAlgorithmBuilder(options, scenario_tree):
 
     import pyomo.environ
-    import pyomo.solvers.plugins.smanager.pyro
+    import pysp.pyro.smanager_pyro
     import pysp.plugins.phpyro
 
     solution_writer_plugins = ExtensionPoint(ISolutionWriterExtension)
@@ -890,7 +890,7 @@ def PHAlgorithmBuilder(options, scenario_tree):
                           pysp.plugins.phpyro.SolverManager_PHPyro):
                 solver_manager.release_servers(shutdown=ph._shutdown_pyro_workers)
             elif isinstance(solver_manager,
-                          pyomo.solvers.plugins.smanager.pyro.SolverManager_Pyro):
+                          pysp.pyro.smanager_pyro.SolverManager_Pyro):
                 if ph._shutdown_pyro_workers:
                     solver_manager.shutdown_workers()
 
@@ -973,14 +973,14 @@ def PHCleanup(ph):
     if ph._solver_manager is not None:
 
         import pyomo.environ
-        import pyomo.solvers.plugins.smanager.pyro
+        import pysp.pyro.smanager_pyro
         import pysp.plugins.phpyro
 
         if isinstance(ph._solver_manager,
                       pysp.plugins.phpyro.SolverManager_PHPyro):
             ph._solver_manager.release_servers(shutdown=ph._shutdown_pyro_workers)
         elif isinstance(ph._solver_manager,
-                        pyomo.solvers.plugins.smanager.pyro.SolverManager_Pyro):
+                        pysp.pyro.smanager_pyro.SolverManager_Pyro):
             if ph._shutdown_pyro_workers:
                 ph._solver_manager.shutdown_workers()
 
@@ -998,7 +998,7 @@ def PHCleanup(ph):
 def run_ph(options, ph):
 
     import pyomo.environ
-    import pyomo.solvers.plugins.smanager.pyro
+    import pysp.pyro.smanager_pyro
     import pysp.plugins.phpyro
 
     start_time = time.time()

pysp/scenariotree/action_manager_pyro.py

@@ -22,7 +22,7 @@
 
 from pyomo.common.dependencies import attempt_import
 from pyomo.opt.parallel.manager import ActionStatus
-from pyomo.opt.parallel.pyro import PyroAsynchronousActionManager
+from pysp.pyro.pyro_asynch import PyroAsynchronousActionManager
 
 pyu_pyro = attempt_import('pyutilib.pyro', alt_names=['pyu_pyro'])[0]
 Pyro4 = attempt_import('Pyro4')[0]

pysp/solvers/ef.py

@@ -52,6 +52,7 @@
     ScenarioTreeManagerClientPyro
 from pysp.scenariotree.manager_solver import \
     ScenarioTreeManagerSolverClientPyro
+import pysp.pyro.smanager_pyro
 
 logger = logging.getLogger('pysp')
 
@@ -175,15 +176,14 @@ def close(self):
         self.destroy_ef()
         if self._solver_manager is not None:
             if isinstance(self._solver_manager,
-                          pyomo.solvers.plugins.smanager.\
-                          pyro.SolverManager_Pyro):
+                          pysp.pyro.smanager_pyro.SolverManager_Pyro):
                 if self.get_option("pyro_shutdown_workers"):
                       self._solver_manager.shutdown_workers()
         self._solver_manager = None
         self._manager = None
 
     def __init__(self, manager, *args, **kwds):
-        import pyomo.solvers.plugins.smanager.pyro
+        import pysp.pyro.smanager_pyro
         super(ExtensiveFormAlgorithm, self).__init__(*args, **kwds)
 
         # TODO: after PH moves over to the new code