Restructured config (#243)

* Restructured config

- Restructured config so that arguments are defined in cofing.yaml

* Fix main.py

* MOdified tests according to new config restructuring

* Updating remaining templates with restructured config

* Update according to original config args

* Configs for all the templates

- Created new yaml files for testing the code
- These are the test args that will be run when we run the tests

* Modified tests according to new config structure

* Fix typo

* Correct backend argument to be passed in command line

* Pass backend argument as a command line argument

* Modifying the config structure in template-common

---------

Co-authored-by: vfdev <[email protected]>

Author: theory-in-progress

scripts/run_tests.sh

@@ -18,13 +18,7 @@ run_simple() {
   for dir in $(find ./dist-tests/$1-simple -type d)
   do
     cd $dir
-    python main.py --data_path ~/data \
-      --train_batch_size 2 \
-      --eval_batch_size 2 \
-      --num_workers 2 \
-      --max_epochs 2 \
-      --train_epoch_length 4 \
-      --eval_epoch_length 4
+    python main.py ../../src/tests/ci-configs/$1-simple.yaml
     cd $CWD
   done
 }
@@ -34,13 +28,7 @@ run_all() {
   do
     cd $dir
     pytest -vra --color=yes --tb=short test_*.py
-    python main.py --data_path ~/data \
-      --train_batch_size 2 \
-      --eval_batch_size 2 \
-      --num_workers 2 \
-      --max_epochs 2 \
-      --train_epoch_length 4 \
-      --eval_epoch_length 4
+    python main.py ../../src/tests/ci-configs/$1-all.yaml
     cd $CWD
   done
 }
@@ -49,15 +37,7 @@ run_launch() {
   for dir in $(find ./dist-tests/$1-launch -type d)
   do
     cd $dir
-    torchrun \
-      --nproc_per_node 2 \
-      main.py --backend gloo --data_path ~/data \
-      --train_batch_size 2 \
-      --eval_batch_size 2 \
-      --num_workers 1 \
-      --max_epochs 2 \
-      --train_epoch_length 4 \
-      --eval_epoch_length 4
+    torchrun --nproc_per_node 2 main.py ../../src/tests/ci-configs/$1-launch.yaml --backend gloo
     cd $CWD
   done
 }
@@ -66,14 +46,7 @@ run_spawn() {
   for dir in $(find ./dist-tests/$1-spawn -type d)
   do
     cd $dir
-    python main.py --data_path ~/data \
-      --nproc_per_node 2 --backend gloo \
-      --train_batch_size 4 \
-      --eval_batch_size 4 \
-      --num_workers 1 \
-      --max_epochs 2 \
-      --train_epoch_length 4 \
-      --eval_epoch_length 4
+    python main.py ../../src/tests/ci-configs/$1-spawn.yaml --backend gloo
     cd $CWD
   done
 }

src/templates/template-common/main.py

@@ -23,7 +23,7 @@
 
 # main entrypoint
 def main():
-    config = setup_parser().parse_args()
+    config = setup_config()
     #::: if (it.dist === 'spawn') { :::#
     #::: if (it.nproc_per_node && it.nnodes > 1 && it.master_addr && it.master_port) { :::#
     kwargs = {

src/templates/template-common/utils.py

@@ -18,19 +18,33 @@
 from ignite.utils import setup_logger
 
 
-def setup_parser():
-    with open("config.yaml", "r") as f:
+def get_default_parser():
+    parser = ArgumentParser()
+    parser.add_argument("config", type=Path, help="Config file path")
+    parser.add_argument(
+        "--backend",
+        default=None,
+        choices=["nccl", "gloo"],
+        type=str,
+        help="DDP backend",
+    )
+    return parser
+
+
+def setup_config(parser=None):
+    if parser is None:
+        parser = get_default_parser()
+
+    args = parser.parse_args()
+    config_path = args.config
+
+    with open(config_path, "r") as f:
         config = yaml.safe_load(f.read())
 
-    parser = ArgumentParser()
-    parser.add_argument("--backend", default=None, type=str)
     for k, v in config.items():
-        if isinstance(v, bool):
-            parser.add_argument(f"--{k}", action="store_true")
-        else:
-            parser.add_argument(f"--{k}", default=v, type=type(v))
+        setattr(args, k, v)
 
-    return parser
+    return args
 
 
 def log_metrics(engine: Engine, tag: str) -> None:

src/templates/template-text-classification/main.py

@@ -175,7 +175,7 @@ def _():
 
 # main entrypoint
 def main():
-    config = setup_parser().parse_args()
+    config = setup_config()
     #::: if (it.dist === 'spawn') { :::#
     #::: if (it.nproc_per_node && it.nnodes > 1 && it.master_addr && it.master_port) { :::#
     kwargs = {

src/templates/template-text-classification/utils.py

@@ -18,19 +18,33 @@
 from ignite.utils import setup_logger
 
 
-def setup_parser():
-    with open("config.yaml", "r") as f:
+def get_default_parser():
+    parser = ArgumentParser()
+    parser.add_argument("config", type=Path, help="Config file path")
+    parser.add_argument(
+        "--backend",
+        default=None,
+        choices=["nccl", "gloo"],
+        type=str,
+        help="DDP backend",
+    )
+    return parser
+
+
+def setup_config(parser=None):
+    if parser is None:
+        parser = get_default_parser()
+
+    args = parser.parse_args()
+    config_path = args.config
+
+    with open(config_path, "r") as f:
         config = yaml.safe_load(f.read())
 
-    parser = ArgumentParser()
-    parser.add_argument("--backend", default=None, type=str)
     for k, v in config.items():
-        if isinstance(v, bool):
-            parser.add_argument(f"--{k}", action="store_true")
-        else:
-            parser.add_argument(f"--{k}", default=v, type=type(v))
+        setattr(args, k, v)
 
-    return parser
+    return args
 
 
 def log_metrics(engine: Engine, tag: str) -> None:

src/templates/template-vision-classification/main.py

@@ -131,7 +131,7 @@ def _():
 
 # main entrypoint
 def main():
-    config = setup_parser().parse_args()
+    config = setup_config()
     #::: if (it.dist === 'spawn') { :::#
     #::: if (it.nproc_per_node && it.nnodes > 1 && it.master_addr && it.master_port) { :::#
     kwargs = {

src/templates/template-vision-classification/utils.py

@@ -18,19 +18,33 @@
 from ignite.utils import setup_logger
 
 
-def setup_parser():
-    with open("config.yaml", "r") as f:
+def get_default_parser():
+    parser = ArgumentParser()
+    parser.add_argument("config", type=Path, help="Config file path")
+    parser.add_argument(
+        "--backend",
+        default=None,
+        choices=["nccl", "gloo"],
+        type=str,
+        help="DDP backend",
+    )
+    return parser
+
+
+def setup_config(parser=None):
+    if parser is None:
+        parser = get_default_parser()
+
+    args = parser.parse_args()
+    config_path = args.config
+
+    with open(config_path, "r") as f:
         config = yaml.safe_load(f.read())
 
-    parser = ArgumentParser()
-    parser.add_argument("--backend", default=None, type=str)
     for k, v in config.items():
-        if isinstance(v, bool):
-            parser.add_argument(f"--{k}", action="store_true")
-        else:
-            parser.add_argument(f"--{k}", default=v, type=type(v))
+        setattr(args, k, v)
 
-    return parser
+    return args
 
 
 def log_metrics(engine: Engine, tag: str) -> None:

src/templates/template-vision-dcgan/main.py

@@ -183,7 +183,7 @@ def _():
 
 # main entrypoint
 def main():
-    config = setup_parser().parse_args()
+    config = setup_config()
     #::: if (it.dist === 'spawn') { :::#
     #::: if (it.nproc_per_node && it.nnodes > 1 && it.master_addr && it.master_port) { :::#
     kwargs = {

src/templates/template-vision-dcgan/utils.py

@@ -18,19 +18,33 @@
 from ignite.utils import setup_logger
 
 
-def setup_parser():
-    with open("config.yaml", "r") as f:
+def get_default_parser():
+    parser = ArgumentParser()
+    parser.add_argument("config", type=Path, help="Config file path")
+    parser.add_argument(
+        "--backend",
+        default=None,
+        choices=["nccl", "gloo"],
+        type=str,
+        help="DDP backend",
+    )
+    return parser
+
+
+def setup_config(parser=None):
+    if parser is None:
+        parser = get_default_parser()
+
+    args = parser.parse_args()
+    config_path = args.config
+
+    with open(config_path, "r") as f:
         config = yaml.safe_load(f.read())
 
-    parser = ArgumentParser()
-    parser.add_argument("--backend", default=None, type=str)
     for k, v in config.items():
-        if isinstance(v, bool):
-            parser.add_argument(f"--{k}", action="store_true")
-        else:
-            parser.add_argument(f"--{k}", default=v, type=type(v))
+        setattr(args, k, v)
 
-    return parser
+    return args
 
 
 def log_metrics(engine: Engine, tag: str) -> None:

src/templates/template-vision-segmentation/main.py

@@ -197,7 +197,7 @@ def _():
 
 # main entrypoint
 def main():
-    config = setup_parser().parse_args()
+    config = setup_config()
     #::: if (it.dist === 'spawn') { :::#
     #::: if (it.nproc_per_node && it.nnodes > 1 && it.master_addr && it.master_port) { :::#
     kwargs = {

src/templates/template-vision-segmentation/utils.py

@@ -18,19 +18,33 @@
 from ignite.utils import setup_logger
 
 
-def setup_parser():
-    with open("config.yaml", "r") as f:
+def get_default_parser():
+    parser = ArgumentParser()
+    parser.add_argument("config", type=Path, help="Config file path")
+    parser.add_argument(
+        "--backend",
+        default=None,
+        choices=["nccl", "gloo"],
+        type=str,
+        help="DDP backend",
+    )
+    return parser
+
+
+def setup_config(parser=None):
+    if parser is None:
+        parser = get_default_parser()
+
+    args = parser.parse_args()
+    config_path = args.config
+
+    with open(config_path, "r") as f:
         config = yaml.safe_load(f.read())
 
-    parser = ArgumentParser()
-    parser.add_argument("--backend", default=None, type=str)
     for k, v in config.items():
-        if isinstance(v, bool):
-            parser.add_argument(f"--{k}", action="store_true")
-        else:
-            parser.add_argument(f"--{k}", default=v, type=type(v))
+        setattr(args, k, v)
 
-    return parser
+    return args
 
 
 def log_metrics(engine: Engine, tag: str) -> None:

src/tests/ci-configs/text-classification-all.yaml

@@ -0,0 +1,27 @@
+seed: 666
+data_path: ~/data
+train_batch_size: 2
+eval_batch_size: 2
+num_workers: 2
+max_epochs: 2
+train_epoch_length: 4
+eval_epoch_length: 4
+use_amp: false
+debug: false
+model: bert-base-uncased
+model_dir: /tmp/model
+tokenizer_dir: /tmp/tokenizer
+num_classes: 1
+drop_out: .3
+n_fc: 768
+weight_decay: 0.01
+num_warmup_epochs: 0
+max_length: 256
+lr: 0.00005
+filename_prefix: training
+n_saved: 2
+save_every_iters: 2
+patience: 2
+limit_sec: 60
+output_dir: ./logs
+log_every_iters: 2

src/tests/ci-configs/text-classification-launch.yaml

@@ -0,0 +1,22 @@
+seed: 666
+data_path: ~/data
+train_batch_size: 2
+eval_batch_size: 2
+num_workers: 1
+max_epochs: 2
+train_epoch_length: 4
+eval_epoch_length: 4
+use_amp: false
+debug: false
+model: bert-base-uncased
+model_dir: /tmp/model
+tokenizer_dir: /tmp/tokenizer
+num_classes: 1
+drop_out: .3
+n_fc: 768
+weight_decay: 0.01
+num_warmup_epochs: 0
+max_length: 256
+lr: 0.00005
+output_dir: ./logs
+log_every_iters: 2

src/tests/ci-configs/text-classification-simple.yaml

@@ -0,0 +1,22 @@
+seed: 666
+data_path: ~/data
+train_batch_size: 2
+eval_batch_size: 2
+num_workers: 2
+max_epochs: 2
+train_epoch_length: 4
+eval_epoch_length: 4
+use_amp: false
+debug: false
+model: bert-base-uncased
+model_dir: /tmp/model
+tokenizer_dir: /tmp/tokenizer
+num_classes: 1
+drop_out: .3
+n_fc: 768
+weight_decay: 0.01
+num_warmup_epochs: 0
+max_length: 256
+lr: 0.00005
+output_dir: ./logs
+log_every_iters: 2