Reduce DeepSSM tests from 4 to 2 configurations

Run only default and tl_net_fine_tune tests, which together cover
all code paths (standard DeepSSM, TL-DeepSSM, and fine tuning).
Cuts test time from ~3 minutes to ~90 seconds.

Author: akenmorris

Python/DeepSSMUtilsPackage/DeepSSMUtils/image_utils.py

@@ -2,15 +2,15 @@
 import SimpleITK
 import numpy as np
 
-def get_image_registration_transform(fixed_image_file, moving_image_file, transform_type='rigid'):
-    # Prepare parameter map 
+def get_image_registration_transform(fixed_image_file, moving_image_file, transform_type='rigid', max_iterations=1024):
+    # Prepare parameter map
     parameter_object = itk.ParameterObject.New()
     parameter_map = parameter_object.GetDefaultParameterMap('rigid')
     if transform_type == 'similarity':
         parameter_map['Transform'] = ['SimilarityTransform']
     elif transform_type == 'translation':
         parameter_map['Transform'] = ['TranslationTransform']
-    parameter_map['MaximumNumberOfIterations'] = ['1024']
+    parameter_map['MaximumNumberOfIterations'] = [str(max_iterations)]
     parameter_object.AddParameterMap(parameter_map)
 
     # Load images

Testing/DeepSSMTests/DeepSSMTests.cpp

@@ -11,10 +11,9 @@ void run_deepssm_test(const std::string& name) {
 }
 
 //---------------------------------------------------------------------------
+// Run 2 configurations that cover all code paths:
+// - default: standard DeepSSM
+// - tl_net_fine_tune: TL-DeepSSM with fine tuning (covers both tl_net and fine_tune paths)
 TEST(DeepSSMTests, defaultTest) { run_deepssm_test("deepssm_default.sh"); }
 
-TEST(DeepSSMTests, tlNetTest) { run_deepssm_test("deepssm_tl_net.sh"); }
-
-TEST(DeepSSMTests, fineTuneTest) { run_deepssm_test("deepssm_fine_tune.sh"); }
-
 TEST(DeepSSMTests, tlNetFineTuneTest) { run_deepssm_test("deepssm_tl_net_fine_tune.sh"); }

Testing/DeepSSMTests/deepssm_default.sh

@@ -14,4 +14,4 @@ rm -rf deepssm groomed *_particles
 shapeworks deepssm --name default.swproj --all
 
 # Verify results
-python "${SCRIPT_DIR}/verify_deepssm_results.py" "${DATA}/deepssm/projects"
+python3 "${SCRIPT_DIR}/verify_deepssm_results.py" "${DATA}/deepssm/projects"

Testing/DeepSSMTests/deepssm_fine_tune.sh

@@ -14,4 +14,4 @@ rm -rf deepssm groomed *_particles
 shapeworks deepssm --name fine_tune.swproj --all
 
 # Verify results
-python "${SCRIPT_DIR}/verify_deepssm_results.py" "${DATA}/deepssm/projects"
+python3 "${SCRIPT_DIR}/verify_deepssm_results.py" "${DATA}/deepssm/projects"

Testing/DeepSSMTests/deepssm_tl_net.sh

@@ -14,4 +14,4 @@ rm -rf deepssm groomed *_particles
 shapeworks deepssm --name tl_net.swproj --all
 
 # Verify results
-python "${SCRIPT_DIR}/verify_deepssm_results.py" "${DATA}/deepssm/projects"
+python3 "${SCRIPT_DIR}/verify_deepssm_results.py" "${DATA}/deepssm/projects"

Testing/DeepSSMTests/deepssm_tl_net_fine_tune.sh

@@ -14,4 +14,4 @@ rm -rf deepssm groomed *_particles
 shapeworks deepssm --name tl_net_fine_tune.swproj --all
 
 # Verify results
-python "${SCRIPT_DIR}/verify_deepssm_results.py" "${DATA}/deepssm/projects"
+python3 "${SCRIPT_DIR}/verify_deepssm_results.py" "${DATA}/deepssm/projects"

Testing/DeepSSMTests/run_exact_check.sh

@@ -33,7 +33,7 @@ for config in $CONFIGS; do
     shapeworks deepssm --name ${config}.swproj --all
 
     # Run exact check with config-specific file
-    python "${SCRIPT_DIR}/verify_deepssm_results.py" . \
+    python3 "${SCRIPT_DIR}/verify_deepssm_results.py" . \
         --exact_check "$MODE" \
         --baseline_file "exact_check_${config}.txt"
 

Testing/DeepSSMTests/run_extended_tests.sh

@@ -99,7 +99,7 @@ run_project() {
         verify_args="--expected 10 --tolerance 1.0"
     fi
 
-    python "${SCRIPT_DIR}/verify_deepssm_results.py" . $verify_args
+    python3 "${SCRIPT_DIR}/verify_deepssm_results.py" . $verify_args
 
     echo ""
 }