Node dynamic size updates

Author: demoulinv

meshroom/SPAR3D/SPAR3D.py

@@ -1,30 +1,9 @@
-__version__ = "1.0"
+__version__ = "2.0"
 
 from re import M
 from meshroom.core import desc
 from meshroom.core.utils import VERBOSE_LEVEL
-
-class SPAR3DNodeSize(desc.MultiDynamicNodeSize):
-    def computeSize(self, node):
-        from pathlib import Path
-        import itertools
-
-        input_path_param = node.attribute(self._params[0])
-        extension_param = node.attribute(self._params[1])
-
-        input_path = input_path_param.value
-        extension = extension_param.value
-        include_suffixes = [extension.lower(), extension.upper()]
-
-        size = 1
-        if Path(input_path).is_dir():
-            image_paths = list(itertools.chain(*(Path(input_path).glob(f'*.{suffix}') for suffix in include_suffixes)))
-            size = len(image_paths)
-        elif node.attribute(self._params[0]).isLink:
-            size = node.attribute(self._params[0]).inputLink.node.size
-        
-        return size
-
+from pyalicevision import parallelization as avpar
 
 class SPAR3DBlockSize(desc.Parallelization):
     def getSizes(self, node):
@@ -44,25 +23,16 @@ class SPAR3D(desc.Node):
 
     gpu = desc.Level.INTENSIVE
 
-    size = SPAR3DNodeSize(['inputImages', 'inputExtension'])
+    size = avpar.DynamicViewsSize("inputImages")
     parallelization = SPAR3DBlockSize()
 
     inputs = [
         desc.File(
             name="inputImages",
             label="Input Images",
-            description="Input images to estimate the depth from. Folder path or sfmData filepath",
+            description="sfmData filepath",
             value="",
         ),
-        desc.ChoiceParam(
-            name="inputExtension",
-            label="Input Extension",
-            description="Extension of the input images. This will be used to determine which images are to be used if \n"
-                        "a directory is provided as the input.",
-            values=["jpg", "jpeg", "png", "exr"],
-            value="jpg",
-            exclusive=True,
-        ),
         desc.IntParam(
             name="textureResolution",
             label="Texture Resolution",
@@ -143,10 +113,9 @@ class SPAR3D(desc.Node):
     ]
 
     def preprocess(self, node):
-        extension = node.inputExtension.value
         input_path = node.inputImages.value
 
-        image_paths = get_image_paths_list(input_path, extension)
+        image_paths = get_image_paths_list(input_path)
 
         if len(image_paths) == 0:
             raise FileNotFoundError(f'No image files found in {input_path}')
@@ -163,7 +132,6 @@ def processChunk(self, chunk):
         from PIL import Image
 
         import torch
-        #from img_proc import image
         import os
         from contextlib import nullcontext
         import numpy as np
@@ -252,18 +220,14 @@ def processChunk(self, chunk):
         finally:
             chunk.logManager.end()
 
-def get_image_paths_list(input_path, extension):
+def get_image_paths_list(input_path):
     from pyalicevision import sfmData
     from pyalicevision import sfmDataIO
     from pathlib import Path
-    import itertools
 
-    include_suffixes = [extension.lower(), extension.upper()]
     image_paths = []
 
-    if Path(input_path).is_dir():
-        image_paths = sorted(itertools.chain(*(Path(input_path).glob(f'*.{suffix}') for suffix in include_suffixes)))
-    elif Path(input_path).suffix.lower() in [".sfm", ".abc"]:
+    if Path(input_path).suffix.lower() in [".sfm", ".abc"]:
         if Path(input_path).exists():
             dataAV = sfmData.SfMData()
             if sfmDataIO.load(dataAV, input_path, sfmDataIO.ALL):