mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-10 23:10:42 +01:00
exp: re-enable run --run-all with celery queue
This commit is contained in:
committed by
Peter Rowlands (변기호)
parent
4b0c65093a
commit
f26664a569
@@ -168,6 +168,7 @@ class Experiments:
|
||||
if not entries:
|
||||
return results
|
||||
|
||||
# TODO: re-enable --jobs concurrency
|
||||
self.celery_queue.spawn_worker()
|
||||
failed = []
|
||||
for entry in entries:
|
||||
|
||||
@@ -25,7 +25,8 @@ def run(
|
||||
of `repro` for that experiment.
|
||||
"""
|
||||
if run_all:
|
||||
return repo.experiments.reproduce_queued(jobs=jobs)
|
||||
entries = list(repo.experiments.celery_queue.iter_queued())
|
||||
return repo.experiments.reproduce_celery(entries, jobs=jobs)
|
||||
|
||||
if params:
|
||||
params = loads_param_overrides(params)
|
||||
|
||||
@@ -577,16 +577,16 @@ def test_subrepo(tmp_dir, scm, workspace):
|
||||
assert resolve_rev(scm, ref_info.name) == exp
|
||||
|
||||
|
||||
@pytest.mark.xfail(reason="celery tests disabled")
|
||||
def test_queue(tmp_dir, scm, dvc, exp_stage, mocker):
|
||||
def test_run_celery(tmp_dir, scm, dvc, exp_stage, mocker):
|
||||
"""Test running with full (non-pytest-celery) dvc-task queue."""
|
||||
dvc.experiments.run(exp_stage.addressing, params=["foo=2"], queue=True)
|
||||
dvc.experiments.run(exp_stage.addressing, params=["foo=3"], queue=True)
|
||||
assert len(dvc.experiments.stash_revs) == 2
|
||||
|
||||
repro_mock = mocker.spy(dvc.experiments, "_reproduce_revs")
|
||||
repro_spy = mocker.spy(dvc.experiments, "reproduce_celery")
|
||||
results = dvc.experiments.run(run_all=True)
|
||||
assert len(results) == 2
|
||||
repro_mock.assert_called_with(jobs=1)
|
||||
repro_spy.assert_called_once_with(entries=mocker.ANY, jobs=1)
|
||||
|
||||
expected = {"foo: 2", "foo: 3"}
|
||||
metrics = set()
|
||||
|
||||
Reference in New Issue
Block a user