Merge pull request princeton-vl#298 from princeton-vl/f_misc_bugfix

Fix opt-out multistory, use action=append for cmdline configs

infinigen/datagen/manage_jobs.py

@@ -771,6 +771,7 @@ def main(args, shuffle=True, wandb_project="render", upload_commandfile_method=N
         "--specific_seed",
         default=None,
         nargs="+",
+        action="append",
         help="The default, None, will choose a random seed per scene. Otherwise, all "
         "scenes will have the specified seed. Interpreted as an integer if possible.",
     )
@@ -798,6 +799,7 @@ def main(args, shuffle=True, wandb_project="render", upload_commandfile_method=N
     parser.add_argument(
         "--configs",
         nargs="*",
+        action="append",
         default=[],
         help="List of gin config names to pass through to all underlying "
         "scene generation jobs.",
@@ -806,6 +808,7 @@ def main(args, shuffle=True, wandb_project="render", upload_commandfile_method=N
         "-p",
         "--overrides",
         nargs="+",
+        action="append",
         type=str,
         default=[],
         help="List of gin overrides to pass through to all underlying "
@@ -822,12 +825,14 @@ def main(args, shuffle=True, wandb_project="render", upload_commandfile_method=N
         "--pipeline_configs",
         type=str,
         nargs="+",
+        action="append",
         help="List of gin config names from tools/pipeline_configs "
         "to configure this execution",
     )
     parser.add_argument(
         "--pipeline_overrides",
         nargs="+",
+        action="append",
         type=str,
         default=[],
         help="List of gin overrides to configure this execution",

infinigen/tools/download_pregenerated_data.py

@@ -290,20 +290,23 @@ def main(args):
         "--seeds",
         type=str,
         nargs="+",
+        action="append",
         default=None,
         help="What scenes should we download? Omit to download all available in this release",
     )
     parser.add_argument(
         "--cameras",
         type=str,
         nargs="+",
+        action="append",
         default=None,
         help="What cameras should we download data for? Omit to download all available in this release",
     )
     parser.add_argument(
         "--data_types",
         type=str,
         nargs="+",
+        action="append",
         default=None,
         help="What data types (e.g Image, Depth, etc) should we download data for? Omit to download all available in this release",
     )

infinigen/tools/submit_asset_cache.py

@@ -26,6 +26,7 @@ def get_slurm_banned_nodes(config_path=None):
     "-a",
     "--assets",
     nargs="+",
+    action="append",
     default=[
         "CachedBushFactory",
         "CachedTreeFactory",

infinigen_examples/configs_indoor/base_indoors.gin

@@ -11,6 +11,8 @@ SimulatedAnnealingSolver.final_temp = 0.001
 SimulatedAnnealingSolver.finetune_pct = 0.15
 SimulatedAnnealingSolver.max_invalid_candidates = 5
 
+RoomConstants.n_stories = 1
+
 configure_render_cycles.num_samples = 16000
 
 animate_cameras.follow_poi_chance=0.0

infinigen_examples/configs_indoor/fast_solve.gin

@@ -1,6 +1,5 @@
 FloorPlanSolver.n_divide_trials = 25
 FloorPlanSolver.iters_mult = 25
-RoomConstants.n_stories = 1
 GraphMaker.fast=True
 
 home_room_constraints.fast = True

infinigen_examples/generate_individual_assets.py

@@ -485,8 +485,7 @@ def main(args):
 
     if len(factories) == 1 and factories[0].endswith(".txt"):
         factories = [
-            f.split(".")[-1] 
-            for f in load_txt_list(factories[0], skip_sharp=False)
+            f.split(".")[-1] for f in load_txt_list(factories[0], skip_sharp=False)
         ]
     else:
         assert not any(f.endswith(".txt") for f in factories)
@@ -672,13 +671,15 @@ def make_args():
         "--configs",
         type=str,
         nargs="+",
+        action="append",
         default=[],
         help="List of gin config files to apply",
     )
     parser.add_argument(
         "--overrides",
         type=str,
         nargs="+",
+        action="append",
         default=[],
         help="List of gin overrides to apply",
     )

infinigen_examples/generate_indoors.py

@@ -522,6 +522,7 @@ def main(args):
         "-t",
         "--task",
         nargs="+",
+        action="append",
         default=["coarse"],
         choices=[
             "coarse",
@@ -537,14 +538,16 @@ def main(args):
         "-g",
         "--configs",
         nargs="+",
-        default=["base"],
+        action="append",
+        default=[],
         help="Set of config files for gin (separated by spaces) "
         "e.g. --gin_config file1 file2 (exclude .gin from path)",
     )
     parser.add_argument(
         "-p",
         "--overrides",
         nargs="+",
+        action="append",
         default=[],
         help="Parameter settings that override config defaults "
         "e.g. --gin_param module_1.a=2 module_2.b=3",

infinigen_examples/generate_nature.py

@@ -982,6 +982,7 @@ def main(args):
         "-t",
         "--task",
         nargs="+",
+        action="append",
         default=["coarse"],
         choices=[
             "coarse",
@@ -997,6 +998,7 @@ def main(args):
         "-g",
         "--configs",
         nargs="+",
+        action="append",
         default=["base"],
         help="Set of config files for gin (separated by spaces) "
         "e.g. --gin_config file1 file2 (exclude .gin from path)",
@@ -1005,6 +1007,7 @@ def main(args):
         "-p",
         "--overrides",
         nargs="+",
+        action="append",
         default=[],
         help="Parameter settings that override config defaults "
         "e.g. --gin_param module_1.a=2 module_2.b=3",