Merge branch 'master' into ethan/apr29_cpu_and_multigpu

configs/data/default_data.yaml

@@ -0,0 +1,13 @@
+# dataset options
+dataset:
+  data_directory: data/blender/lego
+  dataset_type: blender
+  downscale_factor: 4
+
+# dataloader options
+dataloader:
+  num_workers: 4
+  shuffle: true
+  num_images_to_sample_from: 8
+  num_rays_per_batch: 1024
+  num_times_to_repeat_images: 40