8000 Add prior study setters into benchmark runners. by copybara-service[bot] · Pull Request #984 · google/vizier · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
41 changes: 41 additions & 0 deletions vizier/_src/benchmarks/runners/benchmark_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,47 @@ def run(self, state: benchmark_state.BenchmarkState) -> None:
state.experimenter.evaluate(evaluated_trials)


@attr.define
class EvaluateAndAddPriorStudy(BenchmarkSubroutine):
"""Evaluate a fixed number of Active Trials as Completed Trials."""

# Runner to use to mutate study.
benchmark_runner: BenchmarkSubroutine = attr.field(
kw_only=True,
validator=attr.validators.instance_of(BenchmarkSubroutine),
)
# State factory.
benchmark_state_factory: benchmark_state.BenchmarkStateFactory = attr.field(
kw_only=True,
validator=attr.validators.instance_of(
benchmark_state.BenchmarkStateFactory
),
)
study_guid: Optional[str] = attr.field(
kw_only=True,
default=None,
validator=attr.validators.optional(attr.validators.instance_of(str)),
)
seed: Optional[int] = attr.field(
kw_only=True,
default=None,
validator=attr.validators.optional(attr.validators.instance_of(int)),
)

def run(self, state: benchmark_state.BenchmarkState) -> None:
prior_state = self.benchmark_state_factory(seed=self.seed)
self.benchmark_runner.run(prior_state)
prior_problem = prior_state.algorithm.supporter.GetStudyConfig()
prior_trials = prior_state.algorithm.supporter.GetTrials()
prior_study = vz.ProblemAndTrials(
problem=prior_problem, trials=prior_trials
)

state.algorithm.supporter.SetPriorStudy(
study=prior_study, study_guid=self.study_guid
)


@attr.define
class BenchmarkRunner(BenchmarkSubroutine):
"""Run a sequence of subroutines, all repeated for a few iterations."""
Expand Down
48 changes: 36 additions & 12 deletions vizier/_src/benchmarks/runners/benchmark_runner_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,6 @@ def test_fill_active_trials(self):
)

def test_benchmark_run_from_exptr_factory(self):
dim = 10
exptr_factory = experimenter_factory.BBOBExperimenterFactory('Sphere', dim)

def _designer_factory(config: vz.ProblemStatement, seed: int):
return random.RandomDesigner(config.search_space, seed=seed)

benchmark_state_factory = (
benchmark_state.ExperimenterDesignerBenchmarkStateFactory(
designer_factory=_designer_factory,
experimenter_factory=exptr_factory,
)
)
benchmark_state_factory = _get_designer_benchmark_state_factory()
bench_state = benchmark_state_factory(seed=5)
runner = benchmark_runner.BenchmarkRunner(
Expand All @@ -166,6 +154,42 @@ def _designer_factory(config: vz.ProblemStatement, seed: int):
for trial in all_trials:
self.assertEqual(trial.status, vz.TrialStatus.COMPLETED)

def test_add_prior(self):
dim = 10
exptr_factory = experimenter_factory.BBOBExperimenterFactory('Discus', dim)

def _designer_factory(config: vz.ProblemStatement, seed: int):
return random.RandomDesigner(config.search_space, seed=seed)

prior_benchmark_state_factory = (
benchmark_state.ExperimenterDesignerBenchmarkStateFactory(
designer_factory=_designer_factory,
experimenter_factory=exptr_factory,
)
)
prior_runner = benchmark_runner.BenchmarkRunner(
benchmark_subroutines=[benchmark_runner.GenerateAndEvaluate(10)],
num_repeats=5,
)
prior_study_guid = 'prior'
runner = benchmark_runner.EvaluateAndAddPriorStudy(
benchmark_runner=prior_runner,
benchmark_state_factory=prior_benchmark_state_factory,
study_guid=prior_study_guid,
)

benchmark_state_factory = _get_designer_benchmark_state_factory()
bench_state = benchmark_state_factory(seed=5)
runner.run(bench_state)
self.assertEmpty(bench_state.algorithm.supporter.GetTrials())

prior_trials = bench_state.algorithm.supporter.GetTrials(
study_guid=prior_study_guid
)
self.assertLen(prior_trials, 50)
for trial in prior_trials:
self.assertEqual(trial.status, vz.TrialStatus.COMPLETED)


if __name__ == '__main__':
absltest.main()
18 changes: 9 additions & 9 deletions vizier/_src/pythia/local_policy_supporters.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ def study_descriptor(self) -> vz.StudyDescriptor:
max_trial_id=max(self._trials.keys()) if self._trials else 0,
)

def _check_study_guid(self, study_guid: Optional[str]) -> None:
if study_guid is not None and self.study_guid != study_guid:
raise ValueError('InRamPolicySupporter does not support accessing '
'other studies than the current one, which has '
f'guid="{self.study_guid}": guid="{study_guid}"')

def GetStudyConfig(self, study_guid: str) -> vz.ProblemStatement:
self._check_study_guid(study_guid)
return self.study_config
def GetStudyConfig(
self, study_guid: Optional[str] = None
) -> vz.ProblemStatement:
if study_guid is None or study_guid == self.study_guid:
return self.study_config
elif study_guid in self.prior_studies:
return self.prior_studies[study_guid].problem
else:
raise KeyError(f'Study does not exist in InRamSupporter: {study_guid}')

def GetTrials(
self,
Expand Down
0