Revert "Merge pull request #565 from bknueven/defer_import"

This reverts commit 5b9c06f, reversing
changes made to 2649a26.

Author: bknueven

mpisppy/generic_cylinders.py

@@ -10,7 +10,9 @@
 
 import sys
 import os
+import json
 import copy
+import shutil
 import numpy as np
 import pyomo.environ as pyo
 import pyomo.common.config as pyofig
@@ -21,14 +23,26 @@
 import mpisppy.utils.config as config
 import mpisppy.utils.sputils as sputils
 
+from mpisppy.convergers.norm_rho_converger import NormRhoConverger
+from mpisppy.convergers.primal_dual_converger import PrimalDualConverger
+
 from mpisppy.extensions.extension import MultiExtension, Extension
+from mpisppy.extensions.norm_rho_updater import NormRhoUpdater
+from mpisppy.extensions.primal_dual_rho import PrimalDualRho
+from mpisppy.extensions.grad_rho import GradRho
+from mpisppy.extensions.scenario_lp_mps_files import Scenario_lp_mps_files
+
+from mpisppy.utils.wxbarwriter import WXBarWriter
+from mpisppy.utils.wxbarreader import WXBarReader
+
+import mpisppy.utils.pickle_bundle as pickle_bundle
+import mpisppy.utils.proper_bundler as proper_bundler
 
 import mpisppy.utils.solver_spec as solver_spec
 
 from mpisppy import global_toc
 from mpisppy import MPI
 
-
 def _parse_args(m):
     # m is the model file module
     cfg = config.Config()
@@ -152,13 +166,11 @@ def do_decomp(module, cfg, scenario_creator, scenario_creator_kwargs, scenario_d
             raise RuntimeError("No rho_setter so a default must be specified via --default-rho")
 
     if cfg.use_norm_rho_converger:
-        from mpisppy.convergers.norm_rho_converger import NormRhoConverger
         if not cfg.use_norm_rho_updater:
             raise RuntimeError("--use-norm-rho-converger requires --use-norm-rho-updater")
         else:
             ph_converger = NormRhoConverger
     elif cfg.primal_dual_converger:
-        from mpisppy.convergers.primal_dual_converger import PrimalDualConverger
         ph_converger = PrimalDualConverger
     else:
         ph_converger = None
@@ -239,26 +251,21 @@ def do_decomp(module, cfg, scenario_creator, scenario_creator_kwargs, scenario_d
         vanilla.add_integer_relax_then_enforce(hub_dict, cfg)
 
     if cfg.grad_rho:
-        from mpisppy.extensions.grad_rho import GradRho
         ext_classes.append(GradRho)
         hub_dict['opt_kwargs']['options']['grad_rho_options'] = {'cfg': cfg}
 
     if cfg.write_scenario_lp_mps_files_dir is not None:
-        from mpisppy.extensions.scenario_lp_mps_files import Scenario_lp_mps_files
         ext_classes.append(Scenario_lp_mps_files)
         hub_dict['opt_kwargs']['options']["write_lp_mps_extension_options"]\
             = {"write_scenario_lp_mps_files_dir": cfg.write_scenario_lp_mps_files_dir}
 
     if cfg.W_and_xbar_reader:
-        from mpisppy.utils.wxbarreader import WXBarReader
         ext_classes.append(WXBarReader)
 
     if cfg.W_and_xbar_writer:
-        from mpisppy.utils.wxbarwriter import WXBarWriter
         ext_classes.append(WXBarWriter)
 
     if cfg.user_defined_extensions is not None:
-        import json
         for ext_name in cfg.user_defined_extensions:
             module = sputils.module_name_to_module(ext_name)
             ext_classes = []
@@ -306,12 +313,10 @@ def do_decomp(module, cfg, scenario_creator, scenario_creator_kwargs, scenario_d
 
     # norm rho adaptive rho (not the gradient version)
     if cfg.use_norm_rho_updater:
-        from mpisppy.extensions.norm_rho_updater import NormRhoUpdater
         vanilla.extension_adder(hub_dict, NormRhoUpdater)
         hub_dict['opt_kwargs']['options']['norm_rho_options'] = {'verbose': cfg.verbose}
 
     if cfg.use_primal_dual_rho_updater:
-        from mpisppy.extensions.primal_dual_rho import PrimalDualRho
         vanilla.extension_adder(hub_dict, PrimalDualRho)
         hub_dict['opt_kwargs']['options']['primal_dual_rho_options'] = {
                 'verbose': cfg.verbose,
@@ -473,8 +478,6 @@ def _write_scenarios(module,
                      scenario_creator_kwargs,
                      scenario_denouement,
                      comm):
-    import mpisppy.utils.pickle_bundle as pickle_bundle
-    import shutil
     assert hasattr(cfg, "num_scens")
     ScenCount = cfg.num_scens
 
@@ -504,7 +507,6 @@ def _write_scenarios(module,
 
 #==========
 def _read_pickled_scenario(sname, cfg):
-    import mpisppy.utils.pickle_bundle as pickle_bundle
     fname = os.path.join(cfg.unpickle_scenarios_dir, sname+".pkl")
     scen = pickle_bundle.dill_unpickle(fname)
     return scen
@@ -516,8 +518,6 @@ def _write_bundles(module,
                    scenario_creator,
                    scenario_creator_kwargs,
                    comm):
-    import mpisppy.utils.pickle_bundle as pickle_bundle
-    import shutil
     assert hasattr(cfg, "num_scens")
     ScenCount = cfg.num_scens
     bsize = int(cfg.scenarios_per_bundle)
@@ -668,7 +668,6 @@ def _proper_bundles(cfg):
 
     bundle_wrapper = None  # the default
     if _proper_bundles(cfg):
-        import mpisppy.utils.proper_bundler as proper_bundler
         bundle_wrapper = proper_bundler.ProperBundler(module)
         bundle_wrapper.set_bunBFs(cfg)
         scenario_creator = bundle_wrapper.scenario_creator
@@ -694,6 +693,7 @@ def _proper_bundles(cfg):
                        scenario_creator_kwargs,
                        global_comm)
     elif cfg.pickle_scenarios_dir is not None:
+        import mpisppy.utils.pickle_bundle as pickle_bundle
         global_comm = MPI.COMM_WORLD
         _write_scenarios(module,
                          cfg,