rename async opt file, remove old controller constructor from path

madeline-scyphers · Sep 8, 2023 · 74523b8 · 74523b8 · github-actions · Sep 8, 2023
1 parent be98afc
commit 74523b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/boa/async-opt.py → boa/_async_opt.py b/boa/async-opt.py → boa/_async_opt.py
@@ -1,3 +1,4 @@
+# weird file name with dash in it because CLI conventions
 import dataclasses
 import os
 import sys

diff --git a/boa/controller.py b/boa/controller.py
@@ -23,7 +23,6 @@
 from boa.logger import get_logger
 from boa.runner import WrappedJobRunner
 from boa.scheduler import Scheduler
-from boa.storage import scheduler_from_json_file
 from boa.utils import yaml_dump
 from boa.wrappers.base_wrapper import BaseWrapper
 from boa.wrappers.wrapper_utils import get_dt_now_as_str, initialize_wrapper
@@ -89,20 +88,6 @@ def __init__(
         self.experiment: Experiment = None
         self.scheduler: Scheduler = None
 
-    @classmethod
-    def from_scheduler_path(cls, scheduler_path, working_dir=None, **kwargs):
-        scheduler = scheduler_from_json_file(scheduler_path, **kwargs)
-        wrapper = scheduler.experiment.runner.wrapper
-
-        inst = cls(wrapper=wrapper, working_dir=working_dir, **kwargs)
-        inst.logger.info(f"Resuming optimization from scheduler path: {scheduler_path}")
-        if inst.wrapper.config_path:
-            inst.logger.info(f"Config path: {inst.wrapper.config_path}")
-
-        inst.scheduler = scheduler
-        inst.experiment = scheduler.experiment
-        return inst
-
     @classmethod
     def from_scheduler(cls, scheduler, working_dir=None, **kwargs):
         wrapper = scheduler.experiment.runner.wrapper

diff --git a/tests/integration_tests/test_async-opt.py b/tests/integration_tests/test_async-opt.py
@@ -0,0 +1,5 @@
+from tests.conftest import TEST_CONFIG_DIR
+
+
+def test_async_with_no_gen_strat():
+    config_path = TEST_CONFIG_DIR / "test_config_pass_through_metric.yaml"
File	Stmts	Miss	Cover	Missing
__main__.py	90	4	95%	134, 165, 210, 218
_async_opt.py	90	90	0%	2–5, 7–11, 13–17, 20–21, 27, 34, 40, 61, 69–79, 81–84, 86–89, 92–93, 96–98, 100–101, 106–107, 109, 113–114, 117–118, 120–124, 139–140, 143–147, 149–156, 172–174, 180–181, 183–184, 186, 192–198, 201–202
ax_instantiation_utils.py	47	1	97%	123
controller.py	71	2	97%	73, 166
definitions.py	8	0	100%
instantiation_base.py	40	1	97%	39
metaclasses.py	72	3	95%	50–51, 57
plot.py	12	12	0%	15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py	141	28	80%	51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py	8	0	100%
runner.py	45	4	91%	42, 76–78
scheduler.py	78	14	82%	38, 125–128, 135–136, 150, 157–158, 165–166, 261–262
storage.py	124	17	86%	80, 83, 115–117, 177, 195, 273–281, 300
template.py	20	0	100%
utils.py	90	20	77%	175, 189–190, 215, 225–229, 231–233, 235, 237, 241–246
config
__main__.py	0	0	100%
config.py	307	38	87%	33, 211, 217, 221, 223–224, 226, 282, 292, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824, 906–907, 909
converters.py	75	13	82%	14, 22, 25, 41, 46–48, 51–52, 65, 67, 71, 79
metrics
metric_funcs.py	34	4	88%	58, 80–81, 83
metrics.py	101	15	85%	127, 304–305, 310–311, 314, 320, 331–333, 337–341
modular_metric.py	120	20	83%	38–41, 43–50, 64, 131, 142, 184, 235–236, 255–256
synthetic_funcs.py	39	4	89%	31, 35, 58, 65
scripts
moo.py	30	1	96%	44
run_branin.py	34	1	97%	56
script_wrappers.py	31	2	93%	57–58
synth_func_cli.py	21	0	100%
wrappers
base_wrapper.py	195	26	86%	63–64, 89–92, 94, 102, 110, 115, 147, 156, 215–216, 218, 269, 330, 402, 416, 589, 591–594, 602, 612
script_wrapper.py	83	8	90%	191, 202–203, 270, 313, 319, 324, 329
synthetic_wrapper.py	16	16	0%	1, 3, 5, 7, 10–13, 15–16, 18–19, 21, 27–28, 30
wrapper_utils.py	132	9	93%	147–148, 228, 277, 385–387, 395–396
TOTAL	2154	353	83%