From 07f061843ce324cec7b5b8198fa1778b6a581cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Fri, 21 Oct 2022 17:08:36 +0200 Subject: [pipelines] Remove obsolete keys from all templates Outputs, internal folder and parallelization parameters are not used anymore in templates. The existing templates are updated accordingly. --- meshroom/pipelines/cameraTracking.mg | 102 +---------- meshroom/pipelines/panoramaFisheyeHdr.mg | 199 +++------------------ meshroom/pipelines/panoramaHdr.mg | 199 +++------------------ meshroom/pipelines/photogrammetry.mg | 132 ++------------ .../pipelines/photogrammetryAndCameraTracking.mg | 139 ++------------ meshroom/pipelines/photogrammetryDraft.mg | 94 +--------- 6 files changed, 90 insertions(+), 775 deletions(-) diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg index b5bdbf21..40b5e9d9 100644 --- a/meshroom/pipelines/cameraTracking.mg +++ b/meshroom/pipelines/cameraTracking.mg @@ -20,22 +20,10 @@ "input": "{CameraInit_1.output}" }, "nodeType": "DistortionCalibration", - "uids": { - "0": "8afea9d171904cdb6ba1c0b116cb60de3ccb6fb4" - }, - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "outSfMData": "{cache}/{nodeType}/{uid0}/sfmData.sfm" - }, "position": [ 200, 160 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageMatching_1": { "inputs": { @@ -47,44 +35,20 @@ ] }, "nodeType": "ImageMatching", - "uids": { - "0": "832b744de5fa804d7d63ea255419b1afaf24f723" - }, - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/imageMatches.txt" - }, "position": [ 400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureExtraction_1": { "inputs": { "input": "{CameraInit_1.output}" }, "nodeType": "FeatureExtraction", - "uids": { - "0": "a07fb8d05b63327d05461954c2fd2a00f201275b" - }, - "parallelization": { - "blockSize": 40, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "StructureFromMotion_1": { "inputs": { @@ -100,68 +64,28 @@ "minAngleForTriangulation": 1.0 }, "nodeType": "StructureFromMotion", - "uids": { - "0": "28715b8d4a51e5a90fbfee17d9eb193262116845" - }, - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/sfm.abc", - "extraInfoFolder": "{cache}/{nodeType}/{uid0}/", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ExportAnimatedCamera_1": { "inputs": { "input": "{StructureFromMotion_1.output}" }, "nodeType": "ExportAnimatedCamera", - "uids": { - "0": "65b4d273f9b9c6a177a8f586b1f9a085f3430133" - }, - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 1 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/", - "outputUndistorted": "{cache}/{nodeType}/{uid0}/undistort", - "outputCamera": "{cache}/{nodeType}/{uid0}/camera.abc" - }, "position": [ 1000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "CameraInit_1": { "inputs": {}, "nodeType": "CameraInit", - "uids": { - "0": "f9436e97e444fa71a05aa5cf7639b206df8ba282" - }, - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ 0, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureMatching_1": { "inputs": { @@ -171,22 +95,10 @@ "featuresFolders": "{ImageMatching_1.featuresFolders}" }, "nodeType": "FeatureMatching", - "uids": { - "0": "d6266b2126948174744b0ff6c33d96440e7596de" - }, - "parallelization": { - "blockSize": 20, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] } } } \ No newline at end of file diff --git a/meshroom/pipelines/panoramaFisheyeHdr.mg b/meshroom/pipelines/panoramaFisheyeHdr.mg index 4008bc19..e05afcc1 100644 --- a/meshroom/pipelines/panoramaFisheyeHdr.mg +++ b/meshroom/pipelines/panoramaFisheyeHdr.mg @@ -32,19 +32,10 @@ "response": "{LdrToHdrCalibration_1.response}" }, "nodeType": "LdrToHdrMerge", - "parallelization": { - "blockSize": 2, - "split": 0, - "size": 0 - }, - "outputs": { - "outSfMData": "{cache}/{nodeType}/{uid0}/sfmData.sfm" - }, "position": [ 800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageProcessing_1": { "inputs": { @@ -54,39 +45,20 @@ "fixNonFinite": true }, "nodeType": "ImageProcessing", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/", - "outputImages": "{cache}/{nodeType}/{uid0}/panorama.exr" - }, "position": [ 3000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaWarping_1": { "inputs": { "input": "{SfMTransform_1.output}" }, "nodeType": "PanoramaWarping", - "parallelization": { - "blockSize": 5, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 2200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "LdrToHdrCalibration_1": { "inputs": { @@ -97,38 +69,20 @@ "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}" }, "nodeType": "LdrToHdrCalibration", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "response": "{cache}/{nodeType}/{uid0}/response.csv" - }, "position": [ 600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "LdrToHdrSampling_1": { "inputs": { "input": "{PanoramaPrepareImages_1.output}" }, "nodeType": "LdrToHdrSampling", - "parallelization": { - "blockSize": 2, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageMatching_1": { "inputs": { @@ -139,19 +93,10 @@ ] }, "nodeType": "ImageMatching", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/imageMatches.txt" - }, "position": [ 1400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureExtraction_1": { "inputs": { @@ -163,39 +108,21 @@ "describerPreset": "high" }, "nodeType": "FeatureExtraction", - "parallelization": { - "blockSize": 40, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 1000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, - "PanoramaMerging_1": { + "PanoramaSeams_1": { "inputs": { - "compositingFolder": "{PanoramaCompositing_1.output}", - "input": "{PanoramaCompositing_1.input}" - }, - "nodeType": "PanoramaMerging", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "outputPanorama": "{cache}/{nodeType}/{uid0}/panorama.{outputFileTypeValue}" + "input": "{PanoramaWarping_1.input}", + "warpingFolder": "{PanoramaWarping_1.output}" }, + "nodeType": "PanoramaSeams", "position": [ - 2800, + 2400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaCompositing_1": { "inputs": { @@ -204,19 +131,10 @@ "input": "{PanoramaSeams_1.input}" }, "nodeType": "PanoramaCompositing", - "parallelization": { - "blockSize": 5, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 2600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "CameraInit_1": { "inputs": { @@ -232,38 +150,20 @@ ] }, "nodeType": "CameraInit", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ 0, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaPrepareImages_1": { "inputs": { "input": "{CameraInit_1.output}" }, "nodeType": "PanoramaPrepareImages", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ 200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "SfMTransform_1": { "inputs": { @@ -271,40 +171,21 @@ "input": "{PanoramaEstimation_1.output}" }, "nodeType": "SfMTransform", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/panorama.abc", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 2000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, - "PanoramaSeams_1": { + "PanoramaMerging_1": { "inputs": { - "input": "{PanoramaWarping_1.input}", - "warpingFolder": "{PanoramaWarping_1.output}" - }, - "nodeType": "PanoramaSeams", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/labels.exr" + "compositingFolder": "{PanoramaCompositing_1.output}", + "input": "{PanoramaCompositing_1.input}" }, + "nodeType": "PanoramaMerging", "position": [ - 2400, + 2800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaEstimation_1": { "inputs": { @@ -316,20 +197,10 @@ "featuresFolders": "{FeatureMatching_1.featuresFolders}" }, "nodeType": "PanoramaEstimation", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/panorama.abc", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 1800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaInit_1": { "inputs": { @@ -340,19 +211,10 @@ "input": "{FeatureExtraction_1.input}" }, "nodeType": "PanoramaInit", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "outSfMData": "{cache}/{nodeType}/{uid0}/sfmData.sfm" - }, "position": [ 1200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureMatching_1": { "inputs": { @@ -362,19 +224,10 @@ "featuresFolders": "{ImageMatching_1.featuresFolders}" }, "nodeType": "FeatureMatching", - "parallelization": { - "blockSize": 20, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 1600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] } } } \ No newline at end of file diff --git a/meshroom/pipelines/panoramaHdr.mg b/meshroom/pipelines/panoramaHdr.mg index a2985e69..316b3b8d 100644 --- a/meshroom/pipelines/panoramaHdr.mg +++ b/meshroom/pipelines/panoramaHdr.mg @@ -32,19 +32,10 @@ "response": "{LdrToHdrCalibration_1.response}" }, "nodeType": "LdrToHdrMerge", - "parallelization": { - "blockSize": 2, - "split": 0, - "size": 0 - }, - "outputs": { - "outSfMData": "{cache}/{nodeType}/{uid0}/sfmData.sfm" - }, "position": [ 800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageProcessing_1": { "inputs": { @@ -54,39 +45,20 @@ "fixNonFinite": true }, "nodeType": "ImageProcessing", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/", - "outputImages": "{cache}/{nodeType}/{uid0}/panorama.exr" - }, "position": [ 3000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaWarping_1": { "inputs": { "input": "{SfMTransform_1.output}" }, "nodeType": "PanoramaWarping", - "parallelization": { - "blockSize": 5, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 2200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "LdrToHdrCalibration_1": { "inputs": { @@ -97,38 +69,20 @@ "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}" }, "nodeType": "LdrToHdrCalibration", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "response": "{cache}/{nodeType}/{uid0}/response.csv" - }, "position": [ 600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "LdrToHdrSampling_1": { "inputs": { "input": "{PanoramaPrepareImages_1.output}" }, "nodeType": "LdrToHdrSampling", - "parallelization": { - "blockSize": 2, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageMatching_1": { "inputs": { @@ -139,19 +93,10 @@ ] }, "nodeType": "ImageMatching", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/imageMatches.txt" - }, "position": [ 1400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureExtraction_1": { "inputs": { @@ -159,39 +104,21 @@ "input": "{LdrToHdrMerge_1.outSfMData}" }, "nodeType": "FeatureExtraction", - "parallelization": { - "blockSize": 40, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 1000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, - "PanoramaMerging_1": { + "PanoramaSeams_1": { "inputs": { - "compositingFolder": "{PanoramaCompositing_1.output}", - "input": "{PanoramaCompositing_1.input}" - }, - "nodeType": "PanoramaMerging", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "outputPanorama": "{cache}/{nodeType}/{uid0}/panorama.{outputFileTypeValue}" + "input": "{PanoramaWarping_1.input}", + "warpingFolder": "{PanoramaWarping_1.output}" }, + "nodeType": "PanoramaSeams", "position": [ - 2800, + 2400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaCompositing_1": { "inputs": { @@ -200,19 +127,10 @@ "input": "{PanoramaSeams_1.input}" }, "nodeType": "PanoramaCompositing", - "parallelization": { - "blockSize": 5, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 2600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "CameraInit_1": { "inputs": { @@ -228,38 +146,20 @@ ] }, "nodeType": "CameraInit", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ 0, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaPrepareImages_1": { "inputs": { "input": "{CameraInit_1.output}" }, "nodeType": "PanoramaPrepareImages", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ 200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "SfMTransform_1": { "inputs": { @@ -267,40 +167,21 @@ "input": "{PanoramaEstimation_1.output}" }, "nodeType": "SfMTransform", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/panorama.abc", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 2000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, - "PanoramaSeams_1": { + "PanoramaMerging_1": { "inputs": { - "input": "{PanoramaWarping_1.input}", - "warpingFolder": "{PanoramaWarping_1.output}" - }, - "nodeType": "PanoramaSeams", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/labels.exr" + "compositingFolder": "{PanoramaCompositing_1.output}", + "input": "{PanoramaCompositing_1.input}" }, + "nodeType": "PanoramaMerging", "position": [ - 2400, + 2800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaEstimation_1": { "inputs": { @@ -312,20 +193,10 @@ "featuresFolders": "{FeatureMatching_1.featuresFolders}" }, "nodeType": "PanoramaEstimation", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/panorama.abc", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 1800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PanoramaInit_1": { "inputs": { @@ -335,19 +206,10 @@ "input": "{FeatureExtraction_1.input}" }, "nodeType": "PanoramaInit", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "outSfMData": "{cache}/{nodeType}/{uid0}/sfmData.sfm" - }, "position": [ 1200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureMatching_1": { "inputs": { @@ -357,19 +219,10 @@ "featuresFolders": "{ImageMatching_1.featuresFolders}" }, "nodeType": "FeatureMatching", - "parallelization": { - "blockSize": 20, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 1600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] } } } \ No newline at end of file diff --git a/meshroom/pipelines/photogrammetry.mg b/meshroom/pipelines/photogrammetry.mg index e3bc25fe..72c54b56 100644 --- a/meshroom/pipelines/photogrammetry.mg +++ b/meshroom/pipelines/photogrammetry.mg @@ -26,22 +26,10 @@ "inputMesh": "{MeshFiltering_1.outputMesh}" }, "nodeType": "Texturing", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 1 - }, - "outputs": { - "outputTextures": "{cache}/{nodeType}/{uid0}/texture_*.exr", - "outputMesh": "{cache}/{nodeType}/{uid0}/texturedMesh.{outputMeshFileTypeValue}", - "outputMaterial": "{cache}/{nodeType}/{uid0}/texturedMesh.mtl", - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 2000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "Meshing_1": { "inputs": { @@ -49,20 +37,10 @@ "input": "{DepthMapFilter_1.input}" }, "nodeType": "Meshing", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 1 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/densePointCloud.abc", - "outputMesh": "{cache}/{nodeType}/{uid0}/mesh.{outputMeshFileTypeValue}" - }, "position": [ 1600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "DepthMapFilter_1": { "inputs": { @@ -70,21 +48,10 @@ "input": "{DepthMap_1.input}" }, "nodeType": "DepthMapFilter", - "parallelization": { - "blockSize": 10, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/", - "depth": "{cache}/{nodeType}/{uid0}/_depthMap.exr", - "sim": "{cache}/{nodeType}/{uid0}/_simMap.exr" - }, "position": [ 1400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageMatching_1": { "inputs": { @@ -94,38 +61,20 @@ ] }, "nodeType": "ImageMatching", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/imageMatches.txt" - }, "position": [ 400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureExtraction_1": { "inputs": { "input": "{CameraInit_1.output}" }, "nodeType": "FeatureExtraction", - "parallelization": { - "blockSize": 40, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "StructureFromMotion_1": { "inputs": { @@ -137,58 +86,28 @@ ] }, "nodeType": "StructureFromMotion", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/sfm.abc", - "extraInfoFolder": "{cache}/{nodeType}/{uid0}/", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "PrepareDenseScene_1": { "inputs": { "input": "{StructureFromMotion_1.output}" }, "nodeType": "PrepareDenseScene", - "parallelization": { - "blockSize": 40, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/", - "undistorted": "{cache}/{nodeType}/{uid0}/.{outputFileTypeValue}" - }, "position": [ 1000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "CameraInit_1": { "inputs": {}, "nodeType": "CameraInit", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ 0, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "DepthMap_1": { "inputs": { @@ -196,40 +115,20 @@ "input": "{PrepareDenseScene_1.input}" }, "nodeType": "DepthMap", - "parallelization": { - "blockSize": 3, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/", - "depth": "{cache}/{nodeType}/{uid0}/_depthMap.exr", - "sim": "{cache}/{nodeType}/{uid0}/_simMap.exr" - }, "position": [ 1200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "MeshFiltering_1": { "inputs": { "inputMesh": "{Meshing_1.outputMesh}" }, "nodeType": "MeshFiltering", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 1 - }, - "outputs": { - "outputMesh": "{cache}/{nodeType}/{uid0}/mesh.{outputMeshFileTypeValue}" - }, "position": [ 1800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureMatching_1": { "inputs": { @@ -239,19 +138,10 @@ "featuresFolders": "{ImageMatching_1.featuresFolders}" }, "nodeType": "FeatureMatching", - "parallelization": { - "blockSize": 20, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] } } } \ No newline at end of file diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg index 3775b653..62d00412 100644 --- a/meshroom/pipelines/photogrammetryAndCameraTracking.mg +++ b/meshroom/pipelines/photogrammetryAndCameraTracking.mg @@ -21,19 +21,10 @@ "input": "{CameraInit_2.output}" }, "nodeType": "DistortionCalibration", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "outSfMData": "{cache}/{nodeType}/{uid0}/sfmData.sfm" - }, "position": [ 1024, 393 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageMatching_1": { "inputs": { @@ -43,38 +34,20 @@ ] }, "nodeType": "ImageMatching", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/imageMatches.txt" - }, "position": [ 400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureExtraction_1": { "inputs": { "input": "{CameraInit_1.output}" }, "nodeType": "FeatureExtraction", - "parallelization": { - "blockSize": 40, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "StructureFromMotion_1": { "inputs": { @@ -86,21 +59,10 @@ ] }, "nodeType": "StructureFromMotion", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/sfm.abc", - "extraInfoFolder": "{cache}/{nodeType}/{uid0}/", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ExportAnimatedCamera_1": { "inputs": { @@ -108,38 +70,18 @@ "input": "{StructureFromMotion_2.output}" }, "nodeType": "ExportAnimatedCamera", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 1 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/", - "outputUndistorted": "{cache}/{nodeType}/{uid0}/undistort", - "outputCamera": "{cache}/{nodeType}/{uid0}/camera.abc" - }, "position": [ 1629, 212 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "CameraInit_1": { "inputs": {}, "nodeType": "CameraInit", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ 0, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageMatchingMultiSfM_1": { "inputs": { @@ -152,56 +94,28 @@ ] }, "nodeType": "ImageMatchingMultiSfM", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/imageMatches.txt", - "outputCombinedSfM": "{cache}/{nodeType}/{uid0}/combineSfM.sfm" - }, "position": [ 1029, 212 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "CameraInit_2": { "inputs": {}, "nodeType": "CameraInit", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ -2, 223 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureExtraction_2": { "inputs": { "input": "{CameraInit_2.output}" }, "nodeType": "FeatureExtraction", - "parallelization": { - "blockSize": 40, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 198, 223 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureMatching_2": { "inputs": { @@ -211,19 +125,10 @@ "featuresFolders": "{ImageMatchingMultiSfM_1.featuresFolders}" }, "nodeType": "FeatureMatching", - "parallelization": { - "blockSize": 20, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 1229, 212 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureMatching_1": { "inputs": { @@ -233,19 +138,10 @@ "featuresFolders": "{ImageMatching_1.featuresFolders}" }, "nodeType": "FeatureMatching", - "parallelization": { - "blockSize": 20, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "StructureFromMotion_2": { "inputs": { @@ -261,21 +157,10 @@ "minAngleForTriangulation": 1.0 }, "nodeType": "StructureFromMotion", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/sfm.abc", - "extraInfoFolder": "{cache}/{nodeType}/{uid0}/", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 1429, 212 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] } } } \ No newline at end of file diff --git a/meshroom/pipelines/photogrammetryDraft.mg b/meshroom/pipelines/photogrammetryDraft.mg index 09759c73..f8f5d7d6 100644 --- a/meshroom/pipelines/photogrammetryDraft.mg +++ b/meshroom/pipelines/photogrammetryDraft.mg @@ -21,42 +21,20 @@ "inputMesh": "{MeshFiltering_1.outputMesh}" }, "nodeType": "Texturing", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 1 - }, - "outputs": { - "outputTextures": "{cache}/{nodeType}/{uid0}/texture_*.exr", - "outputMesh": "{cache}/{nodeType}/{uid0}/texturedMesh.{outputMeshFileTypeValue}", - "outputMaterial": "{cache}/{nodeType}/{uid0}/texturedMesh.mtl", - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 1400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "Meshing_1": { "inputs": { "input": "{StructureFromMotion_1.output}" }, "nodeType": "Meshing", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 1 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/densePointCloud.abc", - "outputMesh": "{cache}/{nodeType}/{uid0}/mesh.{outputMeshFileTypeValue}" - }, "position": [ 1000, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "ImageMatching_1": { "inputs": { @@ -66,38 +44,20 @@ ] }, "nodeType": "ImageMatching", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/imageMatches.txt" - }, "position": [ 400, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureExtraction_1": { "inputs": { "input": "{CameraInit_1.output}" }, "nodeType": "FeatureExtraction", - "parallelization": { - "blockSize": 40, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "StructureFromMotion_1": { "inputs": { @@ -109,57 +69,28 @@ ] }, "nodeType": "StructureFromMotion", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/sfm.abc", - "extraInfoFolder": "{cache}/{nodeType}/{uid0}/", - "outputViewsAndPoses": "{cache}/{nodeType}/{uid0}/cameras.sfm" - }, "position": [ 800, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "CameraInit_1": { "inputs": {}, "nodeType": "CameraInit", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/cameraInit.sfm" - }, "position": [ 0, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "MeshFiltering_1": { "inputs": { "inputMesh": "{Meshing_1.outputMesh}" }, "nodeType": "MeshFiltering", - "parallelization": { - "blockSize": 0, - "split": 1, - "size": 1 - }, - "outputs": { - "outputMesh": "{cache}/{nodeType}/{uid0}/mesh.{outputMeshFileTypeValue}" - }, "position": [ 1200, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] }, "FeatureMatching_1": { "inputs": { @@ -169,19 +100,10 @@ "featuresFolders": "{ImageMatching_1.featuresFolders}" }, "nodeType": "FeatureMatching", - "parallelization": { - "blockSize": 20, - "split": 0, - "size": 0 - }, - "outputs": { - "output": "{cache}/{nodeType}/{uid0}/" - }, "position": [ 600, 0 - ], - "internalFolder": "{cache}/{nodeType}/{uid0}/" + ] } } } \ No newline at end of file -- cgit v1.2.3