diff --git a/GCPMarkerAdditions/SfMTransformFromMarker.py b/GCPMarkerAdditions/SfMTransformFromMarker.py index d01037f..5947a68 100644 --- a/GCPMarkerAdditions/SfMTransformFromMarker.py +++ b/GCPMarkerAdditions/SfMTransformFromMarker.py @@ -1,7 +1,7 @@ -__version__ = "2.0" +__version__ = "2.1" from meshroom.core import desc -from meshroom.core import cgroup +# from meshroom.core import cgroup import os.path import csv @@ -30,23 +30,26 @@ class SfMTransformFromMarker(desc.Node): cgroupParsed = False cmdMem = '' cmdCore = '' - - # Constructor copied from the desc.CommandLineNode class def __init__(self): - - if SfMTransformFromMarker.cgroupParsed is False: - - SfMTransformFromMarker.cmdMem = '' - memSize = cgroup.getCgroupMemorySize() - if memSize > 0: - SfMTransformFromMarker.cmdMem = ' --maxMemory={memSize}'.format(memSize=memSize) + try: + from meshroom.core import cgroup + # Constructor copied from the desc.CommandLineNode class + + if SfMTransformFromMarker.cgroupParsed is False: - SfMTransformFromMarker.cmdCore = '' - coresCount = cgroup.getCgroupCpuCount() - if coresCount > 0: - SfMTransformFromMarker.cmdCore = ' --maxCores={coresCount}'.format(coresCount=coresCount) + SfMTransformFromMarker.cmdMem = '' + memSize = cgroup.getCgroupMemorySize() + if memSize > 0: + SfMTransformFromMarker.cmdMem = ' --maxMemory={memSize}'.format(memSize=memSize) - SfMTransformFromMarker.cgroupParsed = True + SfMTransformFromMarker.cmdCore = '' + coresCount = cgroup.getCgroupCpuCount() + if coresCount > 0: + SfMTransformFromMarker.cmdCore = ' --maxCores={coresCount}'.format(coresCount=coresCount) + + SfMTransformFromMarker.cgroupParsed = True + except: + SfMTransformFromMarker.commandLine = "aliceVision_utils_sfmTransform {input} --method from_markers --scale 1.0 --landmarksDescriberTypes {markerTypeValue} {applyScale} {applyRotation} {applyTranslation} {verboseLevel} {output} {outputViewsAndPoses}" inputs = [ desc.File(