Use only global variables

demo/mast3r_demo.py

@@ -112,7 +112,7 @@ def _convert_scene_output_to_glb(outfile, imgs, pts3d, mask, focals, cams2world,
     return outfile
 
 
-def get_3D_model_from_scene(silent, scene_state, min_conf_thr=2, as_pointcloud=False, mask_sky=False,
+def get_3D_model_from_scene(scene_state, min_conf_thr=2, as_pointcloud=False, mask_sky=False,
                             clean_depth=False, transparent_cams=False, cam_size=0.05, TSDF_thresh=0):
     """
     extract 3D_model (glb file) from a reconstructed scene
@@ -139,7 +139,7 @@ def get_3D_model_from_scene(silent, scene_state, min_conf_thr=2, as_pointcloud=F
     # torch.save(confs, '/app/data/confs.pt')
     msk = to_numpy([c > min_conf_thr for c in confs])
     return _convert_scene_output_to_glb(outfile, rgbimg, pts3d, msk, focals, cams2world, as_pointcloud=as_pointcloud,
-                                        transparent_cams=transparent_cams, cam_size=cam_size, silent=silent)
+                                        transparent_cams=transparent_cams, cam_size=cam_size, silent=SILENT)
 
 # def save_colmap_scene(scene, save_dir, min_conf_thr=2, clean_depth=False):
 #     if 'save_pointcloud_with_normals' not in globals():
@@ -177,7 +177,7 @@ def get_3D_model_from_scene(silent, scene_state, min_conf_thr=2, as_pointcloud=F
 #     return save_path
 
 @spaces.GPU(duration=10)
-def get_reconstructed_scene(outdir, model, device, silent, image_size, current_scene_state,
+def get_reconstructed_scene(image_size, current_scene_state,
                             filelist, optim_level, lr1, niter1, lr2, niter2, min_conf_thr, matching_conf_thr,
                             as_pointcloud, mask_sky, clean_depth, transparent_cams, cam_size, scenegraph_type, winsize,
                             win_cyclic, refid, TSDF_thresh, shared_intrinsics, **kw):
@@ -185,7 +185,7 @@ def get_reconstructed_scene(outdir, model, device, silent, image_size, current_s
     from a list of images, run mast3r inference, sparse global aligner.
     then run get_3D_model_from_scene
     """
-    imgs = load_images(filelist, size=image_size, verbose=not silent)
+    imgs = load_images(filelist, size=image_size, verbose=not SILENT)
     if len(imgs) == 1:
         imgs = [imgs[0], copy.deepcopy(imgs[0])]
         imgs[1]['idx'] = 1
@@ -203,7 +203,7 @@ def get_reconstructed_scene(outdir, model, device, silent, image_size, current_s
     if optim_level == 'coarse':
         niter2 = 0
 
-    base_cache_dir = os.path.join(outdir, 'cache')
+    base_cache_dir = os.path.join(CACHE_PATH, 'cache')
     os.makedirs(base_cache_dir, exist_ok=True)
     def get_next_dir(base_dir):
         run_counter = 0
@@ -217,11 +217,11 @@ def get_reconstructed_scene(outdir, model, device, silent, image_size, current_s
 
     cache_dir = get_next_dir(base_cache_dir)
     scene = sparse_global_alignment(filelist, pairs, cache_dir,
-                                    model, lr1=lr1, niter1=niter1, lr2=lr2, niter2=niter2, device=device,
+                                    MODEL, lr1=lr1, niter1=niter1, lr2=lr2, niter2=niter2, device=DEVICE,
                                     opt_depth='depth' in optim_level, shared_intrinsics=shared_intrinsics,
                                     matching_conf_thr=matching_conf_thr, **kw)
 
-    base_colmapdata_dir = os.path.join(outdir, 'colmap_data')
+    base_colmapdata_dir = os.path.join(CACHE_PATH, 'colmap_data')
     os.makedirs(base_colmapdata_dir, exist_ok=True)
     colmap_data_dir = get_next_dir(base_colmapdata_dir)
     # 
@@ -231,10 +231,10 @@ def get_reconstructed_scene(outdir, model, device, silent, image_size, current_s
        current_scene_state.outfile_name is not None:
         outfile_name = current_scene_state.outfile_name
     else:
-        outfile_name = tempfile.mktemp(suffix='_scene.glb', dir=outdir)
+        outfile_name = tempfile.mktemp(suffix='_scene.glb', dir=CACHE_PATH)
 
     scene_state = SparseGAState(scene, cache_dir, outfile_name)
-    outfile = get_3D_model_from_scene(silent, scene_state, min_conf_thr, as_pointcloud, mask_sky,
+    outfile = get_3D_model_from_scene(scene_state, min_conf_thr, as_pointcloud, mask_sky,
                                       clean_depth, transparent_cams, cam_size, TSDF_thresh)
     print(f"colmap_data_dir: {colmap_data_dir}")
     print(f"outfile_name: {outfile_name}")
@@ -268,11 +268,11 @@ def set_scenegraph_options(inputfiles, win_cyclic, refid, scenegraph_type):
     return win_col, winsize, win_cyclic, refid
 
 
-def get_reconstructed_scene_wrapper_func(*args, **kwargs):
-    return get_reconstructed_scene(CACHE_PATH, MODEL, DEVICE, SILENT, *args, **kwargs)
+# def get_reconstructed_scene_wrapper_func(*args, **kwargs):
+#     return get_reconstructed_scene(CACHE_PATH, MODEL, DEVICE, SILENT, *args, **kwargs)
 
-def update_3D_model_from_scene(*args, **kwargs):
-    return get_3D_model_from_scene(SILENT, *args, **kwargs)
+# def update_3D_model_from_scene(*args, **kwargs):
+#     return get_3D_model_from_scene(SILENT, *args, **kwargs)
 
 def mast3r_demo_tab():
     
@@ -345,38 +345,38 @@ def mast3r_demo_tab():
                               inputs=[inputfiles, win_cyclic, refid, scenegraph_type],
                               outputs=[win_col, winsize, win_cyclic, refid])
             run_btn.click(
-                fn=get_reconstructed_scene_wrapper_func,
+                fn=get_reconstructed_scene,
                 inputs=[image_size, scene, inputfiles, optim_level, lr1, niter1, lr2, niter2, min_conf_thr, matching_conf_thr,
                         as_pointcloud, mask_sky, clean_depth, transparent_cams, cam_size, scenegraph_type, winsize,
                         win_cyclic, refid, TSDF_thresh, shared_intrinsics],
                 outputs=[scene, outmodel]
             )
             min_conf_thr.release(
-                fn=update_3D_model_from_scene,
+                fn=get_3D_model_from_scene,
                 inputs=[scene, min_conf_thr, as_pointcloud, mask_sky, clean_depth, transparent_cams, cam_size, TSDF_thresh],
                 outputs=outmodel
             )
-            cam_size.change(fn=update_3D_model_from_scene,
+            cam_size.change(fn=get_3D_model_from_scene,
                             inputs=[scene, min_conf_thr, as_pointcloud, mask_sky,
                                     clean_depth, transparent_cams, cam_size, TSDF_thresh],
                             outputs=outmodel)
-            TSDF_thresh.change(fn=update_3D_model_from_scene,
+            TSDF_thresh.change(fn=get_3D_model_from_scene,
                                inputs=[scene, min_conf_thr, as_pointcloud, mask_sky,
                                        clean_depth, transparent_cams, cam_size, TSDF_thresh],
                                outputs=outmodel)
-            as_pointcloud.change(fn=update_3D_model_from_scene,
+            as_pointcloud.change(fn=get_3D_model_from_scene,
                                  inputs=[scene, min_conf_thr, as_pointcloud, mask_sky,
                                          clean_depth, transparent_cams, cam_size, TSDF_thresh],
                                  outputs=outmodel)
-            mask_sky.change(fn=update_3D_model_from_scene,
+            mask_sky.change(fn=get_3D_model_from_scene,
                             inputs=[scene, min_conf_thr, as_pointcloud, mask_sky,
                                     clean_depth, transparent_cams, cam_size, TSDF_thresh],
                             outputs=outmodel)
-            clean_depth.change(fn=update_3D_model_from_scene,
+            clean_depth.change(fn=get_3D_model_from_scene,
                                inputs=[scene, min_conf_thr, as_pointcloud, mask_sky,
                                        clean_depth, transparent_cams, cam_size, TSDF_thresh],
                                outputs=outmodel)
-            transparent_cams.change(fn=update_3D_model_from_scene,
+            transparent_cams.change(fn=get_3D_model_from_scene,
                                     inputs=[scene, min_conf_thr, as_pointcloud, mask_sky,
                                             clean_depth, transparent_cams, cam_size, TSDF_thresh],
                                     outputs=outmodel)