Skip to content

Commit f3a0be1

Browse files
mattseddonmattseddon
authored
Remove redundant checkpoints code (#5204)
1 parent 6509e93 commit f3a0be1

File tree

28 files changed

+35
-585
lines changed

28 files changed

+35
-585
lines changed

‎extension/package.json‎

Lines changed: 8 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -271,24 +271,12 @@
271271
"light": "resources/light/queue-experiment.svg"
272272
}
273273
},
274-
{
275-
"title": "Modify Workspace Param(s) and Resume",
276-
"command": "dvc.modifyWorkspaceParamsAndResume",
277-
"category": "DVC",
278-
"icon": "$(debug-continue-small)"
279-
},
280274
{
281275
"title": "Modify Workspace Param(s) and Run",
282276
"command": "dvc.modifyWorkspaceParamsAndRun",
283277
"category": "DVC",
284278
"icon": "$(play)"
285279
},
286-
{
287-
"title": "Modify Workspace Param(s) and Run",
288-
"command": "dvc.modifyWorkspaceParamsResetAndRun",
289-
"category": "DVC",
290-
"icon": "$(play)"
291-
},
292280
{
293281
"title": "Modify Remote",
294282
"command": "dvc.modifyRemote",
@@ -358,12 +346,6 @@
358346
"category": "DVC",
359347
"icon": "$(play)"
360348
},
361-
{
362-
"title": "Resume Experiment",
363-
"command": "dvc.resumeCheckpointExperiment",
364-
"category": "DVC",
365-
"icon": "$(debug-continue-small)"
366-
},
367349
{
368350
"title": "Start Processing Queued Experiments",
369351
"command": "dvc.startExperimentsQueue",
@@ -385,12 +367,6 @@
385367
"command": "dvc.removeStudioUrl",
386368
"category": "DVC"
387369
},
388-
{
389-
"title": "Run Experiment",
390-
"command": "dvc.resetAndRunCheckpointExperiment",
391-
"category": "DVC",
392-
"icon": "$(play)"
393-
},
394370
{
395371
"title": "Select for Compare",
396372
"command": "dvc.selectForCompare",
@@ -557,18 +533,6 @@
557533
"category": "DVC",
558534
"icon": "$(play)"
559535
},
560-
{
561-
"title": "Modify Param(s) and Resume",
562-
"command": "dvc.views.experiments.resumeCheckpointExperiment",
563-
"category": "DVC",
564-
"icon": "$(debug-continue-small)"
565-
},
566-
{
567-
"title": "Modify Param(s) and Run",
568-
"command": "dvc.views.experiments.resetAndRunCheckpointExperiment",
569-
"category": "DVC",
570-
"icon": "$(play)"
571-
},
572536
{
573537
"title": "Push",
574538
"command": "dvc.views.experiments.pushExperiment",
@@ -825,15 +789,7 @@
825789
},
826790
{
827791
"command": "dvc.modifyWorkspaceParamsAndRun",
828-
"when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace && !dvc.experiment.checkpoints"
829-
},
830-
{
831-
"command": "dvc.modifyWorkspaceParamsAndResume",
832-
"when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace && dvc.experiment.checkpoints"
833-
},
834-
{
835-
"command": "dvc.modifyWorkspaceParamsResetAndRun",
836-
"when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace && dvc.experiment.checkpoints"
792+
"when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace"
837793
},
838794
{
839795
"command": "dvc.pushExperiments",
@@ -885,15 +841,7 @@
885841
},
886842
{
887843
"command": "dvc.runExperiment",
888-
"when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace && !dvc.experiment.checkpoints"
889-
},
890-
{
891-
"command": "dvc.resumeCheckpointExperiment",
892-
"when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace && dvc.experiment.checkpoints"
893-
},
894-
{
895-
"command": "dvc.resetAndRunCheckpointExperiment",
896-
"when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace && dvc.experiment.checkpoints"
844+
"when": "dvc.commands.available && dvc.project.available && !dvc.experiment.running.workspace"
897845
},
898846
{
899847
"command": "dvc.startExperimentsQueue",
@@ -1003,14 +951,6 @@
1003951
"command": "dvc.views.experiments.runExperiment",
1004952
"when": "false"
1005953
},
1006-
{
1007-
"command": "dvc.views.experiments.resumeCheckpointExperiment",
1008-
"when": "false"
1009-
},
1010-
{
1011-
"command": "dvc.views.experiments.resetAndRunCheckpointExperiment",
1012-
"when": "false"
1013-
},
1014954
{
1015955
"command": "dvc.views.experiments.showLogs",
1016956
"when": "false"
@@ -1156,32 +1096,12 @@
11561096
{
11571097
"command": "dvc.runExperiment",
11581098
"group": "navigation@1",
1159-
"when": "dvc.experiments.file.active && !dvc.experiment.running.workspace && dvc.commands.available && !dvc.experiment.checkpoints"
1099+
"when": "dvc.experiments.file.active && !dvc.experiment.running.workspace && dvc.commands.available"
11601100
},
11611101
{
11621102
"command": "dvc.runExperiment",
11631103
"group": "navigation@1",
1164-
"when": "dvc.experiments.webview.active && !dvc.experiment.running.workspace && dvc.commands.available && !dvc.experiment.checkpoints"
1165-
},
1166-
{
1167-
"command": "dvc.resetAndRunCheckpointExperiment",
1168-
"group": "navigation@2",
1169-
"when": "dvc.experiments.webview.active && !dvc.experiment.running.workspace && dvc.commands.available && dvc.experiment.checkpoints"
1170-
},
1171-
{
1172-
"command": "dvc.resetAndRunCheckpointExperiment",
1173-
"group": "navigation@2",
1174-
"when": "dvc.experiments.file.active && !dvc.experiment.running.workspace && dvc.commands.available && dvc.experiment.checkpoints"
1175-
},
1176-
{
1177-
"command": "dvc.resumeCheckpointExperiment",
1178-
"group": "navigation@3",
1179-
"when": "dvc.experiments.webview.active && !dvc.experiment.running.workspace && dvc.commands.available && dvc.experiment.checkpoints"
1180-
},
1181-
{
1182-
"command": "dvc.resumeCheckpointExperiment",
1183-
"group": "navigation@3",
1184-
"when": "dvc.experiments.file.active && !dvc.experiment.running.workspace && dvc.commands.available && dvc.experiment.checkpoints"
1104+
"when": "dvc.experiments.webview.active && !dvc.experiment.running.workspace && dvc.commands.available"
11851105
},
11861106
{
11871107
"command": "dvc.startExperimentsQueue",
@@ -1308,17 +1228,7 @@
13081228
{
13091229
"command": "dvc.views.experiments.runExperiment",
13101230
"group": "2_modify@1",
1311-
"when": "view == dvc.views.experimentsTree && dvc.commands.available && viewItem == workspace && !dvc.experiment.running.workspace && !dvc.experiment.checkpoints"
1312-
},
1313-
{
1314-
"command": "dvc.views.experiments.resetAndRunCheckpointExperiment",
1315-
"group": "2_modify@1",
1316-
"when": "view == dvc.views.experimentsTree && dvc.commands.available && viewItem == workspace && !dvc.experiment.running.workspace && dvc.experiment.checkpoints"
1317-
},
1318-
{
1319-
"command": "dvc.views.experiments.resumeCheckpointExperiment",
1320-
"group": "2_modify@2",
1321-
"when": "view == dvc.views.experimentsTree && dvc.commands.available && viewItem == workspace && !dvc.experiment.running.workspace && dvc.experiment.checkpoints"
1231+
"when": "view == dvc.views.experimentsTree && dvc.commands.available && viewItem == workspace && !dvc.experiment.running.workspace"
13221232
},
13231233
{
13241234
"command": "dvc.views.experiments.queueExperiment",
@@ -1354,19 +1264,9 @@
13541264
},
13551265
{
13561266
"command": "dvc.runExperiment",
1357-
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace && !dvc.experiment.checkpoints",
1358-
"group": "navigation@1"
1359-
},
1360-
{
1361-
"command": "dvc.resetAndRunCheckpointExperiment",
1362-
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace && dvc.experiment.checkpoints",
1267+
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace",
13631268
"group": "navigation@1"
13641269
},
1365-
{
1366-
"command": "dvc.resumeCheckpointExperiment",
1367-
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace && dvc.experiment.checkpoints",
1368-
"group": "navigation@2"
1369-
},
13701270
{
13711271
"command": "dvc.stopAllRunningExperiments",
13721272
"when": "view == dvc.views.experimentsTree && !dvc.experiments.webview.active && dvc.experiment.running",
@@ -1384,19 +1284,9 @@
13841284
},
13851285
{
13861286
"command": "dvc.modifyWorkspaceParamsAndRun",
1387-
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace && !dvc.experiment.checkpoints",
1388-
"group": "2_modify@1"
1389-
},
1390-
{
1391-
"command": "dvc.modifyWorkspaceParamsAndResume",
1392-
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace && dvc.experiment.checkpoints",
1287+
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace",
13931288
"group": "2_modify@1"
13941289
},
1395-
{
1396-
"command": "dvc.modifyWorkspaceParamsResetAndRun",
1397-
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace && dvc.experiment.checkpoints",
1398-
"group": "2_modify@2"
1399-
},
14001290
{
14011291
"command": "dvc.modifyWorkspaceParamsAndQueue",
14021292
"when": "view == dvc.views.experimentsTree && !dvc.experiment.running.workspace",
@@ -1549,12 +1439,7 @@
15491439
{
15501440
"view": "dvc.views.actions",
15511441
"contents": "[$(beaker) Show Experiments](command:dvc.showExperiments)\n[$(graph-scatter) Show Plots](command:dvc.showPlots)\n[$(play) Run Experiment](command:dvc.runExperiment)",
1552-
"when": "!dvc.experiment.checkpoints"
1553-
},
1554-
{
1555-
"view": "dvc.views.actions",
1556-
"contents": "[$(beaker) Show Experiments](command:dvc.showExperiments)\n[$(graph-scatter) Show Plots](command:dvc.showPlots)\n[$(play) Run Experiment](command:dvc.resetAndRunCheckpointExperiment)",
1557-
"when": "dvc.experiment.checkpoints"
1442+
"when": "true"
15581443
},
15591444
{
15601445
"view": "dvc.views.studio",

‎extension/src/cli/dvc/constants.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ export enum QueueSubCommand {
106106
export enum ExperimentFlag {
107107
NO_FETCH = '--no-fetch',
108108
QUEUE = '--queue',
109-
RESET = '--reset',
110109
NUM_COMMIT = '-n',
111110
REV = '--rev'
112111
}

‎extension/src/cli/dvc/runner.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import { EventEmitter, Event } from 'vscode'
2-
import {
3-
Args,
4-
Command,
5-
ExperimentFlag,
6-
ExperimentSubCommand
7-
} from './constants'
2+
import { Args, Command, ExperimentSubCommand } from './constants'
83
import { getOptions } from './options'
94
import { CliResult, CliStarted, ICli, typeCheckCommands } from '..'
105
import { getCommandString } from '../command'
@@ -22,7 +17,6 @@ import {
2217
} from '../util'
2318

2419
export const autoRegisteredCommands = {
25-
EXPERIMENT_RESET_AND_RUN: 'runExperimentReset',
2620
EXPERIMENT_RUN: 'runExperiment'
2721
} as const
2822

@@ -94,10 +88,6 @@ export class DvcRunner extends Disposable implements ICli {
9488
)
9589
}
9690

97-
public runExperimentReset(dvcRoot: string, ...args: Args) {
98-
return this.runExperiment(dvcRoot, ExperimentFlag.RESET, ...args)
99-
}
100-
10191
public async run(cwd: string, ...args: Args) {
10292
await this.pseudoTerminal.openCurrentInstance()
10393
if (!this.pseudoTerminal.isBlocked()) {

‎extension/src/commands/external.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ export enum RegisteredCliCommands {
55
EXPERIMENT_PUSH = 'dvc.pushExperiments',
66
EXPERIMENT_REMOVE = 'dvc.removeExperiments',
77
EXPERIMENT_REMOVE_QUEUE = 'dvc.removeExperimentQueue',
8-
EXPERIMENT_RESET_AND_RUN = 'dvc.resetAndRunCheckpointExperiment',
9-
EXPERIMENT_RESUME = 'dvc.resumeCheckpointExperiment',
108
EXPERIMENT_RUN = 'dvc.runExperiment',
119
QUEUE_EXPERIMENT = 'dvc.queueExperiment',
1210
QUEUE_START = 'dvc.startExperimentsQueue',
@@ -20,14 +18,10 @@ export enum RegisteredCliCommands {
2018
EXPERIMENT_VIEW_SHOW_LOGS = 'dvc.views.experiments.showLogs',
2119

2220
EXPERIMENT_VIEW_QUEUE = 'dvc.views.experiments.queueExperiment',
23-
EXPERIMENT_VIEW_RESUME = 'dvc.views.experiments.resumeCheckpointExperiment',
2421
EXPERIMENT_VIEW_RUN = 'dvc.views.experiments.runExperiment',
25-
EXPERIMENT_VIEW_RESET_AND_RUN = 'dvc.views.experiments.resetAndRunCheckpointExperiment',
2622

2723
MODIFY_WORKSPACE_PARAMS_AND_QUEUE = 'dvc.modifyWorkspaceParamsAndQueue',
28-
MODIFY_WORKSPACE_PARAMS_AND_RESUME = 'dvc.modifyWorkspaceParamsAndResume',
2924
MODIFY_WORKSPACE_PARAMS_AND_RUN = 'dvc.modifyWorkspaceParamsAndRun',
30-
MODIFY_WORKSPACE_PARAMS_RESET_AND_RUN = 'dvc.modifyWorkspaceParamsResetAndRun',
3125

3226
ADD_TARGET = 'dvc.addTarget',
3327
CHECKOUT = 'dvc.checkout',

‎extension/src/experiments/commands/register.ts‎

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -41,52 +41,15 @@ const registerExperimentCwdCommands = (
4141
experiments.modifyWorkspaceParamsAndQueue(dvcRoot)
4242
)
4343

44-
const modifyWorkspaceParamsAndRun = () =>
45-
experiments.modifyWorkspaceParamsAndRun(AvailableCommands.EXPERIMENT_RUN)
46-
47-
internalCommands.registerExternalCliCommand(
48-
RegisteredCliCommands.MODIFY_WORKSPACE_PARAMS_AND_RESUME,
49-
modifyWorkspaceParamsAndRun
50-
)
51-
5244
internalCommands.registerExternalCliCommand(
5345
RegisteredCliCommands.MODIFY_WORKSPACE_PARAMS_AND_RUN,
54-
modifyWorkspaceParamsAndRun
55-
)
56-
57-
const modifyWorkspaceParamsAndRunFromView = ({
58-
dvcRoot
59-
}: ExperimentDetails) =>
60-
experiments.modifyWorkspaceParamsAndRun(
61-
AvailableCommands.EXPERIMENT_RUN,
62-
dvcRoot
63-
)
64-
65-
internalCommands.registerExternalCliCommand(
66-
RegisteredCliCommands.EXPERIMENT_VIEW_RESUME,
67-
modifyWorkspaceParamsAndRunFromView
46+
() => experiments.modifyWorkspaceParamsAndRun()
6847
)
6948

7049
internalCommands.registerExternalCliCommand(
7150
RegisteredCliCommands.EXPERIMENT_VIEW_RUN,
72-
modifyWorkspaceParamsAndRunFromView
73-
)
74-
75-
internalCommands.registerExternalCliCommand(
76-
RegisteredCliCommands.MODIFY_WORKSPACE_PARAMS_RESET_AND_RUN,
77-
() =>
78-
experiments.modifyWorkspaceParamsAndRun(
79-
AvailableCommands.EXPERIMENT_RESET_AND_RUN
80-
)
81-
)
82-
83-
internalCommands.registerExternalCliCommand(
84-
RegisteredCliCommands.EXPERIMENT_VIEW_RESET_AND_RUN,
8551
({ dvcRoot }: ExperimentDetails) =>
86-
experiments.modifyWorkspaceParamsAndRun(
87-
AvailableCommands.EXPERIMENT_RESET_AND_RUN,
88-
dvcRoot
89-
)
52+
experiments.modifyWorkspaceParamsAndRun(dvcRoot)
9053
)
9154

9255
internalCommands.registerExternalCliCommand(
@@ -240,18 +203,6 @@ const registerExperimentRunCommands = (
240203
)
241204
)
242205

243-
internalCommands.registerExternalCliCommand(
244-
RegisteredCliCommands.EXPERIMENT_RESUME,
245-
() => experiments.getCwdThenRun(AvailableCommands.EXPERIMENT_RUN)
246-
)
247-
248-
internalCommands.registerExternalCliCommand(
249-
RegisteredCliCommands.EXPERIMENT_RESET_AND_RUN,
250-
showSetupOrExecuteCommand(setup, () =>
251-
experiments.getCwdThenRun(AvailableCommands.EXPERIMENT_RESET_AND_RUN)
252-
)
253-
)
254-
255206
internalCommands.registerExternalCliCommand(
256207
RegisteredCliCommands.QUEUE_START,
257208
() =>

0 commit comments

Comments
 (0)