From be0a1a4a12956248a196d59ead5324486ae5ef55 Mon Sep 17 00:00:00 2001 From: Peter Rowlands Date: Tue, 16 May 2023 15:28:27 +0900 Subject: [PATCH] exp: fix temporary ref namespacing --- dvc/repo/experiments/executor/local.py | 8 ++++---- dvc/repo/experiments/refs.py | 14 ++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dvc/repo/experiments/executor/local.py b/dvc/repo/experiments/executor/local.py index 3bb0d47fb..f97ceaa4e 100644 --- a/dvc/repo/experiments/executor/local.py +++ b/dvc/repo/experiments/executor/local.py @@ -17,7 +17,7 @@ from dvc.repo.experiments.refs import ( EXEC_HEAD, EXEC_MERGE, EXEC_NAMESPACE, - EXPS_TEMP, + TEMP_NAMESPACE, ) from dvc.repo.experiments.utils import EXEC_TMP_DIR, get_exp_rwlock from dvc.scm import SCM, Git @@ -90,9 +90,9 @@ class TempDirExecutor(BaseLocalExecutor): if infofile: self.info.dump_json(infofile) - temp_head = f"{EXPS_TEMP}/head-{uuid()}" - temp_merge = f"{EXPS_TEMP}/merge-{uuid()}" - temp_baseline = f"{EXPS_TEMP}/baseline-{uuid()}" + temp_head = f"{TEMP_NAMESPACE}/head-{uuid()}" + temp_merge = f"{TEMP_NAMESPACE}/merge-{uuid()}" + temp_baseline = f"{TEMP_NAMESPACE}/baseline-{uuid()}" temp_ref_dict = { temp_head: entry.head_rev, diff --git a/dvc/repo/experiments/refs.py b/dvc/repo/experiments/refs.py index dd9c4b215..7f0836330 100644 --- a/dvc/repo/experiments/refs.py +++ b/dvc/repo/experiments/refs.py @@ -10,8 +10,9 @@ WORKSPACE_STASH = EXPS_STASH APPLY_NAMESPACE = f"{EXPS_NAMESPACE}/apply" APPLY_HEAD = f"{APPLY_NAMESPACE}/ORIG_HEAD" APPLY_STASH = f"{APPLY_NAMESPACE}/stash" -CELERY_STASH = f"{EXPS_NAMESPACE}/celery/stash" -CELERY_FAILED_STASH = f"{EXPS_NAMESPACE}/celery/failed" +CELERY_NAMESPACE = f"{EXPS_NAMESPACE}/celery" +CELERY_STASH = f"{CELERY_NAMESPACE}/stash" +CELERY_FAILED_STASH = f"{CELERY_NAMESPACE}/failed" EXEC_NAMESPACE = f"{EXPS_NAMESPACE}/exec" EXEC_APPLY = f"{EXEC_NAMESPACE}/EXEC_APPLY" EXEC_CHECKPOINT = f"{EXEC_NAMESPACE}/EXEC_CHECKPOINT" @@ -19,9 +20,14 @@ EXEC_BRANCH = f"{EXEC_NAMESPACE}/EXEC_BRANCH" EXEC_BASELINE = f"{EXEC_NAMESPACE}/EXEC_BASELINE" EXEC_HEAD = f"{EXEC_NAMESPACE}/EXEC_HEAD" EXEC_MERGE = f"{EXEC_NAMESPACE}/EXEC_MERGE" -EXPS_TEMP = f"{EXPS_NAMESPACE}/temp" +TEMP_NAMESPACE = f"{EXPS_NAMESPACE}/temp" STASHES = {WORKSPACE_STASH, CELERY_STASH} -ITER_SKIP_NAMESPACES = {APPLY_NAMESPACE, EXEC_NAMESPACE} +ITER_SKIP_NAMESPACES = { + APPLY_NAMESPACE, + CELERY_NAMESPACE, + EXEC_NAMESPACE, + TEMP_NAMESPACE, +} class ExpRefInfo: