From e874e856ecf2df6a8c6909acf268e683f9b55870 Mon Sep 17 00:00:00 2001 From: evonneng Date: Fri, 29 Apr 2022 16:18:30 -0700 Subject: [PATCH] changed test config file to inherit from default (#49) * lint * reconfigured modules in yaml * added data module * changed test config file --- .gitignore | 2 +- configs/default.yaml | 2 +- configs/test_dryrun.yaml | 18 ++++++++++++++++++ tests/test_run_train.py | 9 ++++----- 4 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 configs/test_dryrun.yaml diff --git a/.gitignore b/.gitignore index b8382ed16..79d34c5b0 100644 --- a/.gitignore +++ b/.gitignore @@ -164,7 +164,7 @@ runs/ outputs/ # Data -data/ +./data/ # Misc old/ diff --git a/configs/default.yaml b/configs/default.yaml index 2e579dda2..cd23f0aca 100644 --- a/configs/default.yaml +++ b/configs/default.yaml @@ -20,4 +20,4 @@ machine_config: num_gpus: 1 num_machines: 1 machine_rank: 0 - dist_url: auto \ No newline at end of file + dist_url: auto diff --git a/configs/test_dryrun.yaml b/configs/test_dryrun.yaml new file mode 100644 index 000000000..8de92f45d --- /dev/null +++ b/configs/test_dryrun.yaml @@ -0,0 +1,18 @@ +defaults: +- default + +dry_run: true + +machine_config: + num_gpus: 0 + +data: + dataset: + data_directory: data/blender/lego_test + validation_image_indices: [0] + dataloader: + num_images_to_sample_from: 1 + num_rays_per_batch: 8 + +graph: + max_num_iterations: 5 \ No newline at end of file diff --git a/tests/test_run_train.py b/tests/test_run_train.py index bd6cc24b3..966298c0a 100644 --- a/tests/test_run_train.py +++ b/tests/test_run_train.py @@ -2,8 +2,7 @@ Default test to make sure train runs """ import pytest -import omegaconf -from mattport.utils.io import get_absolute_path +from hydra.experimental import compose, initialize from scripts.run_train import main @@ -11,6 +10,6 @@ from scripts.run_train import main @pytest.mark.filterwarnings("ignore::DeprecationWarning") def test_run_train(): """test run train script works properly""" - test_config = get_absolute_path("./tests/configs/test_default.yml") - cfg = omegaconf.OmegaConf.load(test_config) - main(cfg) + initialize(config_path="../configs/") + conf = compose("test_dryrun.yaml") + main(conf)