Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set ignore_code_changes in Consumer too #541

Merged
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
6 changes: 5 additions & 1 deletion src/orion/core/cli/hunt.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,8 @@ def main(args):
if config.get("worker"):
worker_config.update(config.get("worker"))

workon(experiment, **worker_config)
workon(
experiment,
ignore_code_changes=config["branching"].get("ignore_code_changes"),
**worker_config
)
7 changes: 6 additions & 1 deletion src/orion/core/worker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,16 @@ def workon(
heartbeat=None,
user_script_config=None,
interrupt_signal_code=None,
ignore_code_changes=None,
):
"""Try to find solution to the search problem defined in `experiment`."""
producer = Producer(experiment, max_idle_time)
consumer = Consumer(
experiment, heartbeat, user_script_config, interrupt_signal_code
experiment,
heartbeat,
user_script_config,
interrupt_signal_code,
ignore_code_changes,
)

log.debug("##### Init Experiment #####")
Expand Down
8 changes: 8 additions & 0 deletions src/orion/core/worker/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def __init__(
heartbeat=None,
user_script_config=None,
interrupt_signal_code=None,
ignore_code_changes=None,
):
log.debug("Creating Consumer object.")
self.experiment = experiment
Expand All @@ -96,8 +97,12 @@ def __init__(
if interrupt_signal_code is None:
interrupt_signal_code = orion.core.config.worker.interrupt_signal_code

if ignore_code_changes is None:
ignore_code_changes = orion.core.config.evc.ignore_code_changes

self.heartbeat = heartbeat
self.interrupt_signal_code = interrupt_signal_code
self.ignore_code_changes = ignore_code_changes

# Fetch space builder
self.template_builder = OrionCmdlineParser(user_script_config)
Expand Down Expand Up @@ -246,6 +251,9 @@ def _consume(self, trial, workdirname):
return results_file

def _validate_code_version(self):
if self.ignore_code_changes:
return

old_config = self.experiment.configuration
new_config = copy.deepcopy(old_config)
new_config["metadata"]["VCS"] = infer_versioning_metadata(
Expand Down
6 changes: 4 additions & 2 deletions tests/functional/branching/test_branching.py
Original file line number Diff line number Diff line change
Expand Up @@ -854,14 +854,16 @@ def test_new_code_triggers_code_conflict_with_name_only(capsys):
def test_new_code_ignores_code_conflict():
"""Test that a different git hash is *not* generating a child if --ignore-code-changes"""
name = "full_x"
orion.core.cli.main(
# Let it run for 2 trials to test consumer._validate_code_version too.
error_code = orion.core.cli.main(
(
"hunt --init-only -n {name} --ignore-code-changes "
"hunt --worker-max-trials 2 -n {name} --ignore-code-changes "
"--manual-resolution ./black_box.py -x~uniform(-10,10)"
)
.format(name=name)
.split(" ")
)
assert error_code == 0


@pytest.mark.usefixtures("init_full_x", "version_XYZ")
Expand Down
Loading