From 898d9384a57b3a7b5d43b25468274aae81ed4bdb Mon Sep 17 00:00:00 2001
From: evonneng <evonneng@users.noreply.github.com>
Date: Mon, 11 Jul 2022 16:05:44 -0700
Subject: [PATCH] added logic to check all graphs in testing (#111)

* added logic to check all graphs in testing

* fixed path to test dataset
---
 configs/tests/test_dryrun.yaml | 36 --------------------------
 tests/test_run_train.py        | 46 +++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 39 deletions(-)
 delete mode 100644 configs/tests/test_dryrun.yaml

diff --git a/configs/tests/test_dryrun.yaml b/configs/tests/test_dryrun.yaml
deleted file mode 100644
index 389ee8f5a..000000000
--- a/configs/tests/test_dryrun.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-defaults:
-  - graph_default
-
-machine:
-  num_gpus: 0
-
-trainer:
-  max_num_iterations: 2
-
-data:
-  dataset_inputs_train:
-    data_directory: tests/data/lego_test
-    dataset_format: blender
-    downscale_factor: 16
-  dataloader_train:
-    image_sampler:
-      num_images_to_sample_from: 1
-    pixel_sampler:
-      num_rays_per_batch: 4
-  dataset_inputs_eval:
-    data_directory: tests/data/lego_test
-    dataset_format: blender
-    downscale_factor: 16
-
-graph:
-  num_coarse_samples: 4
-  num_importance_samples: 4
-
-logging:
-  writer:
-    TensorboardWriter:
-      log_dir: "/tmp/"
-
-hydra:
-  searchpath:
-    - file://configs
diff --git a/tests/test_run_train.py b/tests/test_run_train.py
index ee6cd8c31..f626f580a 100644
--- a/tests/test_run_train.py
+++ b/tests/test_run_train.py
@@ -1,18 +1,58 @@
 """
 Default test to make sure train runs
 """
+import os
+
 import pytest
 from hydra import compose, initialize
+from hydra.core.global_hydra import GlobalHydra
+from omegaconf import DictConfig
 
 from scripts.run_train import main
 
+BLACKLIST = ["graph_nerfw.yaml", "graph_semantic_nerf.yaml", "graph_mipnerf_360.yaml"]
+
+
+def set_reduced_config(config: DictConfig):
+    """Reducing the config settings to speedup test"""
+    config.machine.num_gpus = 0
+    config.trainer.max_num_iterations = 2
+    # reduce dataset factors; set dataset to test
+    config.data.dataset_inputs_train.data_directory = "tests/data/lego_test"
+    config.data.dataset_inputs_train.downscale_factor = 16
+    config.data.dataloader_train.image_sampler.num_images_to_sample_from = 1
+    config.data.dataloader_train.pixel_sampler.num_rays_per_batch = 4
+    config.data.dataset_inputs_eval.data_directory = "tests/data/lego_test"
+    config.data.dataset_inputs_eval.downscale_factor = 16
+    # reduce graph factors
+    config.graph.num_coarse_samples = 4
+    config.graph.num_importance_samples = 4
+    # set logging to tmp
+    config.logging.writer.TensorboardWriter.log_dir = "/tmp/"
+    # remove viewer
+    config.viewer.enable = False
+
+    # graph specific config settings
+    if config.method_name == "instant_ngp":
+        config.graph.field_implementation = "torch"
+
+    return config
+
 
 @pytest.mark.filterwarnings("ignore::DeprecationWarning")
 def test_run_train():
     """test run train script works properly"""
-    initialize(config_path="../configs/tests/")
-    conf = compose("test_dryrun.yaml")
-    main(conf)
+    all_configs = [f for f in os.listdir("configs/") if f.endswith(".yaml")]  # relative to run path
+    for config_path in all_configs:
+        print(f"testing run for: {config_path}")
+        if config_path in BLACKLIST:
+            continue
+        initialize(config_path="../configs/")  # relative to test path
+        config = compose(config_path)
+        config = set_reduced_config(config)
+        main(config)
+
+        GlobalHydra.instance().clear()
 
 
 if __name__ == "__main__":