Skip to content

exp run --run-all: re-enable --jobs concurrency #8608

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Dec 26, 2022
Merged

exp run --run-all: re-enable --jobs concurrency #8608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9090f0
re-enable --jobs concurrency
PythonFZ Nov 23, 2022
78971e2
use `start_workers` instead of `spawn_worker`
PythonFZ Nov 29, 2022
4c11e5b
make `spawn_worker` a private method.
PythonFZ Nov 29, 2022
a0cff11
Merge branch 'main' into main
PythonFZ Nov 29, 2022
3dfade9
Merge branch 'main' into main
PythonFZ Dec 16, 2022
5834628
update tests: make `spawn_worker` a private method.
PythonFZ Dec 16, 2022
9b03279
Merge branch 'main' into main
PythonFZ Dec 19, 2022
bce0537
Merge branch 'main' into main
PythonFZ Dec 20, 2022
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
3 changes: 1 addition & 2 deletions dvc/repo/experiments/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,7 @@ def reproduce_celery(
if not entries:
return results

# TODO: re-enable --jobs concurrency
self.celery_queue.spawn_worker()
self.celery_queue.start_workers(count=kwargs.get("jobs", 1))
failed = []
try:
ui.write(
Expand Down
4 changes: 2 additions & 2 deletions dvc/repo/experiments/queue/celery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def worker(self) -> "TemporaryWorker":
timeout=10,
)

def spawn_worker(self, num: int = 1):
def _spawn_worker(self, num: int = 1):
"""spawn one single worker to process to queued tasks.

Argument:
Expand Down Expand Up @@ -159,7 +159,7 @@ def start_workers(self, count: int) -> int:
if node_name in active_worker:
logger.debug(f"Exp queue worker {node_name} already exist")
continue
self.spawn_worker(num)
self._spawn_worker(num)
started += 1

return started
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/command/test_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def test_experiments_start(dvc, scm, mocker):

cmd = cli_args.func(cli_args)
m = mocker.patch(
"dvc.repo.experiments.queue.celery.LocalCeleryQueue.spawn_worker",
"dvc.repo.experiments.queue.celery.LocalCeleryQueue._spawn_worker",
)

assert cmd.run() == 0
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/repo/experiments/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def test_queue(tmp_dir, dvc, scm, mocker) -> LocalCeleryQueue:
import celery

queue = dvc.experiments.celery_queue
mocker.patch.object(queue, "spawn_worker")
mocker.patch.object(queue, "_spawn_worker")

f = partial(
_thread_worker,
Expand Down