From f5f8b9551a15cf7a731986e7ff0ae957e83ed7f9 Mon Sep 17 00:00:00 2001 From: "C. Benjamins" <75323339+benjamc@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:54:20 +0200 Subject: [PATCH] v0.1.1 (#151) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: typo * build: update scripts * ignore python * docs: update install instructions * docs: update install instructions * build: fix makefile typo * docs: fix typos * build: updates for hpobench installation * build: updates for hpobench installation * Add logo to README.md + docs; adapt docs theme colors to logo * Actually add the logo file * fix: changelog entry for initial version * add running data to readme (#139) * add running data to readme * Update README.md --------- Co-authored-by: benjamc * Update plotting * Update filepath * fix(check_missing.py): Fix criterion for max trials (#150) For MF, max trials can be a mu above integer value specified because of the partial trials. Fix the condition. * Fix HEBO integration (#149) * fix(hebo): Do not increase trial_counter twice Must have been forgotton 😭💀 * Update CHANGELOG.md * Update CHANGELOG.md * Update version number 0.1.0->0.1.1 --------- Co-authored-by: Sarah Krebs Co-authored-by: Helena Graf Co-authored-by: Sarah Segel <30651149+sarah-segel@users.noreply.github.com> Co-authored-by: Difan Deng <33290713+dengdifan@users.noreply.github.com> --- CHANGELOG.md | 8 +++++++- CITATION.cff | 2 +- Makefile | 2 +- carps/benchmarks/hpo_b.py | 2 +- carps/optimizers/hebo.py | 1 - carps/utils/check_missing.py | 2 +- pyproject.toml | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a94d01732..f260a297f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ -# Version 0.1.0 + +# v0.1.1 + +## Bug Fixes +- Fix HEBO integration (#149) + +# v0.1.0 - Initial version of CARP-S. \ No newline at end of file diff --git a/CITATION.cff b/CITATION.cff index 5b24f13ee..30f9afa58 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -10,7 +10,7 @@ url: "https://automl.github.io/CARP-S/main/" repository-code: "https://github.com/automl/CARP-S" -version: "0.1.0" +version: "0.1.1" type: "template" keywords: diff --git a/Makefile b/Makefile index c2143bfdd..bcb56fc44 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SHELL := /bin/bash NAME := CARP-S PACKAGE_NAME := carps -VERSION := 0.1.0 +VERSION := 0.1.1 DIST := dist diff --git a/carps/benchmarks/hpo_b.py b/carps/benchmarks/hpo_b.py index f6b6ba40d..f0eddf5b3 100644 --- a/carps/benchmarks/hpo_b.py +++ b/carps/benchmarks/hpo_b.py @@ -234,7 +234,7 @@ def __init__( if not surrogates_file.is_file(): raise RuntimeError( "It seems that the surrogate files have not been downloaded. Please run " - "'bash container_recipes/benchmarks/hpob/download_data.sh' to download the " + "'bash container_recipes/benchmarks/HPOB/download_data.sh' to download the " "surrogates." ) with open(str(surrogates_file)) as f: diff --git a/carps/optimizers/hebo.py b/carps/optimizers/hebo.py index 6726a54e9..9d9c69dd6 100644 --- a/carps/optimizers/hebo.py +++ b/carps/optimizers/hebo.py @@ -271,7 +271,6 @@ def tell(self, trial_info: TrialInfo, trial_value: TrialValue) -> None: cost = trial_value.cost suggestion = self.convert_from_trial(trial_info=trial_info) - self.trial_counter += 1 cost = np.asarray([cost]) if isinstance(cost, abc.Sequence) else np.asarray(cost) self._solver.observe(suggestion, np.asarray([cost])) diff --git a/carps/utils/check_missing.py b/carps/utils/check_missing.py index 23064e968..957179431 100644 --- a/carps/utils/check_missing.py +++ b/carps/utils/check_missing.py @@ -30,7 +30,7 @@ def get_experiment_status(path: Path) -> dict: if trial_logs_fn.is_file(): trial_logs = read_jsonl_content(str(trial_logs_fn)) n_trials_done = trial_logs["n_trials"].max() - status = RunStatus.COMPLETED if n_trials == n_trials_done else RunStatus.TRUNCATED + status = RunStatus.COMPLETED if n_trials >= n_trials_done else RunStatus.TRUNCATED overrides = OmegaConf.load(path.parent / "overrides.yaml") # TODO maybe filter cluster diff --git a/pyproject.toml b/pyproject.toml index 9cbe6f5d1..67759bddd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "carps" -version = "0.1.0" +version = "0.1.1" dependencies = [ "autorank", "ConfigSpace",