From b5f3d3ce128dba0f4e79a13cd8ae157371e70c3b Mon Sep 17 00:00:00 2001
From: Jeremy Reizenstein <reizenstein@fb.com>
Date: Fri, 13 May 2022 07:15:26 -0700
Subject: [PATCH] fix test_config_use

Summary: Fixes to reenable test_create_gm_overrides. Followup from D35852367 (https://github.com/facebookresearch/pytorch3d/commit/47d06c89240ce38f8daf5e27b5dbb09c5f54e58b) using logic from D36349361 (https://github.com/facebookresearch/pytorch3d/commit/9e57b994ca27738c019c798294b581fc8fdc8722).

Reviewed By: shapovalov

Differential Revision: D36371762

fbshipit-source-id: ad5fbbb4b5729fac41980d118f17a2589f7e6aba
---
 tests/implicitron/data/overrides.yaml | 15 +++++++--------
 tests/implicitron/test_config_use.py  |  9 ++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/implicitron/data/overrides.yaml b/tests/implicitron/data/overrides.yaml
index 19420e23..5d65d661 100644
--- a/tests/implicitron/data/overrides.yaml
+++ b/tests/implicitron/data/overrides.yaml
@@ -15,6 +15,7 @@ tqdm_trigger_threshold: 16
 n_train_target_views: 1
 sampling_mode_training: mask_sample
 sampling_mode_evaluation: full_grid
+raysampler_class_type: AdaptiveRaySampler
 renderer_class_type: LSTMRenderer
 image_feature_extractor_enabled: true
 view_pooler_enabled: true
@@ -50,23 +51,21 @@ sequence_autodecoder_args:
   n_instances: 0
   init_scale: 1.0
   ignore_input: false
-raysampler_args:
+raysampler_AdaptiveRaySampler_args:
   image_width: 400
   image_height: 400
-  scene_center:
-  - 0.0
-  - 0.0
-  - 0.0
-  scene_extent: 0.0
   sampling_mode_training: mask_sample
   sampling_mode_evaluation: full_grid
   n_pts_per_ray_training: 64
   n_pts_per_ray_evaluation: 64
   n_rays_per_image_sampled_from_mask: 1024
-  min_depth: 0.1
-  max_depth: 8.0
   stratified_point_sampling_training: true
   stratified_point_sampling_evaluation: false
+  scene_extent: 8.0
+  scene_center:
+  - 0.0
+  - 0.0
+  - 0.0
 renderer_LSTMRenderer_args:
   num_raymarch_steps: 10
   init_depth: 17.0
diff --git a/tests/implicitron/test_config_use.py b/tests/implicitron/test_config_use.py
index 6dc0a75a..22cfa353 100644
--- a/tests/implicitron/test_config_use.py
+++ b/tests/implicitron/test_config_use.py
@@ -32,9 +32,9 @@ from pytorch3d.implicitron.tools.config import (
 if os.environ.get("FB_TEST", False):
     from common_testing import get_tests_dir
 
-    from .common_resources import provide_lpips_vgg
+    from .common_resources import provide_resnet34
 else:
-    from common_resources import provide_lpips_vgg  # noqa
+    from common_resources import provide_resnet34
     from tests.common_testing import get_tests_dir
 
 DATA_DIR = get_tests_dir() / "implicitron/data"
@@ -48,7 +48,6 @@ class TestGenericModel(unittest.TestCase):
         self.maxDiff = None
 
     def test_create_gm(self):
-        provide_lpips_vgg()
         args = get_default_args(GenericModel)
         gm = GenericModel(**args)
         self.assertIsInstance(gm.renderer, MultiPassEmissionAbsorptionRenderer)
@@ -60,8 +59,8 @@ class TestGenericModel(unittest.TestCase):
         self.assertIsNone(gm.view_pooler)
         self.assertIsNone(gm.image_feature_extractor)
 
-    def _test_create_gm_overrides(self):
-        provide_lpips_vgg()
+    def test_create_gm_overrides(self):
+        provide_resnet34()
         args = get_default_args(GenericModel)
         args.view_pooler_enabled = True
         args.image_feature_extractor_enabled = True