Testing new alloc_f capabilities

Libensemble · Nov 16, 2018 · efa0cf0 · efa0cf0
1 parent cdc281a
commit efa0cf0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/libensemble/tests/regression_tests/test_chwirut_aposmm_one_residual_at_a_time.py b/libensemble/tests/regression_tests/test_chwirut_aposmm_one_residual_at_a_time.py
@@ -20,10 +20,10 @@
 from libensemble.sim_funcs.chwirut1 import chwirut_eval
 
 # Import gen_func
-from libensemble.gen_funcs.aposmm import aposmm_logic, queue_update_function
+from libensemble.gen_funcs.aposmm import aposmm_logic
 
 # Import alloc_func
-from libensemble.alloc_funcs.fast_alloc_to_aposmm import give_sim_work_first as alloc_f
+from libensemble.alloc_funcs.fast_alloc_and_pausing import give_sim_work_first as alloc_f
 
 script_name = os.path.splitext(os.path.basename(__file__))[0]
 
@@ -75,20 +75,23 @@
              'combine_component_func': lambda x: np.sum(np.power(x,2)),
              'num_active_gens': 1,
              'batch_mode': True,
-             'stop_on_NaNs': True,
-             'stop_partial_fvec_eval': True,
              }
 
 np.random.RandomState(0)
 gen_specs['sample_points'] = np.random.uniform(0,1,(max_sim_budget,n))*(gen_specs['ub']-gen_specs['lb'])+gen_specs['lb']
 
 exit_criteria = {'sim_max': max_sim_budget, # must be provided
                   }
-alloc_specs = {'out':[('allocated',bool)], 'alloc_f':alloc_f}
 
-libE_specs = {'queue_update_function': queue_update_function}
+alloc_specs = {'out':[('allocated',bool)], 
+               'alloc_f':alloc_f,
+               'stop_on_NaNs': True,
+               'stop_partial_fvec_eval': True,
+               }
+
 np.random.seed(1)
-persis_info = {'next_to_give':0}
+persis_info = {}
+persis_info['need_to_give'] = set()
 persis_info['total_gen_calls'] = 0
 persis_info['complete'] = set()
 persis_info['has_nan'] = set()
@@ -104,7 +107,7 @@
                   'total_runs': 0,
                   'rand_stream': np.random.RandomState(1)}
 # Perform the run
-H, persis_info, flag = libE(sim_specs, gen_specs, exit_criteria, persis_info, alloc_specs, libE_specs)
+H, persis_info, flag = libE(sim_specs, gen_specs, exit_criteria, persis_info, alloc_specs)
 
 if MPI.COMM_WORLD.Get_rank() == 0:
     assert len(H) >= max_sim_budget

diff --git a/libensemble/tests/regression_tests/test_chwirut_uniform_sampling_one_residual_at_a_time.py b/libensemble/tests/regression_tests/test_chwirut_uniform_sampling_one_residual_at_a_time.py
@@ -20,11 +20,11 @@
 from libensemble.sim_funcs.chwirut1 import chwirut_eval
 
 # Import gen_func
-from libensemble.gen_funcs.aposmm import aposmm_logic, queue_update_function
+from libensemble.gen_funcs.aposmm import aposmm_logic
 from libensemble.gen_funcs.uniform_sampling import uniform_random_sample_obj_components
 
 # Import alloc_func
-from libensemble.alloc_funcs.fast_alloc_to_aposmm import give_sim_work_first as alloc_f
+from libensemble.alloc_funcs.fast_alloc_and_pausing import give_sim_work_first as alloc_f
 
 script_name = os.path.splitext(os.path.basename(__file__))[0]
 
@@ -58,18 +58,20 @@
              'combine_component_func': lambda x: np.sum(np.power(x,2)),
              'num_active_gens': 1,
              'batch_mode': True,
-             'stop_on_NaNs': True,
-             'stop_partial_fvec_eval': True,
              }
 
 exit_criteria = {'sim_max': max_sim_budget, # must be provided
                   }
 
-alloc_specs = {'out':[('allocated',bool)], 'alloc_f':alloc_f}
+alloc_specs = {'out':[('allocated',bool)], 
+               'alloc_f':alloc_f,
+               'stop_on_NaNs': True,
+               'stop_partial_fvec_eval': True,
+               }
 
-libE_specs = {'queue_update_function': queue_update_function}
 np.random.seed(1)
-persis_info = {'next_to_give':0}
+persis_info = {}
+persis_info['need_to_give'] = set()
 persis_info['total_gen_calls'] = 0
 persis_info['complete'] = set()
 persis_info['has_nan'] = set()
@@ -85,7 +87,7 @@
                   'total_runs': 0,
                   'rand_stream': np.random.RandomState(1)}
 # Perform the run
-H, persis_info, flag = libE(sim_specs, gen_specs, exit_criteria, persis_info, alloc_specs, libE_specs)
+H, persis_info, flag = libE(sim_specs, gen_specs, exit_criteria, persis_info, alloc_specs)
 
 if MPI.COMM_WORLD.Get_rank() == 0:
     assert flag == 0