Merge pull request #2203 from alicevision/dev/depthMapParallelization

[nodes] DepthMap: increase size of blocks
alicevision · Oct 5, 2023 · 11333e3 · 11333e3
2 parents dd04767 + 2473f02
commit 11333e3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/meshroom/nodes/aliceVision/DepthMap.py b/meshroom/nodes/aliceVision/DepthMap.py
@@ -1,4 +1,4 @@
-__version__ = "4.0"
+__version__ = "5.0"
 
 from meshroom.core import desc
 
@@ -7,7 +7,7 @@ class DepthMap(desc.AVCommandLineNode):
     commandLine = 'aliceVision_depthMapEstimation {allParams}'
     gpu = desc.Level.INTENSIVE
     size = desc.DynamicNodeSize('input')
-    parallelization = desc.Parallelization(blockSize=3)
+    parallelization = desc.Parallelization(blockSize=12)
     commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'
 
     category = 'Dense Reconstruction'

diff --git a/meshroom/nodes/aliceVision/DepthMapFilter.py b/meshroom/nodes/aliceVision/DepthMapFilter.py
@@ -1,4 +1,4 @@
-__version__ = "3.0"
+__version__ = "4.0"
 
 from meshroom.core import desc
 
@@ -7,7 +7,7 @@ class DepthMapFilter(desc.AVCommandLineNode):
     commandLine = 'aliceVision_depthMapFiltering {allParams}'
     gpu = desc.Level.NORMAL
     size = desc.DynamicNodeSize('input')
-    parallelization = desc.Parallelization(blockSize=10)
+    parallelization = desc.Parallelization(blockSize=24)
     commandLineRange = '--rangeStart {rangeStart} --rangeSize {rangeBlockSize}'
 
     category = 'Dense Reconstruction'
@@ -23,7 +23,7 @@ class DepthMapFilter(desc.AVCommandLineNode):
             description="SfMData file.",
             value="",
             uid=[0],
-        ),    
+        ),
         desc.File(
             name="depthMapsFolder",
             label="Depth Maps Folder",

diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg
@@ -12,7 +12,7 @@
             "MeshFiltering": "3.0",
             "SfMTransfer": "2.1",
             "Publish": "1.3",
-            "DepthMapFilter": "3.0",
+            "DepthMapFilter": "4.0",
             "Meshing": "7.0",
             "ImageMatchingMultiSfM": "1.0",
             "ScenePreview": "2.0",
@@ -28,7 +28,7 @@
             "DistortionCalibration": "3.0",
             "ExportDistortion": "1.0",
             "FeatureExtraction": "1.3",
-            "DepthMap": "4.0",
+            "DepthMap": "5.0",
             "Texturing": "6.0"
         }
     },
@@ -512,4 +512,4 @@
             }
         }
     }
-}
+}
diff --git a/meshroom/pipelines/photogrammetry.mg b/meshroom/pipelines/photogrammetry.mg
@@ -5,9 +5,9 @@
         "fileVersion": "1.1",
         "template": true,
         "nodesVersions": {
-            "DepthMapFilter": "3.0",
+            "DepthMapFilter": "4.0",
             "Meshing": "7.0",
-            "DepthMap": "4.0",
+            "DepthMap": "5.0",
             "FeatureExtraction": "1.2",
             "PrepareDenseScene": "3.0",
             "CameraInit": "9.0",
@@ -159,4 +159,4 @@
             }
         }
     }
-}
+}
diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg
@@ -11,7 +11,7 @@
             "PrepareDenseScene": "3.1",
             "Publish": "1.3",
             "MeshFiltering": "3.0",
-            "DepthMapFilter": "3.0",
+            "DepthMapFilter": "4.0",
             "Meshing": "7.0",
             "ImageMatchingMultiSfM": "1.0",
             "ScenePreview": "2.0",
@@ -26,7 +26,7 @@
             "DistortionCalibration": "3.0",
             "ExportDistortion": "1.0",
             "FeatureExtraction": "1.3",
-            "DepthMap": "4.0",
+            "DepthMap": "5.0",
             "Texturing": "6.0"
         }
     },
@@ -584,4 +584,4 @@
             }
         }
     }
-}
+}