diff --git a/meshroom/core/desc.py b/meshroom/core/desc.py index d4bf7cfd..10eee4ae 100644 --- a/meshroom/core/desc.py +++ b/meshroom/core/desc.py @@ -548,17 +548,7 @@ class CommandLineNode(Node): if chunk.node.isParallelized and chunk.node.size > 1: cmdSuffix = ' ' + self.commandLineRange.format(**chunk.range.toDict()) - cmdMem = '' - memSize = cgroup.getCgroupMemorySize() - if memSize > 0: - cmdMem = ' --maxMemory={memSize}'.format(memSize=memSize) - - cmdCore = '' - coresCount = cgroup.getCgroupCpuCount() - if coresCount > 0: - cmdCore = ' --maxCores={coresCount}'.format(coresCount=coresCount) - - return cmdPrefix + chunk.node.nodeDesc.commandLine.format(**chunk.node._cmdVars) + cmdMem + cmdCore + cmdSuffix + return cmdPrefix + chunk.node.nodeDesc.commandLine.format(**chunk.node._cmdVars) + cmdSuffix def stopProcess(self, chunk): # the same node could exists several times in the graph and @@ -603,6 +593,23 @@ class CommandLineNode(Node): finally: chunk.subprocess = None +#specific command line node for alicevision apps +class AVCommandLineNode(CommandLineNode): + def buildCommandLine(self, chunk): + + str = super(AVCommandLineNode, self).buildCommandLine(chunk) + + cmdMem = '' + memSize = cgroup.getCgroupMemorySize() + if memSize > 0: + cmdMem = ' --maxMemory={memSize}'.format(memSize=memSize) + + cmdCore = '' + coresCount = cgroup.getCgroupCpuCount() + if coresCount > 0: + cmdCore = ' --maxCores={coresCount}'.format(coresCount=coresCount) + + return str + cmdMem + cmdCore # Test abstract node class InitNode: diff --git a/meshroom/nodes/aliceVision/CameraCalibration.py b/meshroom/nodes/aliceVision/CameraCalibration.py index 888138cc..86a647f0 100644 --- a/meshroom/nodes/aliceVision/CameraCalibration.py +++ b/meshroom/nodes/aliceVision/CameraCalibration.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class CameraCalibration(desc.CommandLineNode): +class CameraCalibration(desc.AVCommandLineNode): commandLine = 'aliceVision_cameraCalibration {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py index feb529cd..6d959d2f 100644 --- a/meshroom/nodes/aliceVision/CameraInit.py +++ b/meshroom/nodes/aliceVision/CameraInit.py @@ -119,7 +119,7 @@ def readSfMData(sfmFile): return views, intrinsics -class CameraInit(desc.CommandLineNode, desc.InitNode): +class CameraInit(desc.AVCommandLineNode, desc.InitNode): commandLine = 'aliceVision_cameraInit {allParams} --allowSingleView 1' # don't throw an error if there is only one image size = desc.DynamicNodeSize('viewpoints') diff --git a/meshroom/nodes/aliceVision/CameraLocalization.py b/meshroom/nodes/aliceVision/CameraLocalization.py index 1f98119d..055b7687 100644 --- a/meshroom/nodes/aliceVision/CameraLocalization.py +++ b/meshroom/nodes/aliceVision/CameraLocalization.py @@ -4,7 +4,7 @@ import os from meshroom.core import desc -class CameraLocalization(desc.CommandLineNode): +class CameraLocalization(desc.AVCommandLineNode): commandLine = 'aliceVision_cameraLocalization {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/CameraRigCalibration.py b/meshroom/nodes/aliceVision/CameraRigCalibration.py index 3fa103e1..b575ea0d 100644 --- a/meshroom/nodes/aliceVision/CameraRigCalibration.py +++ b/meshroom/nodes/aliceVision/CameraRigCalibration.py @@ -4,7 +4,7 @@ import os from meshroom.core import desc -class CameraRigCalibration(desc.CommandLineNode): +class CameraRigCalibration(desc.AVCommandLineNode): commandLine = 'aliceVision_rigCalibration {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/CameraRigLocalization.py b/meshroom/nodes/aliceVision/CameraRigLocalization.py index ca4875c2..063acbbe 100644 --- a/meshroom/nodes/aliceVision/CameraRigLocalization.py +++ b/meshroom/nodes/aliceVision/CameraRigLocalization.py @@ -4,7 +4,7 @@ import os from meshroom.core import desc -class CameraRigLocalization(desc.CommandLineNode): +class CameraRigLocalization(desc.AVCommandLineNode): commandLine = 'aliceVision_rigLocalization {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/ColorCheckerCorrection.py b/meshroom/nodes/aliceVision/ColorCheckerCorrection.py index 0b5e6554..256ceaee 100644 --- a/meshroom/nodes/aliceVision/ColorCheckerCorrection.py +++ b/meshroom/nodes/aliceVision/ColorCheckerCorrection.py @@ -5,7 +5,7 @@ from meshroom.core import desc import os.path -class ColorCheckerCorrection(desc.CommandLineNode): +class ColorCheckerCorrection(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_colorCheckerCorrection {allParams}' size = desc.DynamicNodeSize('input') # parallelization = desc.Parallelization(blockSize=40) diff --git a/meshroom/nodes/aliceVision/ColorCheckerDetection.py b/meshroom/nodes/aliceVision/ColorCheckerDetection.py index f3109cfe..eab8925a 100644 --- a/meshroom/nodes/aliceVision/ColorCheckerDetection.py +++ b/meshroom/nodes/aliceVision/ColorCheckerDetection.py @@ -5,7 +5,7 @@ from meshroom.core import desc import os.path -class ColorCheckerDetection(desc.CommandLineNode): +class ColorCheckerDetection(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_colorCheckerDetection {allParams}' size = desc.DynamicNodeSize('input') # parallelization = desc.Parallelization(blockSize=40) diff --git a/meshroom/nodes/aliceVision/ConvertMesh.py b/meshroom/nodes/aliceVision/ConvertMesh.py index 9ea7b570..2bacbac3 100644 --- a/meshroom/nodes/aliceVision/ConvertMesh.py +++ b/meshroom/nodes/aliceVision/ConvertMesh.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class ConvertMesh(desc.CommandLineNode): +class ConvertMesh(desc.AVCommandLineNode): commandLine = 'aliceVision_convertMesh {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/ConvertSfMFormat.py b/meshroom/nodes/aliceVision/ConvertSfMFormat.py index 1c859ea3..0fd163f6 100644 --- a/meshroom/nodes/aliceVision/ConvertSfMFormat.py +++ b/meshroom/nodes/aliceVision/ConvertSfMFormat.py @@ -3,7 +3,7 @@ __version__ = "2.0" from meshroom.core import desc -class ConvertSfMFormat(desc.CommandLineNode): +class ConvertSfMFormat(desc.AVCommandLineNode): commandLine = 'aliceVision_convertSfMFormat {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/DepthMap.py b/meshroom/nodes/aliceVision/DepthMap.py index 6f150854..60149670 100644 --- a/meshroom/nodes/aliceVision/DepthMap.py +++ b/meshroom/nodes/aliceVision/DepthMap.py @@ -3,7 +3,7 @@ __version__ = "2.0" from meshroom.core import desc -class DepthMap(desc.CommandLineNode): +class DepthMap(desc.AVCommandLineNode): commandLine = 'aliceVision_depthMapEstimation {allParams}' gpu = desc.Level.INTENSIVE size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/DepthMapFilter.py b/meshroom/nodes/aliceVision/DepthMapFilter.py index c52dd233..3acebbac 100644 --- a/meshroom/nodes/aliceVision/DepthMapFilter.py +++ b/meshroom/nodes/aliceVision/DepthMapFilter.py @@ -3,7 +3,7 @@ __version__ = "3.0" from meshroom.core import desc -class DepthMapFilter(desc.CommandLineNode): +class DepthMapFilter(desc.AVCommandLineNode): commandLine = 'aliceVision_depthMapFiltering {allParams}' gpu = desc.Level.NORMAL size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/DistortionCalibration.py b/meshroom/nodes/aliceVision/DistortionCalibration.py index 8f006062..b69a2b7c 100644 --- a/meshroom/nodes/aliceVision/DistortionCalibration.py +++ b/meshroom/nodes/aliceVision/DistortionCalibration.py @@ -3,7 +3,7 @@ __version__ = '2.0' from meshroom.core import desc -class DistortionCalibration(desc.CommandLineNode): +class DistortionCalibration(desc.AVCommandLineNode): commandLine = 'aliceVision_distortionCalibration {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/ExportAnimatedCamera.py b/meshroom/nodes/aliceVision/ExportAnimatedCamera.py index 1fc1ac95..de503cea 100644 --- a/meshroom/nodes/aliceVision/ExportAnimatedCamera.py +++ b/meshroom/nodes/aliceVision/ExportAnimatedCamera.py @@ -3,7 +3,7 @@ __version__ = "2.0" from meshroom.core import desc -class ExportAnimatedCamera(desc.CommandLineNode): +class ExportAnimatedCamera(desc.AVCommandLineNode): commandLine = 'aliceVision_exportAnimatedCamera {allParams}' category = 'Export' diff --git a/meshroom/nodes/aliceVision/ExportColoredPointCloud.py b/meshroom/nodes/aliceVision/ExportColoredPointCloud.py index 7ab7855b..2f18c94c 100644 --- a/meshroom/nodes/aliceVision/ExportColoredPointCloud.py +++ b/meshroom/nodes/aliceVision/ExportColoredPointCloud.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class ExportColoredPointCloud(desc.CommandLineNode): +class ExportColoredPointCloud(desc.AVCommandLineNode): commandLine = 'aliceVision_exportColoredPointCloud {allParams}' category = 'Export' diff --git a/meshroom/nodes/aliceVision/ExportMatches.py b/meshroom/nodes/aliceVision/ExportMatches.py index 2a1aeebc..b2cd04a3 100644 --- a/meshroom/nodes/aliceVision/ExportMatches.py +++ b/meshroom/nodes/aliceVision/ExportMatches.py @@ -3,7 +3,7 @@ __version__ = "1.1" from meshroom.core import desc -class ExportMatches(desc.CommandLineNode): +class ExportMatches(desc.AVCommandLineNode): commandLine = 'aliceVision_exportMatches {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/ExportMaya.py b/meshroom/nodes/aliceVision/ExportMaya.py index 99dacf12..b297b81c 100644 --- a/meshroom/nodes/aliceVision/ExportMaya.py +++ b/meshroom/nodes/aliceVision/ExportMaya.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class ExportMaya(desc.CommandLineNode): +class ExportMaya(desc.AVCommandLineNode): commandLine = 'aliceVision_exportMeshroomMaya {allParams}' category = 'Export' diff --git a/meshroom/nodes/aliceVision/FeatureExtraction.py b/meshroom/nodes/aliceVision/FeatureExtraction.py index 9c37f303..3c20a690 100644 --- a/meshroom/nodes/aliceVision/FeatureExtraction.py +++ b/meshroom/nodes/aliceVision/FeatureExtraction.py @@ -3,7 +3,7 @@ __version__ = "1.1" from meshroom.core import desc -class FeatureExtraction(desc.CommandLineNode): +class FeatureExtraction(desc.AVCommandLineNode): commandLine = 'aliceVision_featureExtraction {allParams}' size = desc.DynamicNodeSize('input') parallelization = desc.Parallelization(blockSize=40) diff --git a/meshroom/nodes/aliceVision/FeatureMatching.py b/meshroom/nodes/aliceVision/FeatureMatching.py index 4c0fba1b..cdc5b69e 100644 --- a/meshroom/nodes/aliceVision/FeatureMatching.py +++ b/meshroom/nodes/aliceVision/FeatureMatching.py @@ -3,7 +3,7 @@ __version__ = "2.0" from meshroom.core import desc -class FeatureMatching(desc.CommandLineNode): +class FeatureMatching(desc.AVCommandLineNode): commandLine = 'aliceVision_featureMatching {allParams}' size = desc.DynamicNodeSize('input') parallelization = desc.Parallelization(blockSize=20) diff --git a/meshroom/nodes/aliceVision/FeatureRepeatability.py b/meshroom/nodes/aliceVision/FeatureRepeatability.py index ed22cf34..41d9967d 100644 --- a/meshroom/nodes/aliceVision/FeatureRepeatability.py +++ b/meshroom/nodes/aliceVision/FeatureRepeatability.py @@ -3,7 +3,7 @@ __version__ = "1.1" from meshroom.core import desc -class FeatureRepeatability(desc.CommandLineNode): +class FeatureRepeatability(desc.AVCommandLineNode): commandLine = 'aliceVision_samples_repeatabilityDataset {allParams}' size = desc.DynamicNodeSize('input') # parallelization = desc.Parallelization(blockSize=40) diff --git a/meshroom/nodes/aliceVision/GlobalSfM.py b/meshroom/nodes/aliceVision/GlobalSfM.py index 8d6ebe0b..b3e93aa0 100644 --- a/meshroom/nodes/aliceVision/GlobalSfM.py +++ b/meshroom/nodes/aliceVision/GlobalSfM.py @@ -6,7 +6,7 @@ import os from meshroom.core import desc -class GlobalSfM(desc.CommandLineNode): +class GlobalSfM(desc.AVCommandLineNode): commandLine = 'aliceVision_globalSfM {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/ImageMasking.py b/meshroom/nodes/aliceVision/ImageMasking.py index eefe335f..e52ce5ca 100644 --- a/meshroom/nodes/aliceVision/ImageMasking.py +++ b/meshroom/nodes/aliceVision/ImageMasking.py @@ -3,7 +3,7 @@ __version__ = "3.0" from meshroom.core import desc -class ImageMasking(desc.CommandLineNode): +class ImageMasking(desc.AVCommandLineNode): commandLine = 'aliceVision_imageMasking {allParams}' size = desc.DynamicNodeSize('input') parallelization = desc.Parallelization(blockSize=40) diff --git a/meshroom/nodes/aliceVision/ImageMatching.py b/meshroom/nodes/aliceVision/ImageMatching.py index f2ac0d94..60992785 100644 --- a/meshroom/nodes/aliceVision/ImageMatching.py +++ b/meshroom/nodes/aliceVision/ImageMatching.py @@ -4,7 +4,7 @@ import os from meshroom.core import desc -class ImageMatching(desc.CommandLineNode): +class ImageMatching(desc.AVCommandLineNode): commandLine = 'aliceVision_imageMatching {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py b/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py index c11776e7..6b25cb66 100644 --- a/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py +++ b/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py @@ -4,7 +4,7 @@ import os from meshroom.core import desc -class ImageMatchingMultiSfM(desc.CommandLineNode): +class ImageMatchingMultiSfM(desc.AVCommandLineNode): commandLine = 'aliceVision_imageMatching {allParams}' # use both SfM inputs to define Node's size size = desc.MultiDynamicNodeSize(['input', 'inputB']) diff --git a/meshroom/nodes/aliceVision/ImageProcessing.py b/meshroom/nodes/aliceVision/ImageProcessing.py index 5ba23855..54a9fdfb 100644 --- a/meshroom/nodes/aliceVision/ImageProcessing.py +++ b/meshroom/nodes/aliceVision/ImageProcessing.py @@ -28,7 +28,7 @@ def outputImagesValueFunct(attr): return desc.Node.internalFolder + '*' + (outputExt or '.*') -class ImageProcessing(desc.CommandLineNode): +class ImageProcessing(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_imageProcessing {allParams}' size = desc.DynamicNodeSize('input') # parallelization = desc.Parallelization(blockSize=40) diff --git a/meshroom/nodes/aliceVision/ImportKnownPoses.py b/meshroom/nodes/aliceVision/ImportKnownPoses.py index d0cd8656..25689535 100644 --- a/meshroom/nodes/aliceVision/ImportKnownPoses.py +++ b/meshroom/nodes/aliceVision/ImportKnownPoses.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class ImportKnownPoses(desc.CommandLineNode): +class ImportKnownPoses(desc.AVCommandLineNode): commandLine = 'aliceVision_importKnownPoses {allParams}' size = desc.DynamicNodeSize('sfmData') diff --git a/meshroom/nodes/aliceVision/KeyframeSelection.py b/meshroom/nodes/aliceVision/KeyframeSelection.py index 63ecb1f6..668aa633 100644 --- a/meshroom/nodes/aliceVision/KeyframeSelection.py +++ b/meshroom/nodes/aliceVision/KeyframeSelection.py @@ -4,7 +4,7 @@ import os from meshroom.core import desc -class KeyframeSelection(desc.CommandLineNode): +class KeyframeSelection(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_keyframeSelection {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/LdrToHdrCalibration.py b/meshroom/nodes/aliceVision/LdrToHdrCalibration.py index a1a384a3..968ef98d 100644 --- a/meshroom/nodes/aliceVision/LdrToHdrCalibration.py +++ b/meshroom/nodes/aliceVision/LdrToHdrCalibration.py @@ -23,7 +23,7 @@ def findMetadata(d, keys, defaultValue): -class LdrToHdrCalibration(desc.CommandLineNode): +class LdrToHdrCalibration(desc.AVCommandLineNode): commandLine = 'aliceVision_LdrToHdrCalibration {allParams}' size = desc.DynamicNodeSize('input') cpu = desc.Level.INTENSIVE diff --git a/meshroom/nodes/aliceVision/LdrToHdrMerge.py b/meshroom/nodes/aliceVision/LdrToHdrMerge.py index cc1ee60f..9259a3f1 100644 --- a/meshroom/nodes/aliceVision/LdrToHdrMerge.py +++ b/meshroom/nodes/aliceVision/LdrToHdrMerge.py @@ -22,7 +22,7 @@ def findMetadata(d, keys, defaultValue): return defaultValue -class LdrToHdrMerge(desc.CommandLineNode): +class LdrToHdrMerge(desc.AVCommandLineNode): commandLine = 'aliceVision_LdrToHdrMerge {allParams}' size = desc.DynamicNodeSize('input') parallelization = desc.Parallelization(blockSize=2) diff --git a/meshroom/nodes/aliceVision/LdrToHdrSampling.py b/meshroom/nodes/aliceVision/LdrToHdrSampling.py index 3324733b..1d0f42b3 100644 --- a/meshroom/nodes/aliceVision/LdrToHdrSampling.py +++ b/meshroom/nodes/aliceVision/LdrToHdrSampling.py @@ -39,7 +39,7 @@ class DividedInputNodeSize(desc.DynamicNodeSize): return s / divParam.value -class LdrToHdrSampling(desc.CommandLineNode): +class LdrToHdrSampling(desc.AVCommandLineNode): commandLine = 'aliceVision_LdrToHdrSampling {allParams}' size = DividedInputNodeSize('input', 'nbBrackets') parallelization = desc.Parallelization(blockSize=2) diff --git a/meshroom/nodes/aliceVision/LightingEstimation.py b/meshroom/nodes/aliceVision/LightingEstimation.py index 077b3538..9149dd0f 100644 --- a/meshroom/nodes/aliceVision/LightingEstimation.py +++ b/meshroom/nodes/aliceVision/LightingEstimation.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class LightingEstimation(desc.CommandLineNode): +class LightingEstimation(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_lightingEstimation {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/MergeMeshes.py b/meshroom/nodes/aliceVision/MergeMeshes.py index 739e5b04..98af5bf8 100644 --- a/meshroom/nodes/aliceVision/MergeMeshes.py +++ b/meshroom/nodes/aliceVision/MergeMeshes.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class MergeMeshes(desc.CommandLineNode): +class MergeMeshes(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_mergeMeshes {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/MeshDecimate.py b/meshroom/nodes/aliceVision/MeshDecimate.py index 29b51e42..2c42e401 100644 --- a/meshroom/nodes/aliceVision/MeshDecimate.py +++ b/meshroom/nodes/aliceVision/MeshDecimate.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class MeshDecimate(desc.CommandLineNode): +class MeshDecimate(desc.AVCommandLineNode): commandLine = 'aliceVision_meshDecimate {allParams}' cpu = desc.Level.NORMAL ram = desc.Level.NORMAL diff --git a/meshroom/nodes/aliceVision/MeshDenoising.py b/meshroom/nodes/aliceVision/MeshDenoising.py index aa118bbe..3fbf3592 100644 --- a/meshroom/nodes/aliceVision/MeshDenoising.py +++ b/meshroom/nodes/aliceVision/MeshDenoising.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class MeshDenoising(desc.CommandLineNode): +class MeshDenoising(desc.AVCommandLineNode): commandLine = 'aliceVision_meshDenoising {allParams}' category = 'Mesh Post-Processing' diff --git a/meshroom/nodes/aliceVision/MeshFiltering.py b/meshroom/nodes/aliceVision/MeshFiltering.py index 6c65bda0..c17e666e 100644 --- a/meshroom/nodes/aliceVision/MeshFiltering.py +++ b/meshroom/nodes/aliceVision/MeshFiltering.py @@ -3,7 +3,7 @@ __version__ = "3.0" from meshroom.core import desc -class MeshFiltering(desc.CommandLineNode): +class MeshFiltering(desc.AVCommandLineNode): commandLine = 'aliceVision_meshFiltering {allParams}' category = 'Dense Reconstruction' diff --git a/meshroom/nodes/aliceVision/MeshMasking.py b/meshroom/nodes/aliceVision/MeshMasking.py index 1888f563..5cbe4b86 100644 --- a/meshroom/nodes/aliceVision/MeshMasking.py +++ b/meshroom/nodes/aliceVision/MeshMasking.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class MeshMasking(desc.CommandLineNode): +class MeshMasking(desc.AVCommandLineNode): commandLine = 'aliceVision_meshMasking {allParams}' category = 'Mesh Post-Processing' documentation = ''' diff --git a/meshroom/nodes/aliceVision/MeshResampling.py b/meshroom/nodes/aliceVision/MeshResampling.py index 047d572b..b9bbeed4 100644 --- a/meshroom/nodes/aliceVision/MeshResampling.py +++ b/meshroom/nodes/aliceVision/MeshResampling.py @@ -3,7 +3,7 @@ __version__ = "1.0" from meshroom.core import desc -class MeshResampling(desc.CommandLineNode): +class MeshResampling(desc.AVCommandLineNode): commandLine = 'aliceVision_meshResampling {allParams}' cpu = desc.Level.NORMAL ram = desc.Level.NORMAL diff --git a/meshroom/nodes/aliceVision/Meshing.py b/meshroom/nodes/aliceVision/Meshing.py index a64962c8..364b2514 100644 --- a/meshroom/nodes/aliceVision/Meshing.py +++ b/meshroom/nodes/aliceVision/Meshing.py @@ -3,7 +3,7 @@ __version__ = "7.0" from meshroom.core import desc -class Meshing(desc.CommandLineNode): +class Meshing(desc.AVCommandLineNode): commandLine = 'aliceVision_meshing {allParams}' cpu = desc.Level.INTENSIVE diff --git a/meshroom/nodes/aliceVision/PanoramaCompositing.py b/meshroom/nodes/aliceVision/PanoramaCompositing.py index 756d76db..e7020ef9 100644 --- a/meshroom/nodes/aliceVision/PanoramaCompositing.py +++ b/meshroom/nodes/aliceVision/PanoramaCompositing.py @@ -6,7 +6,7 @@ import os from meshroom.core import desc -class PanoramaCompositing(desc.CommandLineNode): +class PanoramaCompositing(desc.AVCommandLineNode): commandLine = 'aliceVision_panoramaCompositing {allParams}' size = desc.DynamicNodeSize('input') parallelization = desc.Parallelization(blockSize=5) diff --git a/meshroom/nodes/aliceVision/PanoramaEstimation.py b/meshroom/nodes/aliceVision/PanoramaEstimation.py index 476d29b1..2882d37a 100644 --- a/meshroom/nodes/aliceVision/PanoramaEstimation.py +++ b/meshroom/nodes/aliceVision/PanoramaEstimation.py @@ -6,7 +6,7 @@ import os from meshroom.core import desc -class PanoramaEstimation(desc.CommandLineNode): +class PanoramaEstimation(desc.AVCommandLineNode): commandLine = 'aliceVision_panoramaEstimation {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/PanoramaInit.py b/meshroom/nodes/aliceVision/PanoramaInit.py index edac5cd6..e383bb68 100644 --- a/meshroom/nodes/aliceVision/PanoramaInit.py +++ b/meshroom/nodes/aliceVision/PanoramaInit.py @@ -3,7 +3,7 @@ __version__ = "2.0" from meshroom.core import desc -class PanoramaInit(desc.CommandLineNode): +class PanoramaInit(desc.AVCommandLineNode): commandLine = 'aliceVision_panoramaInit {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/PanoramaMerging.py b/meshroom/nodes/aliceVision/PanoramaMerging.py index f0fc6fca..544adcbc 100644 --- a/meshroom/nodes/aliceVision/PanoramaMerging.py +++ b/meshroom/nodes/aliceVision/PanoramaMerging.py @@ -6,7 +6,7 @@ import os from meshroom.core import desc -class PanoramaMerging(desc.CommandLineNode): +class PanoramaMerging(desc.AVCommandLineNode): commandLine = 'aliceVision_panoramaMerging {allParams}' size = desc.DynamicNodeSize('input') cpu = desc.Level.NORMAL diff --git a/meshroom/nodes/aliceVision/PanoramaPrepareImages.py b/meshroom/nodes/aliceVision/PanoramaPrepareImages.py index 89099f19..e738e9c0 100644 --- a/meshroom/nodes/aliceVision/PanoramaPrepareImages.py +++ b/meshroom/nodes/aliceVision/PanoramaPrepareImages.py @@ -5,7 +5,7 @@ from meshroom.core import desc import os.path -class PanoramaPrepareImages(desc.CommandLineNode): +class PanoramaPrepareImages(desc.AVCommandLineNode): commandLine = 'aliceVision_panoramaPrepareImages {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/PanoramaSeams.py b/meshroom/nodes/aliceVision/PanoramaSeams.py index 6817d984..f595617a 100644 --- a/meshroom/nodes/aliceVision/PanoramaSeams.py +++ b/meshroom/nodes/aliceVision/PanoramaSeams.py @@ -6,7 +6,7 @@ import os from meshroom.core import desc -class PanoramaSeams(desc.CommandLineNode): +class PanoramaSeams(desc.AVCommandLineNode): commandLine = 'aliceVision_panoramaSeams {allParams}' size = desc.DynamicNodeSize('input') cpu = desc.Level.INTENSIVE diff --git a/meshroom/nodes/aliceVision/PanoramaWarping.py b/meshroom/nodes/aliceVision/PanoramaWarping.py index 99a38d5c..6517d495 100644 --- a/meshroom/nodes/aliceVision/PanoramaWarping.py +++ b/meshroom/nodes/aliceVision/PanoramaWarping.py @@ -6,7 +6,7 @@ import os from meshroom.core import desc -class PanoramaWarping(desc.CommandLineNode): +class PanoramaWarping(desc.AVCommandLineNode): commandLine = 'aliceVision_panoramaWarping {allParams}' size = desc.DynamicNodeSize('input') parallelization = desc.Parallelization(blockSize=5) diff --git a/meshroom/nodes/aliceVision/PrepareDenseScene.py b/meshroom/nodes/aliceVision/PrepareDenseScene.py index 5d475e51..eb511533 100644 --- a/meshroom/nodes/aliceVision/PrepareDenseScene.py +++ b/meshroom/nodes/aliceVision/PrepareDenseScene.py @@ -3,7 +3,7 @@ __version__ = "3.0" from meshroom.core import desc -class PrepareDenseScene(desc.CommandLineNode): +class PrepareDenseScene(desc.AVCommandLineNode): commandLine = 'aliceVision_prepareDenseScene {allParams}' size = desc.DynamicNodeSize('input') parallelization = desc.Parallelization(blockSize=40) diff --git a/meshroom/nodes/aliceVision/SfMAlignment.py b/meshroom/nodes/aliceVision/SfMAlignment.py index a001f7cd..53e09c92 100644 --- a/meshroom/nodes/aliceVision/SfMAlignment.py +++ b/meshroom/nodes/aliceVision/SfMAlignment.py @@ -5,7 +5,7 @@ from meshroom.core import desc import os.path -class SfMAlignment(desc.CommandLineNode): +class SfMAlignment(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_sfmAlignment {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/SfMDistances.py b/meshroom/nodes/aliceVision/SfMDistances.py index 24ab2354..1b4b91ab 100644 --- a/meshroom/nodes/aliceVision/SfMDistances.py +++ b/meshroom/nodes/aliceVision/SfMDistances.py @@ -3,7 +3,7 @@ __version__ = "3.0" from meshroom.core import desc -class SfMDistances(desc.CommandLineNode): +class SfMDistances(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_sfmDistances {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/SfMTransfer.py b/meshroom/nodes/aliceVision/SfMTransfer.py index 22f1313a..6c9811c3 100644 --- a/meshroom/nodes/aliceVision/SfMTransfer.py +++ b/meshroom/nodes/aliceVision/SfMTransfer.py @@ -5,7 +5,7 @@ from meshroom.core import desc import os.path -class SfMTransfer(desc.CommandLineNode): +class SfMTransfer(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_sfmTransfer {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/SfMTransform.py b/meshroom/nodes/aliceVision/SfMTransform.py index 439ba3af..525a92d7 100644 --- a/meshroom/nodes/aliceVision/SfMTransform.py +++ b/meshroom/nodes/aliceVision/SfMTransform.py @@ -5,7 +5,7 @@ from meshroom.core import desc import os.path -class SfMTransform(desc.CommandLineNode): +class SfMTransform(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_sfmTransform {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/Split360Images.py b/meshroom/nodes/aliceVision/Split360Images.py index 4ff56bb9..6519a47c 100644 --- a/meshroom/nodes/aliceVision/Split360Images.py +++ b/meshroom/nodes/aliceVision/Split360Images.py @@ -2,7 +2,7 @@ __version__ = "1.0" from meshroom.core import desc -class Split360Images(desc.CommandLineNode): +class Split360Images(desc.AVCommandLineNode): commandLine = 'aliceVision_utils_split360Images {allParams}' category = 'Utils' diff --git a/meshroom/nodes/aliceVision/StructureFromMotion.py b/meshroom/nodes/aliceVision/StructureFromMotion.py index 08a4541c..c16de93a 100644 --- a/meshroom/nodes/aliceVision/StructureFromMotion.py +++ b/meshroom/nodes/aliceVision/StructureFromMotion.py @@ -3,7 +3,7 @@ __version__ = "2.0" from meshroom.core import desc -class StructureFromMotion(desc.CommandLineNode): +class StructureFromMotion(desc.AVCommandLineNode): commandLine = 'aliceVision_incrementalSfM {allParams}' size = desc.DynamicNodeSize('input') diff --git a/meshroom/nodes/aliceVision/Texturing.py b/meshroom/nodes/aliceVision/Texturing.py index d7eb6f7c..a6543bec 100644 --- a/meshroom/nodes/aliceVision/Texturing.py +++ b/meshroom/nodes/aliceVision/Texturing.py @@ -4,7 +4,7 @@ from meshroom.core import desc, Version import logging -class Texturing(desc.CommandLineNode): +class Texturing(desc.AVCommandLineNode): commandLine = 'aliceVision_texturing {allParams}' cpu = desc.Level.INTENSIVE ram = desc.Level.INTENSIVE