Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nodes] DepthMap: increase size of blocks #2203

Merged
merged 2 commits into from
Oct 5, 2023
Merged

[nodes] DepthMap: increase size of blocks #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e7894
[nodes] DepthMap: increase size of blocks
fabiencastan Sep 21, 2023
2473f02
[pipelines] Update `DepthMap` and `DepthMapFilter` versions
cbentejac Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meshroom/nodes/aliceVision/DepthMap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "4.0"
__version__ = "5.0"

from meshroom.core import desc

Expand All @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions meshroom/nodes/aliceVision/DepthMapFilter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "3.0"
__version__ = "4.0"

from meshroom.core import desc

Expand All @@ -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'
Expand All @@ -23,7 +23,7 @@ class DepthMapFilter(desc.AVCommandLineNode):
description="SfMData file.",
value="",
uid=[0],
),
),
desc.File(
name="depthMapsFolder",
label="Depth Maps Folder",
Expand Down
6 changes: 3 additions & 3 deletions meshroom/pipelines/cameraTracking.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -28,7 +28,7 @@
"DistortionCalibration": "3.0",
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"DepthMap": "4.0",
"DepthMap": "5.0",
"Texturing": "6.0"
}
},
Expand Down Expand Up @@ -512,4 +512,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions meshroom/pipelines/photogrammetry.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -159,4 +159,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions meshroom/pipelines/photogrammetryAndCameraTracking.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -26,7 +26,7 @@
"DistortionCalibration": "3.0",
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"DepthMap": "4.0",
"DepthMap": "5.0",
"Texturing": "6.0"
}
},
Expand Down Expand Up @@ -584,4 +584,4 @@
}
}
}
}
}