Skip to content

Commit 9fd4482

Browse files
committed
fix verbosity
1 parent 32a2c8e commit 9fd4482

4 files changed

Lines changed: 23 additions & 36 deletions

File tree

src/hyperactive/composite_optimizer.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,28 @@ def run(
2121
n_processes: Union[str, int] = "auto",
2222
verbosity: list = ["progress_bar", "print_results", "print_times"],
2323
):
24-
self.verbosity = verbosity
24+
if not verbosity:
25+
verbosity = []
2526

2627
self.collected_searches = []
2728
for optimizer in self.optimizers:
2829
self.collected_searches += optimizer.searches
2930

3031
for nth_process, search in enumerate(self.collected_searches):
31-
search.pass_args(max_time, nth_process)
32+
search.pass_args(max_time, nth_process, verbosity)
3233

3334
self.results_list = run_search(
3435
self.collected_searches, distribution, n_processes
3536
)
3637

3738
self.results_ = Results(self.results_list, self.collected_searches)
3839

39-
self._print_info()
40+
self._print_info(verbosity)
4041

41-
def _print_info(self):
42-
print_res = PrintResults(self.collected_searches, self.verbosity)
42+
def _print_info(self, verbosity):
43+
print_res = PrintResults(self.collected_searches, verbosity)
4344

44-
if self.verbosity:
45+
if verbosity:
4546
for _ in range(len(self.collected_searches)):
4647
print("")
4748

src/hyperactive/optimizers/_optimizer_api.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ def add_search(
5656
n_iter: int,
5757
search_id=None,
5858
n_jobs: int = 1,
59-
verbosity: list = ["progress_bar", "print_results", "print_times"],
6059
initialize: Dict[str, int] = {"grid": 4, "random": 2, "vertices": 4},
6160
constraints: List[callable] = None,
6261
pass_through: Dict = None,
@@ -97,7 +96,6 @@ def add_search(
9796

9897
search_id = self._default_search_id(search_id, experiment.objective_function)
9998
s_space = SearchSpace(search_space)
100-
self.verbosity = verbosity
10199

102100
n_jobs = mp.cpu_count() if n_jobs == -1 else n_jobs
103101

@@ -115,7 +113,6 @@ def add_search(
115113
random_state=random_state,
116114
memory=memory,
117115
memory_warm_start=memory_warm_start,
118-
verbosity=verbosity,
119116
)
120117
self.searches.append(search)
121118

@@ -131,9 +128,10 @@ def run(
131128
max_time=None,
132129
distribution: str = "multiprocessing",
133130
n_processes: Union[str, int] = "auto",
131+
verbosity: list = ["progress_bar", "print_results", "print_times"],
134132
):
135133
self.comp_opt = CompositeOptimizer(self)
136-
self.comp_opt.run(max_time, distribution, n_processes, self.verbosity)
134+
self.comp_opt.run(max_time, distribution, n_processes, verbosity)
137135

138136
def best_para(self, experiment):
139137
"""

src/hyperactive/optimizers/backend_stuff/distribution.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,21 @@ def multiprocessing_wrapper(process_func, process_infos, n_processes):
2222

2323
process_infos = tuple(process_infos)
2424

25-
with mp.Pool(
26-
n_processes, initializer=initializer, initargs=initargs
27-
) as pool:
25+
print("\n process_infos ", process_infos)
26+
27+
with mp.Pool(n_processes, initializer=initializer, initargs=initargs) as pool:
2828
return pool.map(process_func, process_infos)
2929

3030

3131
def pathos_wrapper(process_func, search_processes_paras, n_processes):
3232
import pathos.multiprocessing as pmp
3333

34-
with pmp.Pool(
35-
n_processes, initializer=initializer, initargs=initargs
36-
) as pool:
34+
with pmp.Pool(n_processes, initializer=initializer, initargs=initargs) as pool:
3735
return pool.map(process_func, search_processes_paras)
3836

3937

4038
def joblib_wrapper(process_func, search_processes_paras, n_processes):
4139
from joblib import Parallel, delayed
4240

43-
jobs = [
44-
delayed(process_func)(*info_dict)
45-
for info_dict in search_processes_paras
46-
]
41+
jobs = [delayed(process_func)(*info_dict) for info_dict in search_processes_paras]
4742
return Parallel(n_jobs=n_processes)(jobs)

src/hyperactive/optimizers/search.py

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ def setup(
3030
random_state,
3131
memory,
3232
memory_warm_start,
33-
verbosity,
3433
):
3534
self.experiment = experiment
3635
self.s_space = s_space
@@ -44,17 +43,16 @@ def setup(
4443
self.random_state = random_state
4544
self.memory = memory
4645
self.memory_warm_start = memory_warm_start
47-
self.verbosity = verbosity
4846

49-
if "progress_bar" in self.verbosity:
47+
def pass_args(self, max_time, nth_process, verbosity):
48+
self.max_time = max_time
49+
self.nth_process = nth_process
50+
51+
if "progress_bar" in verbosity:
5052
self.verbosity = ["progress_bar"]
5153
else:
5254
self.verbosity = []
5355

54-
def pass_args(self, max_time, nth_process):
55-
self.max_time = max_time
56-
self.nth_process = nth_process
57-
5856
def convert_results2hyper(self):
5957
self.eval_times = sum(self.gfo_optimizer.eval_times)
6058
self.iter_times = sum(self.gfo_optimizer.iter_times)
@@ -86,15 +84,12 @@ def _setup_process(self):
8684

8785
# conv warm start for smbo from values into positions
8886
if "warm_start_smbo" in self.opt_params:
89-
self.opt_params["warm_start_smbo"] = (
90-
self.hg_conv.conv_memory_warm_start(
91-
self.opt_params["warm_start_smbo"]
92-
)
87+
self.opt_params["warm_start_smbo"] = self.hg_conv.conv_memory_warm_start(
88+
self.opt_params["warm_start_smbo"]
9389
)
9490

9591
gfo_constraints = [
96-
Constraint(constraint, self.s_space)
97-
for constraint in self.constraints
92+
Constraint(constraint, self.s_space) for constraint in self.constraints
9893
]
9994

10095
self.gfo_optimizer = self.optimizer_class(
@@ -116,9 +111,7 @@ def _search(self, p_bar):
116111
)
117112
gfo_wrapper_model.pass_through = self.pass_through
118113

119-
memory_warm_start = self.hg_conv.conv_memory_warm_start(
120-
self.memory_warm_start
121-
)
114+
memory_warm_start = self.hg_conv.conv_memory_warm_start(self.memory_warm_start)
122115

123116
gfo_objective_function = gfo_wrapper_model(self.s_space())
124117

0 commit comments

Comments
 (0)