Merge 86fcfc5 into 3a13f45

libensemble/gen_funcs/__init__.py

@@ -15,5 +15,5 @@ def rc(**kargs):
         setattr(rc, key, value)
 
 
-rc.aposmm_optimizer = True
+rc.aposmm_optimizer = None
 __import__('sys').modules[__name__ + '.rc'] = rc

libensemble/gen_funcs/aposmm.py

@@ -11,16 +11,25 @@
 import traceback
 import numpy as np
 from scipy.spatial.distance import cdist, pdist, squareform
-from scipy import optimize as scipy_optimize
-
-from mpi4py import MPI
-from petsc4py import PETSc
-
 from numpy.lib.recfunctions import merge_arrays
-
 from math import log, gamma, pi, sqrt
 
-import nlopt
+import libensemble.gen_funcs
+optimizer = libensemble.gen_funcs.rc.aposmm_optimizer
+if optimizer == 'petsc':
+    from mpi4py import MPI
+    from petsc4py import PETSc
+elif optimizer == 'nlopt':
+    import nlopt
+elif optimizer == 'scipy':
+    from scipy import optimize as scipy_optimize
+else:
+    if optimizer is not None:
+        print('APOSMM Warning: {} optimizer not recognized. Loading all')
+    from mpi4py import MPI
+    from petsc4py import PETSc
+    import nlopt
+    from scipy import optimize as scipy_optimize
 
 
 class APOSMMException(Exception):

libensemble/gen_funcs/persistent_aposmm.py

@@ -11,18 +11,20 @@
 
 import numpy as np
 from scipy.spatial.distance import cdist
-from scipy import optimize as sp_opt
 from math import log, gamma, pi, sqrt
 
 import libensemble.gen_funcs
 optimizer = libensemble.gen_funcs.rc.aposmm_optimizer
 if optimizer == 'petsc':
+    from mpi4py import MPI
     from petsc4py import PETSc
 elif optimizer == 'nlopt':
     import nlopt
 elif optimizer == 'dfols':
     import dfols
-elif optimizer in ['scipy', 'external']:
+elif optimizer == 'scipy':
+    from scipy import optimize as sp_opt
+elif optimizer == 'external':
     pass
 else:
     if optimizer is not None:
@@ -31,13 +33,12 @@
     from petsc4py import PETSc
     import nlopt
     import dfols
-
+    from scipy import optimize as sp_opt
 
 from libensemble.message_numbers import STOP_TAG, PERSIS_STOP, FINISHED_PERSISTENT_GEN_TAG
 from libensemble.tools.gen_support import send_mgr_worker_msg
 from libensemble.tools.gen_support import get_mgr_worker_msg
 
-
 from multiprocessing import Event, Process, Queue