Merge pull request princeton-vl#297 from princeton-vl/bugfix_indiv_sl…

…urm_configs

Fix individual_assets slurm jobs not recieving gin configs

docs/CHANGELOG.md

@@ -119,4 +119,12 @@ v1.8.3
 v1.9.0
 - Add CoPlanar indoor constraint, fix backwards tvs/monitors/sinks
 - Fix empty scene / null objects selected during export
-- Add full system visual check / integration script
+- Add full system visual check / integration script
+
+v1.9.1
+- Fix alignment of windows
+- Fix wall materials not being deterministic w.r.t random seed
+- Fix gin configs not correctly passed to slurm jobs in generate_individual_assets
+- Fix integration test image titles 
+- Fix integration test asset image alignment
+- Make multistory houses disabled by default

infinigen/__init__.py

@@ -6,7 +6,7 @@
 import logging
 from pathlib import Path
 
-__version__ = "1.9.0"
+__version__ = "1.9.1"
 
 
 def repo_root():

infinigen/datagen/manage_jobs.py

@@ -679,7 +679,7 @@ def manage_datagen_jobs(all_scenes, elapsed, num_concurrent, disk_sleep_threshol
         print(message)
         if wandb is not None:
             wandb.alert(
-                title=f"{args.output_folder} full",
+                title=f"{args.output_folder.name} sleeping for full disk",
                 text=message,
                 wait_duration=3 * 60 * 60,
             )

infinigen/datagen/util/show_gpu_table.py

@@ -35,7 +35,7 @@ def get_gpu_nodes():
     for line in sinfo_output.splitlines():
         node, group, gres, totalmem = line.split()
         if group != "all":
-            if group in {"pvl", "cs*"}:
+            if group in {"pvl", "cs*", "pnlp"}:
                 num_cpus = int(cpu_regex(gres).group(1))
                 shared_node_mem[node] = int((int(totalmem) / 1024) / num_cpus)
             if gres_regex(gres):

infinigen_examples/generate_individual_assets.py

@@ -236,6 +236,25 @@ def build_and_save_asset(payload: dict):
 
     output_folder.mkdir(exist_ok=True)
 
+    init.apply_gin_configs(
+        ["infinigen_examples/configs_indoor", "infinigen_examples/configs_nature"],
+        configs=args.configs,
+        overrides=args.overrides,
+        skip_unknown=True,
+    )
+
+    if args.debug is not None:
+        for name in logging.root.manager.loggerDict:
+            if not name.startswith("infinigen"):
+                continue
+            if len(args.debug) == 0 or any(name.endswith(x) for x in args.debug):
+                logging.getLogger(name).setLevel(logging.DEBUG)
+
+    init.configure_blender()
+
+    if args.gpu:
+        init.configure_render_cycles()
+
     logger.info(f"Building scene for {factory_name} {idx}")
 
     if args.seed > 0:
@@ -454,25 +473,6 @@ def mapfunc(
 def main(args):
     bpy.context.window.workspace = bpy.data.workspaces["Geometry Nodes"]
 
-    init.apply_gin_configs(
-        ["infinigen_examples/configs_indoor", "infinigen_examples/configs_nature"],
-        configs=args.configs,
-        overrides=args.overrides,
-        skip_unknown=True,
-    )
-
-    if args.debug is not None:
-        for name in logging.root.manager.loggerDict:
-            if not name.startswith("infinigen"):
-                continue
-            if len(args.debug) == 0 or any(name.endswith(x) for x in args.debug):
-                logging.getLogger(name).setLevel(logging.DEBUG)
-
-    init.configure_blender()
-
-    if args.gpu:
-        init.configure_render_cycles()
-
     if args.output_folder is None:
         outputs = Path("outputs")
         assert outputs.exists(), outputs