diff --git a/job/__init__.py b/job/__init__.py deleted file mode 100644 index a8d0874..0000000 --- a/job/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .sobo import sobo_job \ No newline at end of file diff --git a/job/sobo.py b/job/sobo.py deleted file mode 100644 index 6ea2c64..0000000 --- a/job/sobo.py +++ /dev/null @@ -1,41 +0,0 @@ -import os -import bo -import ptycho - -def sobo_job(config): - - print("Hello") - # result_dir = config['io']['result_dir'] - # os.makedirs(result_dir, exist_ok=True) - - # randombo = bo.RandomBOEngine(config) - - # bo_txt = os.path.join(result_dir, "bo.txt") - # with open(bo_txt, "w") as f: - # f.write(f" iter\tmetric\t{"\t".join([p[:7] for p in randombo.params])}\n") - - # for j in range(J): - # print(f"RANDOM sampling iteration {j}") - # job_config = randombo.ask() - # ptycho_engine = ptycho.FoldSlicePtychoEngine(job_config) - # ptycho_engine.run(run_id=f"bo-{j:03d}") - # y_value = ptycho_engine._metric - # randombo.tell(job_config, y_value) - # with open(bo_txt, "a") as f: - # p = [f'{job_config['ptycho']['params'][key]:.2f}' for key in randombo.params] - # f.write(f"{j: 8d}\t{y_value:.4f}\t{"\t".join(p)}\n") - - - # sobo = bo.SingleObjectiveBOEngine(config) - # sobo.train_x = randombo.train_x - # sobo.train_y = randombo.train_y - # for j in range(J, J + config['bo']['max_iterations'] + 1): - # print(f"SOBO sampling iteration {j}") - # job_config = sobo.ask() - # ptycho_engine = ptycho.FoldSlicePtychoEngine(job_config) - # ptycho_engine.run(run_id=f"bo-{j:03d}") - # y_value = ptycho_engine._metric - # sobo.tell(job_config, y_value) - # with open(bo_txt, "a") as f: - # p = [f'{job_config['ptycho']['params'][key]:.2f}' for key in sobo.params] - # f.write(f"{j: 8d}\t{y_value:.4f}\t{"\t".join(p)}\n") \ No newline at end of file diff --git a/pipelines/__init__.py b/pipelines/__init__.py new file mode 100644 index 0000000..cfde87d --- /dev/null +++ b/pipelines/__init__.py @@ -0,0 +1 @@ +from .sobo import sobo_pipeline \ No newline at end of file diff --git a/pipelines/sobo.py b/pipelines/sobo.py new file mode 100644 index 0000000..f018658 --- /dev/null +++ b/pipelines/sobo.py @@ -0,0 +1,47 @@ +import os +import bo +import ptycho + +def sobo_pipeline(config): + + result_dir = config['io']['result_dir'] + os.makedirs(result_dir, exist_ok=True) + + RANDOM_ITERS = config['job'].get('random_iters', 0) + SOBO_ITERS = config['job'].get('sobo_iters') + METRIC = config['bo']['metric'] + PTYCHOENGINE = ptycho.engines[config['ptycho']['engine']] + + + randombo = bo.RandomBOEngine(config) + + bo_txt = os.path.join(result_dir, "bo.txt") + with open(bo_txt, "w") as f: + f.write(f" iter\tmetric\t{"\t".join([p[:7] for p in randombo.params])}\n") + + for j in range(RANDOM_ITERS): + print(f"RANDOM sampling; iteration {j}") + job_config = randombo.ask() + ptycho_engine = PTYCHOENGINE(job_config) + ptycho_engine.run(run_id=f"bo-{j:03d}") + y_value = ptycho_engine.metric(METRIC) + randombo.tell(job_config, y_value) + with open(bo_txt, "a") as f: + p = [f'{job_config['ptycho']['params'][key]:.2f}' for key in randombo.params] + f.write(f"{j: 8d}\t{y_value:.4f}\t{"\t".join(p)}\n") + + + sobo = bo.SingleObjectiveBOEngine(config) + sobo.train_x = randombo.train_x + sobo.train_y = randombo.train_y + + for j in range(SOBO_ITERS): + print(f"SOBO sampling; iteration {RANDOM_ITERS + j}") + job_config = sobo.ask() + ptycho_engine = PTYCHOENGINE(job_config) + ptycho_engine.run(run_id=f"bo-{j:03d}") + y_value = ptycho_engine.metric(METRIC) + sobo.tell(job_config, y_value) + with open(bo_txt, "a") as f: + p = [f'{job_config['ptycho']['params'][key]:.2f}' for key in sobo.params] + f.write(f"{j: 8d}\t{y_value:.4f}\t{"\t".join(p)}\n")