ViewPooler class

Summary: Implements a ViewPooler that groups ViewSampler and FeatureAggregator.

Reviewed By: shapovalov

Differential Revision: D35852367

fbshipit-source-id: c1bcaf5a1f826ff94efce53aa5836121ad9c50ec

projects/implicitron_trainer/configs/repro_base.yaml

@@ -63,8 +63,9 @@ generic_model_args:
     n_pts_per_ray_fine_evaluation: 64
     append_coarse_samples_to_fine: true
     density_noise_std_train: 1.0
-  view_sampler_args:
-    masked_sampling: false
+  view_pooler_args:
+    view_sampler_args:
+      masked_sampling: false
   image_feature_extractor_args:
     stages:
     - 1

projects/implicitron_trainer/configs/repro_feat_extractor_normed.yaml

@@ -1,4 +1,5 @@
 generic_model_args:
+  image_feature_extractor_enabled: true
   image_feature_extractor_args:
     add_images: true
     add_masks: true

projects/implicitron_trainer/configs/repro_feat_extractor_transformer.yaml

@@ -1,4 +1,5 @@
 generic_model_args:
+  image_feature_extractor_enabled: true
   image_feature_extractor_args:
     add_images: true
     add_masks: true

projects/implicitron_trainer/configs/repro_feat_extractor_unnormed.yaml

@@ -1,4 +1,5 @@
 generic_model_args:
+  image_feature_extractor_enabled: true
   image_feature_extractor_args:
     stages:
     - 1
@@ -11,6 +12,7 @@ generic_model_args:
     name: resnet34
     normalize_image: true
     pretrained: true
-  feature_aggregator_AngleWeightedReductionFeatureAggregator_args:
-    reduction_functions:
-    - AVG
+  view_pooler_args:
+    feature_aggregator_AngleWeightedReductionFeatureAggregator_args:
+      reduction_functions:
+      - AVG

projects/implicitron_trainer/configs/repro_multiseq_idr_ad.yaml

@@ -11,7 +11,6 @@ generic_model_args:
   num_passes: 1
   output_rasterized_mc: true
   sampling_mode_training: mask_sample
-  view_pool: false
   sequence_autodecoder_args:
     n_instances: 20000
     init_scale: 1.0

projects/implicitron_trainer/configs/repro_multiseq_nerf_ad.yaml

@@ -3,7 +3,7 @@ defaults:
 - _self_
 generic_model_args:
   chunk_size_grid: 16000
-  view_pool: false
+  view_pooler_enabled: false
   sequence_autodecoder_args:
     n_instances: 20000
     encoding_dim: 256

projects/implicitron_trainer/configs/repro_multiseq_nerf_wce.yaml

@@ -5,6 +5,6 @@ defaults:
 clip_grad: 1.0
 generic_model_args:
   chunk_size_grid: 16000
-  view_pool: true
+  view_pooler_enabled: true
   raysampler_args:
     n_rays_per_image_sampled_from_mask: 850

projects/implicitron_trainer/configs/repro_multiseq_nerformer.yaml

@@ -4,7 +4,6 @@ defaults:
 - _self_
 generic_model_args:
   chunk_size_grid: 16000
-  view_pool: true
   raysampler_args:
     n_rays_per_image_sampled_from_mask: 800
     n_pts_per_ray_training: 32
@@ -13,4 +12,6 @@ generic_model_args:
     n_pts_per_ray_fine_training: 16
     n_pts_per_ray_fine_evaluation: 16
   implicit_function_class_type: NeRFormerImplicitFunction
-  feature_aggregator_class_type: IdentityFeatureAggregator
+  view_pooler_enabled: true
+  view_pooler_args:
+    feature_aggregator_class_type: IdentityFeatureAggregator

projects/implicitron_trainer/configs/repro_multiseq_nerformer_angle_w.yaml

@@ -4,7 +4,6 @@ defaults:
 - _self_
 generic_model_args:
   chunk_size_grid: 16000
-  view_pool: true
   raysampler_args:
     n_rays_per_image_sampled_from_mask: 800
     n_pts_per_ray_training: 32
@@ -13,4 +12,6 @@ generic_model_args:
     n_pts_per_ray_fine_training: 16
     n_pts_per_ray_fine_evaluation: 16
   implicit_function_class_type: NeRFormerImplicitFunction
-  feature_aggregator_class_type: AngleWeightedIdentityFeatureAggregator
+  view_pooler_enabled: true
+  view_pooler_args:
+    feature_aggregator_class_type: AngleWeightedIdentityFeatureAggregator

projects/implicitron_trainer/configs/repro_multiseq_srn_ad_hypernet.yaml

@@ -3,7 +3,7 @@ defaults:
 - _self_
 generic_model_args:
   chunk_size_grid: 16000
-  view_pool: false
+  view_pooler_enabled: false
   n_train_target_views: -1
   num_passes: 1
   loss_weights:

projects/implicitron_trainer/configs/repro_multiseq_srn_wce.yaml

@@ -4,7 +4,6 @@ defaults:
 - _self_
 generic_model_args:
   chunk_size_grid: 32000
-  view_pool: true
   num_passes: 1
   n_train_target_views: -1
   loss_weights:
@@ -25,6 +24,7 @@ generic_model_args:
     stratified_point_sampling_evaluation: false
   renderer_class_type: LSTMRenderer
   implicit_function_class_type: SRNImplicitFunction
+  view_pooler_enabled: true
 solver_args:
   breed: adam
   lr: 5.0e-05

projects/implicitron_trainer/configs/repro_singleseq_idr.yaml

@@ -9,7 +9,7 @@ generic_model_args:
     loss_eikonal: 0.1
   chunk_size_grid: 65536
   num_passes: 1
-  view_pool: false
+  view_pooler_enabled: false
   implicit_function_IdrFeatureField_args:
     n_harmonic_functions_xyz: 6
     bias: 0.6

projects/implicitron_trainer/configs/repro_singleseq_nerf_wce.yaml

@@ -4,6 +4,6 @@ defaults:
 - _self_
 generic_model_args:
   chunk_size_grid: 16000
-  view_pool: true
+  view_pooler_enabled: true
   raysampler_args:
     n_rays_per_image_sampled_from_mask: 850

projects/implicitron_trainer/configs/repro_singleseq_nerformer.yaml

@@ -4,7 +4,7 @@ defaults:
 - _self_
 generic_model_args:
   chunk_size_grid: 16000
-  view_pool: true
+  view_pooler_enabled: true
   implicit_function_class_type: NeRFormerImplicitFunction
   raysampler_args:
     n_rays_per_image_sampled_from_mask: 800
@@ -13,4 +13,5 @@ generic_model_args:
   renderer_MultiPassEmissionAbsorptionRenderer_args:
     n_pts_per_ray_fine_training: 16
     n_pts_per_ray_fine_evaluation: 16
-  feature_aggregator_class_type: IdentityFeatureAggregator
+  view_pooler_args:
+    feature_aggregator_class_type: IdentityFeatureAggregator

projects/implicitron_trainer/configs/repro_singleseq_srn.yaml

@@ -4,7 +4,7 @@ defaults:
 generic_model_args:
   num_passes: 1
   chunk_size_grid: 32000
-  view_pool: false
+  view_pooler_enabled: false
   loss_weights:
     loss_rgb_mse: 200.0
     loss_prev_stage_rgb_mse: 0.0

projects/implicitron_trainer/configs/repro_singleseq_srn_wce.yaml

@@ -5,7 +5,7 @@ defaults:
 generic_model_args:
   num_passes: 1
   chunk_size_grid: 32000
-  view_pool: true
+  view_pooler_enabled: true
   loss_weights:
     loss_rgb_mse: 200.0
     loss_prev_stage_rgb_mse: 0.0