Merge branch 'feature/alloc_default_adjust' of https://github.com/Lib…

…ensemble/libensemble into feature/alloc_default_adjust
Libensemble · Jan 27, 2020 · 68a81ae · 68a81ae
2 parents 3da31e6 + 184c0f1
commit 68a81ae
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/libensemble/libE.py b/libensemble/libE.py
@@ -27,7 +27,7 @@
 from libensemble.history import History
 from libensemble.libE_manager import manager_main, ManagerException
 from libensemble.libE_worker import worker_main
-from libensemble.alloc_funcs import defaults
+from libensemble.alloc_funcs import defaults as alloc_defaults
 from libensemble.comms.comms import QCommProcess, Timeout
 from libensemble.comms.logs import manager_logging_config
 from libensemble.comms.tcp_mgr import ServerQCommManager, ClientQCommManager
@@ -41,7 +41,7 @@
 
 def libE(sim_specs, gen_specs, exit_criteria,
          persis_info={},
-         alloc_specs=None,
+         alloc_specs={},
          libE_specs={},
          H0=[]):
     """
@@ -111,7 +111,7 @@ def libE(sim_specs, gen_specs, exit_criteria,
 
     # Set default alloc_specs
     if not alloc_specs:
-        alloc_specs = defaults.alloc_specs
+        alloc_specs = alloc_defaults.alloc_specs
 
     # Set default comms
     if 'comms' not in libE_specs: