From 57719e1b39fda26f569d437b2ac42de56b488b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Sat, 17 May 2025 09:58:07 +0200 Subject: [PATCH 1/2] remove tqdm --- pyproject.toml | 1 - src/hyperactive/distribution.py | 11 +++-------- src/hyperactive/process.py | 14 ++------------ tests/test_distribution.py | 14 -------------- tests/test_optimizers/test_gfo_wrapper.py | 3 +-- 5 files changed, 6 insertions(+), 37 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 33071016..069ce040 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,6 @@ classifiers=[ dependencies = [ "numpy >=1.18.1, <3.0.0", - "tqdm >=4.48.0, <5.0.0", "pandas <3.0.0", "gradient-free-optimizers >=1.2.4, <2.0.0", ] diff --git a/src/hyperactive/distribution.py b/src/hyperactive/distribution.py index eea37214..5ebbe25d 100644 --- a/src/hyperactive/distribution.py +++ b/src/hyperactive/distribution.py @@ -3,14 +3,9 @@ # License: MIT License from sys import platform -from tqdm import tqdm - -if platform.startswith("linux"): - initializer = tqdm.set_lock - initargs = (tqdm.get_lock(),) -else: - initializer = None - initargs = () + +initializer = None +initargs = () def single_process(process_func, process_infos): diff --git a/src/hyperactive/process.py b/src/hyperactive/process.py index f008dc80..5861dd93 100644 --- a/src/hyperactive/process.py +++ b/src/hyperactive/process.py @@ -3,19 +3,9 @@ # License: MIT License -from tqdm import tqdm - - def _process_(nth_process, optimizer): - if "progress_bar" in optimizer.verbosity: - p_bar = tqdm( - position=nth_process, - total=optimizer.n_iter, - ascii=" ─", - colour="Yellow", - ) - else: - p_bar = None + + p_bar = None optimizer.search(nth_process, p_bar) diff --git a/tests/test_distribution.py b/tests/test_distribution.py index 5b4de7ed..59b5cce8 100644 --- a/tests/test_distribution.py +++ b/tests/test_distribution.py @@ -1,5 +1,4 @@ import numpy as np -from tqdm import tqdm from hyperactive import Hyperactive @@ -77,19 +76,6 @@ def test_multiprocessing_0(): hyper.run() -def test_multiprocessing_1(): - hyper = Hyperactive( - distribution={ - "multiprocessing": { - "initializer": tqdm.set_lock, - "initargs": (tqdm.get_lock(),), - } - }, - ) - hyper.add_search(objective_function, search_space, n_iter=15, n_jobs=2) - hyper.run() - - def test_joblib_0(): hyper = Hyperactive(distribution="joblib") hyper.add_search(objective_function, search_space, n_iter=15, n_jobs=2) diff --git a/tests/test_optimizers/test_gfo_wrapper.py b/tests/test_optimizers/test_gfo_wrapper.py index 408ce3b5..7ffc0604 100644 --- a/tests/test_optimizers/test_gfo_wrapper.py +++ b/tests/test_optimizers/test_gfo_wrapper.py @@ -1,7 +1,6 @@ import pytest import numpy as np -from tqdm import tqdm from ._parametrize import optimizers from hyperactive.search_space import SearchSpace @@ -99,6 +98,6 @@ def test_gfo_opt_wrapper_0(Optimizer, search_space, objective): verbosity=verbosity, ) opt.max_time = None - opt.search(nth_process=0, p_bar=tqdm(total=n_iter)) + opt.search(nth_process=0) assert opt.best_score == objective_function(opt.best_para) From ef2eb7b0eb69f471b220f4e12f105706cb7b62fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Sat, 17 May 2025 10:16:34 +0200 Subject: [PATCH 2/2] make p_bar optional --- src/hyperactive/optimizers/hyper_optimizer.py | 2 +- src/hyperactive/optimizers/strategies/optimization_strategy.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hyperactive/optimizers/hyper_optimizer.py b/src/hyperactive/optimizers/hyper_optimizer.py index c7710023..08d5f9c5 100644 --- a/src/hyperactive/optimizers/hyper_optimizer.py +++ b/src/hyperactive/optimizers/hyper_optimizer.py @@ -108,7 +108,7 @@ def _setup_process(self, nth_process): self.conv = self.gfo_optimizer.conv - def search(self, nth_process, p_bar): + def search(self, nth_process, p_bar=None): self._setup_process(nth_process) gfo_wrapper_model = ObjectiveFunction( diff --git a/src/hyperactive/optimizers/strategies/optimization_strategy.py b/src/hyperactive/optimizers/strategies/optimization_strategy.py index 0be4d00e..85626ae7 100644 --- a/src/hyperactive/optimizers/strategies/optimization_strategy.py +++ b/src/hyperactive/optimizers/strategies/optimization_strategy.py @@ -61,7 +61,7 @@ def max_time(self, value): for optimizer_setup in self.optimizer_setup_l: optimizer_setup["optimizer"].max_time = value - def search(self, nth_process, p_bar): + def search(self, nth_process, p_bar=None): for optimizer_setup in self.optimizer_setup_l: hyper_opt = optimizer_setup["optimizer"] duration = optimizer_setup["duration"]