From 5ffd8d1eff472711768f4eba1264724f7590cbfa Mon Sep 17 00:00:00 2001
From: MrClock <jz.zalan@gmail.com>
Date: Mon, 13 May 2024 18:38:11 +0200
Subject: [PATCH 1/2] Hack solution to support Meshroom CL

---
 GCPMarkerAdditions/SfMTransformFromMarker.py | 35 +++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/GCPMarkerAdditions/SfMTransformFromMarker.py b/GCPMarkerAdditions/SfMTransformFromMarker.py
index d01037f..3629647 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)
+                print("DEBUG: ", memSize, 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(

From 8fb2c1f94ca50fb5c60b8d65eecb5c89fb2a97bf Mon Sep 17 00:00:00 2001
From: MrClock <jz.zalan@gmail.com>
Date: Fri, 31 May 2024 17:45:50 +0200
Subject: [PATCH 2/2] Removed debug print

---
 GCPMarkerAdditions/SfMTransformFromMarker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GCPMarkerAdditions/SfMTransformFromMarker.py b/GCPMarkerAdditions/SfMTransformFromMarker.py
index 3629647..5947a68 100644
--- a/GCPMarkerAdditions/SfMTransformFromMarker.py
+++ b/GCPMarkerAdditions/SfMTransformFromMarker.py
@@ -46,7 +46,7 @@ def __init__(self):
                 coresCount = cgroup.getCgroupCpuCount()
                 if coresCount > 0:
                     SfMTransformFromMarker.cmdCore = ' --maxCores={coresCount}'.format(coresCount=coresCount)
-                print("DEBUG: ", memSize, 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}"