Skip to content

Commit

Permalink
added exit call to stateless
Browse files Browse the repository at this point in the history
Stateless now return None, parameter_names if it has finished
  • Loading branch information
ErikOrm committed Dec 7, 2023
1 parent 22f9065 commit f480695
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions hypermapper/bo/bo.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def main(settings, black_box_function=None):
)
if default_doe_parameter_array.shape[0] > 0:
if settings["hypermapper_mode"]["mode"] == "stateless":
return default_doe_parameter_array, param_space.parameter_names
return default_doe_parameter_array.numpy(), param_space.parameter_names
else:
default_doe_data_array = param_space.run_configurations(
default_doe_parameter_array,
Expand Down Expand Up @@ -157,7 +157,7 @@ def main(settings, black_box_function=None):
allow_repetitions=False,
)
if settings["hypermapper_mode"]["mode"] == "stateless":
return tmp_parameter_array, param_space.parameter_names
return tmp_parameter_array.numpy(), param_space.parameter_names
else:
tmp_data_array = param_space.run_configurations(
tmp_parameter_array, beginning_of_time, settings, black_box_function
Expand Down Expand Up @@ -319,7 +319,7 @@ def main(settings, black_box_function=None):
##################
black_box_function_t0 = time.time()
if settings["hypermapper_mode"]["mode"] == "stateless":
return best_configurations, param_space.parameter_names
return best_configurations.numpy(), param_space.parameter_names
else:
new_data_array = param_space.run_configurations(
best_configurations,
Expand Down Expand Up @@ -389,4 +389,7 @@ def main(settings, black_box_function=None):
("Total script time %10.2f sec\n" % (time.time() - start_time))
)

if settings["hypermapper_mode"]["mode"] == "stateless":
return None, param_space.parameter_names

return data_array
2 changes: 1 addition & 1 deletion hypermapper/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def optimize(

out = bo.main(settings, black_box_function=black_box_function)
if isinstance(out, tuple):
return out[0].numpy(), out[1] # configurations and parameter names
return out # configurations and parameter names
else:
data_array = out

Expand Down

0 comments on commit f480695

Please sign in to comment.