From b987605678d76e1cfdc7a6e49a20c07b7aec56e3 Mon Sep 17 00:00:00 2001 From: Mattie Tesfaldet Date: Sat, 29 Jul 2023 10:35:34 -0400 Subject: [PATCH] Remove yaml extension from hydra defaults lists (#584) --- configs/callbacks/default.yaml | 8 ++++---- configs/debug/fdr.yaml | 2 +- configs/debug/limit.yaml | 2 +- configs/debug/overfit.yaml | 2 +- configs/debug/profiler.yaml | 2 +- configs/eval.yaml | 12 ++++++------ configs/experiment/example.yaml | 8 ++++---- configs/logger/many_loggers.yaml | 12 ++++++------ configs/train.yaml | 16 ++++++++-------- configs/trainer/cpu.yaml | 2 +- configs/trainer/ddp.yaml | 2 +- configs/trainer/ddp_sim.yaml | 2 +- configs/trainer/gpu.yaml | 2 +- configs/trainer/mps.yaml | 2 +- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/configs/callbacks/default.yaml b/configs/callbacks/default.yaml index 5df27bfda..c9bf2fb8e 100644 --- a/configs/callbacks/default.yaml +++ b/configs/callbacks/default.yaml @@ -1,8 +1,8 @@ defaults: - - model_checkpoint.yaml - - early_stopping.yaml - - model_summary.yaml - - rich_progress_bar.yaml + - model_checkpoint + - early_stopping + - model_summary + - rich_progress_bar - _self_ model_checkpoint: diff --git a/configs/debug/fdr.yaml b/configs/debug/fdr.yaml index 98eba22ca..7f2d34fa3 100644 --- a/configs/debug/fdr.yaml +++ b/configs/debug/fdr.yaml @@ -3,7 +3,7 @@ # runs 1 train, 1 validation and 1 test step defaults: - - default.yaml + - default trainer: fast_dev_run: true diff --git a/configs/debug/limit.yaml b/configs/debug/limit.yaml index cc288521a..514d77fbd 100644 --- a/configs/debug/limit.yaml +++ b/configs/debug/limit.yaml @@ -3,7 +3,7 @@ # uses only 1% of the training data and 5% of validation/test data defaults: - - default.yaml + - default trainer: max_epochs: 3 diff --git a/configs/debug/overfit.yaml b/configs/debug/overfit.yaml index d1f63e823..9906586a6 100644 --- a/configs/debug/overfit.yaml +++ b/configs/debug/overfit.yaml @@ -3,7 +3,7 @@ # overfits to 3 batches defaults: - - default.yaml + - default trainer: max_epochs: 20 diff --git a/configs/debug/profiler.yaml b/configs/debug/profiler.yaml index e18df1c6a..2bd7da87a 100644 --- a/configs/debug/profiler.yaml +++ b/configs/debug/profiler.yaml @@ -3,7 +3,7 @@ # runs with execution time profiling defaults: - - default.yaml + - default trainer: max_epochs: 1 diff --git a/configs/eval.yaml b/configs/eval.yaml index a99bebb7f..be312992b 100644 --- a/configs/eval.yaml +++ b/configs/eval.yaml @@ -2,13 +2,13 @@ defaults: - _self_ - - data: mnist.yaml # choose datamodule with `test_dataloader()` for evaluation - - model: mnist.yaml + - data: mnist # choose datamodule with `test_dataloader()` for evaluation + - model: mnist - logger: null - - trainer: default.yaml - - paths: default.yaml - - extras: default.yaml - - hydra: default.yaml + - trainer: default + - paths: default + - extras: default + - hydra: default task_name: "eval" diff --git a/configs/experiment/example.yaml b/configs/experiment/example.yaml index b68c913b9..690a59fef 100644 --- a/configs/experiment/example.yaml +++ b/configs/experiment/example.yaml @@ -4,10 +4,10 @@ # python train.py experiment=example defaults: - - override /data: mnist.yaml - - override /model: mnist.yaml - - override /callbacks: default.yaml - - override /trainer: default.yaml + - override /data: mnist + - override /model: mnist + - override /callbacks: default + - override /trainer: default # all parameters below will be merged with parameters from default configurations set above # this allows you to overwrite only specified parameters diff --git a/configs/logger/many_loggers.yaml b/configs/logger/many_loggers.yaml index 801444da6..dd586800b 100644 --- a/configs/logger/many_loggers.yaml +++ b/configs/logger/many_loggers.yaml @@ -1,9 +1,9 @@ # train with many loggers at once defaults: - # - comet.yaml - - csv.yaml - # - mlflow.yaml - # - neptune.yaml - - tensorboard.yaml - - wandb.yaml + # - comet + - csv + # - mlflow + # - neptune + - tensorboard + - wandb diff --git a/configs/train.yaml b/configs/train.yaml index 59b264a0a..c24b20681 100644 --- a/configs/train.yaml +++ b/configs/train.yaml @@ -4,14 +4,14 @@ # order of defaults determines the order in which configs override each other defaults: - _self_ - - data: mnist.yaml - - model: mnist.yaml - - callbacks: default.yaml + - data: mnist + - model: mnist + - callbacks: default - logger: null # set logger here or use command line (e.g. `python train.py logger=tensorboard`) - - trainer: default.yaml - - paths: default.yaml - - extras: default.yaml - - hydra: default.yaml + - trainer: default + - paths: default + - extras: default + - hydra: default # experiment configs allow for version control of specific hyperparameters # e.g. best hyperparameters for given model and datamodule @@ -22,7 +22,7 @@ defaults: # optional local config for machine/user specific settings # it's optional since it doesn't need to exist and is excluded from version control - - optional local: default.yaml + - optional local: default # debugging config (enable through command line, e.g. `python train.py debug=default) - debug: null diff --git a/configs/trainer/cpu.yaml b/configs/trainer/cpu.yaml index 640f71d5a..b7d6767e6 100644 --- a/configs/trainer/cpu.yaml +++ b/configs/trainer/cpu.yaml @@ -1,5 +1,5 @@ defaults: - - default.yaml + - default accelerator: cpu devices: 1 diff --git a/configs/trainer/ddp.yaml b/configs/trainer/ddp.yaml index 96bef3958..ab8f89004 100644 --- a/configs/trainer/ddp.yaml +++ b/configs/trainer/ddp.yaml @@ -1,5 +1,5 @@ defaults: - - default.yaml + - default strategy: ddp diff --git a/configs/trainer/ddp_sim.yaml b/configs/trainer/ddp_sim.yaml index 42626bea1..8404419e5 100644 --- a/configs/trainer/ddp_sim.yaml +++ b/configs/trainer/ddp_sim.yaml @@ -1,5 +1,5 @@ defaults: - - default.yaml + - default # simulate DDP on CPU, useful for debugging accelerator: cpu diff --git a/configs/trainer/gpu.yaml b/configs/trainer/gpu.yaml index d5e5773b1..b2389510a 100644 --- a/configs/trainer/gpu.yaml +++ b/configs/trainer/gpu.yaml @@ -1,5 +1,5 @@ defaults: - - default.yaml + - default accelerator: gpu devices: 1 diff --git a/configs/trainer/mps.yaml b/configs/trainer/mps.yaml index 73d2cdd1b..1ecf6d5cc 100644 --- a/configs/trainer/mps.yaml +++ b/configs/trainer/mps.yaml @@ -1,5 +1,5 @@ defaults: - - default.yaml + - default accelerator: mps devices: 1