-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace pluggable components to create a proper Configurable hierarchy.
Summary: This large diff rewrites a significant portion of Implicitron's config hierarchy. The new hierarchy, and some of the default implementation classes, are as follows: ``` Experiment data_source: ImplicitronDataSource dataset_map_provider data_loader_map_provider model_factory: ImplicitronModelFactory model: GenericModel optimizer_factory: ImplicitronOptimizerFactory training_loop: ImplicitronTrainingLoop evaluator: ImplicitronEvaluator ``` 1) Experiment (used to be ExperimentConfig) is now a top-level Configurable and contains as members mainly (mostly new) high-level factory Configurables. 2) Experiment's job is to run factories, do some accelerate setup and then pass the results to the main training loop. 3) ImplicitronOptimizerFactory and ImplicitronModelFactory are new high-level factories that create the optimizer, scheduler, model, and stats objects. 4) TrainingLoop is a new configurable that runs the main training loop and the inner train-validate step. 5) Evaluator is a new configurable that TrainingLoop uses to run validation/test steps. 6) GenericModel is not the only model choice anymore. Instead, ImplicitronModelBase (by default instantiated with GenericModel) is a member of Experiment and can be easily replaced by a custom implementation by the user. All the new Configurables are children of ReplaceableBase, and can be easily replaced with custom implementations. In addition, I added support for the exponential LR schedule, updated the config files and the test, as well as added a config file that reproduces NERF results and a test to run the repro experiment. Reviewed By: bottler Differential Revision: D37723227 fbshipit-source-id: b36bee880d6aa53efdd2abfaae4489d8ab1e8a27
- Loading branch information
1 parent
6b48159
commit 1b0584f
Showing
42 changed files
with
2,050 additions
and
1,483 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 18 additions & 17 deletions
35
projects/implicitron_trainer/configs/repro_feat_extractor_normed.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
generic_model_args: | ||
image_feature_extractor_class_type: ResNetFeatureExtractor | ||
image_feature_extractor_ResNetFeatureExtractor_args: | ||
add_images: true | ||
add_masks: true | ||
first_max_pool: true | ||
image_rescale: 0.375 | ||
l2_norm: true | ||
name: resnet34 | ||
normalize_image: true | ||
pretrained: true | ||
stages: | ||
- 1 | ||
- 2 | ||
- 3 | ||
- 4 | ||
proj_dim: 32 | ||
model_factory_ImplicitronModelFactory_args: | ||
model_GenericModel_args: | ||
image_feature_extractor_class_type: ResNetFeatureExtractor | ||
image_feature_extractor_ResNetFeatureExtractor_args: | ||
add_images: true | ||
add_masks: true | ||
first_max_pool: true | ||
image_rescale: 0.375 | ||
l2_norm: true | ||
name: resnet34 | ||
normalize_image: true | ||
pretrained: true | ||
stages: | ||
- 1 | ||
- 2 | ||
- 3 | ||
- 4 | ||
proj_dim: 32 |
35 changes: 18 additions & 17 deletions
35
projects/implicitron_trainer/configs/repro_feat_extractor_transformer.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
generic_model_args: | ||
image_feature_extractor_class_type: ResNetFeatureExtractor | ||
image_feature_extractor_ResNetFeatureExtractor_args: | ||
add_images: true | ||
add_masks: true | ||
first_max_pool: false | ||
image_rescale: 0.375 | ||
l2_norm: true | ||
name: resnet34 | ||
normalize_image: true | ||
pretrained: true | ||
stages: | ||
- 1 | ||
- 2 | ||
- 3 | ||
- 4 | ||
proj_dim: 16 | ||
model_factory_ImplicitronModelFactory_args: | ||
model_GenericModel_args: | ||
image_feature_extractor_class_type: ResNetFeatureExtractor | ||
image_feature_extractor_ResNetFeatureExtractor_args: | ||
add_images: true | ||
add_masks: true | ||
first_max_pool: false | ||
image_rescale: 0.375 | ||
l2_norm: true | ||
name: resnet34 | ||
normalize_image: true | ||
pretrained: true | ||
stages: | ||
- 1 | ||
- 2 | ||
- 3 | ||
- 4 | ||
proj_dim: 16 |
37 changes: 19 additions & 18 deletions
37
projects/implicitron_trainer/configs/repro_feat_extractor_unnormed.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,19 @@ | ||
generic_model_args: | ||
image_feature_extractor_class_type: ResNetFeatureExtractor | ||
image_feature_extractor_ResNetFeatureExtractor_args: | ||
stages: | ||
- 1 | ||
- 2 | ||
- 3 | ||
first_max_pool: false | ||
proj_dim: -1 | ||
l2_norm: false | ||
image_rescale: 0.375 | ||
name: resnet34 | ||
normalize_image: true | ||
pretrained: true | ||
view_pooler_args: | ||
feature_aggregator_AngleWeightedReductionFeatureAggregator_args: | ||
reduction_functions: | ||
- AVG | ||
model_factory_ImplicitronModelFactory_args: | ||
model_GenericModel_args: | ||
image_feature_extractor_class_type: ResNetFeatureExtractor | ||
image_feature_extractor_ResNetFeatureExtractor_args: | ||
stages: | ||
- 1 | ||
- 2 | ||
- 3 | ||
first_max_pool: false | ||
proj_dim: -1 | ||
l2_norm: false | ||
image_rescale: 0.375 | ||
name: resnet34 | ||
normalize_image: true | ||
pretrained: true | ||
view_pooler_args: | ||
feature_aggregator_AngleWeightedReductionFeatureAggregator_args: | ||
reduction_functions: | ||
- AVG |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 56 additions & 55 deletions
111
projects/implicitron_trainer/configs/repro_multiseq_idr_ad.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,65 +1,66 @@ | ||
defaults: | ||
- repro_multiseq_base.yaml | ||
- _self_ | ||
generic_model_args: | ||
loss_weights: | ||
loss_mask_bce: 100.0 | ||
loss_kl: 0.0 | ||
loss_rgb_mse: 1.0 | ||
loss_eikonal: 0.1 | ||
chunk_size_grid: 65536 | ||
num_passes: 1 | ||
output_rasterized_mc: true | ||
sampling_mode_training: mask_sample | ||
global_encoder_class_type: SequenceAutodecoder | ||
global_encoder_SequenceAutodecoder_args: | ||
autodecoder_args: | ||
n_instances: 20000 | ||
init_scale: 1.0 | ||
encoding_dim: 256 | ||
implicit_function_IdrFeatureField_args: | ||
n_harmonic_functions_xyz: 6 | ||
bias: 0.6 | ||
d_in: 3 | ||
d_out: 1 | ||
dims: | ||
- 512 | ||
- 512 | ||
- 512 | ||
- 512 | ||
- 512 | ||
- 512 | ||
- 512 | ||
- 512 | ||
geometric_init: true | ||
pooled_feature_dim: 0 | ||
skip_in: | ||
- 6 | ||
weight_norm: true | ||
renderer_SignedDistanceFunctionRenderer_args: | ||
ray_tracer_args: | ||
line_search_step: 0.5 | ||
line_step_iters: 3 | ||
n_secant_steps: 8 | ||
n_steps: 100 | ||
object_bounding_sphere: 8.0 | ||
sdf_threshold: 5.0e-05 | ||
ray_normal_coloring_network_args: | ||
d_in: 9 | ||
d_out: 3 | ||
model_factory_ImplicitronModelFactory_args: | ||
model_GenericModel_args: | ||
loss_weights: | ||
loss_mask_bce: 100.0 | ||
loss_kl: 0.0 | ||
loss_rgb_mse: 1.0 | ||
loss_eikonal: 0.1 | ||
chunk_size_grid: 65536 | ||
num_passes: 1 | ||
output_rasterized_mc: true | ||
sampling_mode_training: mask_sample | ||
global_encoder_class_type: SequenceAutodecoder | ||
global_encoder_SequenceAutodecoder_args: | ||
autodecoder_args: | ||
n_instances: 20000 | ||
init_scale: 1.0 | ||
encoding_dim: 256 | ||
implicit_function_IdrFeatureField_args: | ||
n_harmonic_functions_xyz: 6 | ||
bias: 0.6 | ||
d_in: 3 | ||
d_out: 1 | ||
dims: | ||
- 512 | ||
- 512 | ||
- 512 | ||
- 512 | ||
mode: idr | ||
n_harmonic_functions_dir: 4 | ||
- 512 | ||
- 512 | ||
- 512 | ||
- 512 | ||
geometric_init: true | ||
pooled_feature_dim: 0 | ||
skip_in: | ||
- 6 | ||
weight_norm: true | ||
raysampler_AdaptiveRaySampler_args: | ||
n_rays_per_image_sampled_from_mask: 1024 | ||
n_pts_per_ray_training: 0 | ||
n_pts_per_ray_evaluation: 0 | ||
scene_extent: 8.0 | ||
renderer_class_type: SignedDistanceFunctionRenderer | ||
implicit_function_class_type: IdrFeatureField | ||
renderer_SignedDistanceFunctionRenderer_args: | ||
ray_tracer_args: | ||
line_search_step: 0.5 | ||
line_step_iters: 3 | ||
n_secant_steps: 8 | ||
n_steps: 100 | ||
object_bounding_sphere: 8.0 | ||
sdf_threshold: 5.0e-05 | ||
ray_normal_coloring_network_args: | ||
d_in: 9 | ||
d_out: 3 | ||
dims: | ||
- 512 | ||
- 512 | ||
- 512 | ||
- 512 | ||
mode: idr | ||
n_harmonic_functions_dir: 4 | ||
pooled_feature_dim: 0 | ||
weight_norm: true | ||
raysampler_AdaptiveRaySampler_args: | ||
n_rays_per_image_sampled_from_mask: 1024 | ||
n_pts_per_ray_training: 0 | ||
n_pts_per_ray_evaluation: 0 | ||
scene_extent: 8.0 | ||
renderer_class_type: SignedDistanceFunctionRenderer | ||
implicit_function_class_type: IdrFeatureField |
Oops, something went wrong.