From 69489ab0d8f24af98e394b0f44b78f74505232ae Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Thu, 17 Jul 2025 18:55:37 -0400 Subject: [PATCH 1/2] Set args.split = 999999 if image_groups_file --- stages/splitmerge.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stages/splitmerge.py b/stages/splitmerge.py index 62d12b937..373a7eba3 100644 --- a/stages/splitmerge.py +++ b/stages/splitmerge.py @@ -28,9 +28,11 @@ def process(self, args, outputs): image_groups_file = os.path.join(args.project_path, "image_groups.txt") if 'split_image_groups_is_set' in args: image_groups_file = os.path.abspath(args.split_image_groups) - if io.file_exists(image_groups_file): outputs['large'] = True + if args.split < 999999: + args.split = 999999 + log.ODM_WARNING('image_groups.txt and split both set. Using groups in image_groups.txt.') elif len(photos) > args.split: # check for availability of geotagged photos if reconstruction.has_geotagged_photos(): From 531da754dd9e215cc9312d3ab429598fdff0bf24 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Sun, 20 Jul 2025 17:43:22 -0400 Subject: [PATCH 2/2] move else to appropriate level --- stages/splitmerge.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stages/splitmerge.py b/stages/splitmerge.py index 373a7eba3..1f273078a 100644 --- a/stages/splitmerge.py +++ b/stages/splitmerge.py @@ -37,8 +37,8 @@ def process(self, args, outputs): # check for availability of geotagged photos if reconstruction.has_geotagged_photos(): outputs['large'] = True - else: - log.ODM_WARNING('Could not perform split-merge as GPS information in photos or image_groups.txt is missing.') + else: + log.ODM_WARNING('Could not perform split-merge as GPS information in photos or image_groups.txt is missing.') if outputs['large']: # If we have a cluster address, we'll use a distributed workflow