From e3ee960e8e7615c8f65ea2848c7c86c5746507f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Rowlands=20=28=EB=B3=80=EA=B8=B0=ED=98=B8=29?= Date: Thu, 11 Feb 2021 11:53:20 +0900 Subject: [PATCH] exp run: remove `exp reset` in favor of `exp run --reset` (#5442) * exp run: remove `exp reset` in favor of `exp run --reset` * update command unit test --- dvc/command/experiments.py | 30 +++----------------------- tests/unit/command/test_experiments.py | 9 +++----- 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/dvc/command/experiments.py b/dvc/command/experiments.py index 6cd4bd02a..8e426fd14 100644 --- a/dvc/command/experiments.py +++ b/dvc/command/experiments.py @@ -924,36 +924,12 @@ def add_parser(subparsers, parent_parser): metavar="", ) experiments_run_parser.add_argument( - "--reset", action="store_true", help=argparse.SUPPRESS, + "--reset", + action="store_true", + help="Reset existing checkpoints and restart the experiment.", ) experiments_run_parser.set_defaults(func=CmdExperimentsRun) - EXPERIMENTS_RESET_HELP = "Reset and restart checkpoint experiments." - experiments_reset_parser = experiments_subparsers.add_parser( - "reset", - parents=[parent_parser], - description=append_doc_link(EXPERIMENTS_RESET_HELP, "exp/reset"), - help=EXPERIMENTS_RESET_HELP, - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - experiments_reset_parser.add_argument( - "-r", - "--rev", - type=str, - default=None, - dest="checkpoint_resume", - help=argparse.SUPPRESS, - ) - _add_run_common(experiments_reset_parser) - experiments_reset_parser.add_argument( - "--reset", - action="store_const", - const=True, - default=True, - help=argparse.SUPPRESS, - ) - experiments_reset_parser.set_defaults(func=CmdExperimentsRun) - EXPERIMENTS_GC_HELP = "Garbage collect unneeded experiments." EXPERIMENTS_GC_DESCRIPTION = ( "Removes all experiments which are not derived from the specified" diff --git a/tests/unit/command/test_experiments.py b/tests/unit/command/test_experiments.py index 78a80b7e2..70f3f52ce 100644 --- a/tests/unit/command/test_experiments.py +++ b/tests/unit/command/test_experiments.py @@ -87,10 +87,7 @@ def test_experiments_show(dvc, scm, mocker): ) -@pytest.mark.parametrize( - "args, reset", [(["exp", "run"], False), (["exp", "reset"], True)], -) -def test_experiments_run(dvc, scm, mocker, args, reset): +def test_experiments_run(dvc, scm, mocker): default_arguments = { "params": [], "name": None, @@ -99,11 +96,11 @@ def test_experiments_run(dvc, scm, mocker, args, reset): "jobs": None, "tmp_dir": False, "checkpoint_resume": None, - "reset": reset, + "reset": False, } default_arguments.update(repro_arguments) - cmd = CmdExperimentsRun(parse_args(args)) + cmd = CmdExperimentsRun(parse_args(["exp", "run"])) mocker.patch.object(cmd.repo, "reproduce") mocker.patch.object(cmd.repo.experiments, "run") cmd.run()