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

[panorama] New option to disable compositing tiling #1916

Merged
merged 2 commits into from
Mar 5, 2023
Merged

[panorama] New option to disable compositing tiling #1916

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
885e776
disable compositing tiling
servantftechnicolor Mar 3, 2023
e3f9570
[panorama] update pipelines with useTiling option
fabiencastan Mar 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
7 changes: 7 additions & 0 deletions meshroom/nodes/aliceVision/PanoramaCompositing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ class PanoramaCompositing(desc.AVCommandLineNode):
uid=[],
advanced=True,
),
desc.BoolParam(
name='useTiling',
label='Use tiling',
description='''Enable tiling mode for parallelization''',
value=True,
uid=[0],
),
desc.ChoiceParam(
name='storageDataType',
label='Storage Data Type',
Expand Down
7 changes: 7 additions & 0 deletions meshroom/nodes/aliceVision/PanoramaMerging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ class PanoramaMerging(desc.AVCommandLineNode):
uid=[0],
group='', # not part of allParams, as this is not a parameter for the command line
),
desc.BoolParam(
name='useTiling',
label='Use tiling',
description='''Enable tiling mode for parallelization''',
value=True,
uid=[0],
),
desc.ChoiceParam(
name='storageDataType',
label='Storage Data Type',
Expand Down
6 changes: 4 additions & 2 deletions meshroom/pipelines/panoramaFisheyeHdr.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@
"PanoramaMerging_1": {
"inputs": {
"compositingFolder": "{PanoramaCompositing_1.output}",
"input": "{PanoramaCompositing_1.input}"
"input": "{PanoramaCompositing_1.input}",
"useTiling": "{PanoramaCompositing_1.useTiling}"
},
"nodeType": "PanoramaMerging",
"position": [
Expand All @@ -119,7 +120,8 @@
"inputs": {
"warpingFolder": "{PanoramaSeams_1.warpingFolder}",
"labels": "{PanoramaSeams_1.output}",
"input": "{PanoramaSeams_1.outputSfm}"
"input": "{PanoramaSeams_1.outputSfm}",
"useTiling": false
},
"nodeType": "PanoramaCompositing",
"position": [
Expand Down
3 changes: 2 additions & 1 deletion meshroom/pipelines/panoramaHdr.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@
"PanoramaMerging_1": {
"inputs": {
"compositingFolder": "{PanoramaCompositing_1.output}",
"input": "{PanoramaCompositing_1.input}"
"input": "{PanoramaCompositing_1.input}",
"useTiling": "{PanoramaCompositing_1.useTiling}"
},
"nodeType": "PanoramaMerging",
"position": [
Expand Down