diff --git a/bo/__init__.py b/bo/__init__.py deleted file mode 100644 index 8e460ae..0000000 --- a/bo/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .base import BOEngine -from .random import RandomBOEngine -from .sobo import SingleObjectiveBOEngine diff --git a/pipelines/batched_sobo.py b/pipelines/batched_sobo.py index 289b3d3..3e3fbea 100644 --- a/pipelines/batched_sobo.py +++ b/pipelines/batched_sobo.py @@ -2,7 +2,7 @@ import os import traceback import multiprocessing as mp -import bo +import samplers import ptycho def run_ptycho_worker(worker_id, gpu_token, job_config, metric, run_id, result_queue): @@ -71,7 +71,7 @@ def sobo_pipeline(config): ############################ RANDOM SAMPLING ############################### - randombo = bo.RandomBOEngine(config) + randombo = samplers.RandomSampler(config) for j in range(RANDOM_ITERS): print(f"RANDOM sampling; iteration {j}") @@ -81,7 +81,7 @@ def sobo_pipeline(config): randombo.tell(job_config, y_value) ############################ SOBO SAMPLING ############################### - sobo = bo.SingleObjectiveBOEngine(config) + sobo = samplers.SOBOSampler(config) sobo.train_x = randombo.train_x sobo.train_y = randombo.train_y diff --git a/samplers/__init__.py b/samplers/__init__.py new file mode 100644 index 0000000..00e2b69 --- /dev/null +++ b/samplers/__init__.py @@ -0,0 +1,8 @@ +from .base import Sampler +from .random import RandomSampler +from .sobo import SOBOSampler + +samplers = { + 'sobo': SOBOSampler, + 'random': RandomSampler, +} \ No newline at end of file diff --git a/bo/base.py b/samplers/base.py similarity index 99% rename from bo/base.py rename to samplers/base.py index 1d03f2d..5273254 100644 --- a/bo/base.py +++ b/samplers/base.py @@ -3,7 +3,7 @@ import os import numpy as np -class BOEngine(ABC): +class Sampler(ABC): def __init__(self, config): self.config = config self.params = [key for key, spec in config["bo"]["params"].items() if spec is not None] diff --git a/bo/random.py b/samplers/random.py similarity index 92% rename from bo/random.py rename to samplers/random.py index 0e2ab08..b7be466 100644 --- a/bo/random.py +++ b/samplers/random.py @@ -1,9 +1,9 @@ import copy import numpy as np -from bo.base import BOEngine +from samplers.base import Sampler -class RandomBOEngine(BOEngine): +class RandomSampler(Sampler): def __init__(self, config): super().__init__(config) diff --git a/bo/sobo.py b/samplers/sobo.py similarity index 98% rename from bo/sobo.py rename to samplers/sobo.py index 6a9a33b..d9aabc5 100644 --- a/bo/sobo.py +++ b/samplers/sobo.py @@ -15,10 +15,10 @@ from botorch.sampling.normal import SobolQMCNormalSampler from botorch.utils.rounding import approximate_round -from bo.base import BOEngine +from samplers.base import Sampler -class SingleObjectiveBOEngine(BOEngine): +class SOBOSampler(Sampler): def __init__(self, config): super().__init__(config) self.acquisition = config['bo']['acquisition']