refactor(uav): move all arguments that may change to config.yml for d…

…etect/classify pipelines
mbari-org · Jan 22, 2025 · 5f97fc4 · 5f97fc4
1 parent 0b40541
commit 5f97fc4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/aipipeline/projects/uav/cluster_pipeline.py b/aipipeline/projects/uav/cluster_pipeline.py
@@ -49,6 +49,7 @@ def process_mission(element):
 
     det_dir = base_path / mission_name / "detections" / "combined" / model / "det_filtered"
     save_dir = base_path / mission_name / "detections" / "combined" / model / "clusters"
+    add_args = config_dict["sdcat"]["cluster_args"]
 
     if not det_dir.exists():
         logger.error(f"Could not find directory: {det_dir}")
@@ -67,11 +68,12 @@ def process_mission(element):
         "--save-dir",
         str(save_dir),
         "--device",
-        str(gpu_device),
-        "--skip-visualization",
-        "--use-vits"
+        str(gpu_device)
     ]
 
+    if add_args:
+        args += add_args
+
     container = run_docker(
         image=config_dict["docker"]["sdcat"],
         name=f"sdcat-clu-{mission_name}",

diff --git a/aipipeline/projects/uav/config/config.yml b/aipipeline/projects/uav/config/config.yml
@@ -36,9 +36,23 @@ data:
     - name: "near_duplicates"
 
 sdcat:
-  model: "/mnt/DeepSea-AI/models/MBARI-org--yolov5x6-uavs-oneclass"
   ini: "sdcat.ini"
-
+  detect_args:
+    - "--scale-percent"
+    - "100"
+    - "--model"
+    - "/mnt/DeepSea-AI/models/UAV/mbari-uav-yolo11x-jelly/"
+    - "--model-type"
+    - "yolov11
+    - "--slice-size-width"
+    - "640"
+    - "--slice-size-height"
+    - "640"
+    - "--conf"
+    - "0.1"
+  cluster_args:
+    - "--skip-visualization"
+    - "--use-vits"
 vss:
   project: "901902-uavs"
   threshold: 0.1

diff --git a/aipipeline/projects/uav/detect_pipeline.py b/aipipeline/projects/uav/detect_pipeline.py
@@ -3,25 +3,18 @@
 # Description: Batch process missions with sdcat detection
 import multiprocessing
 import os
-import uuid
 from datetime import datetime
 from typing import Any
 
 import apache_beam as beam
-import pandas as pd
 from apache_beam.options.pipeline_options import PipelineOptions
 from apache_beam.io import ReadFromText
 from pathlib import Path
-from multiprocessing import Pool
 import logging
-import io
-import tqdm
 
 from aipipeline.docker.utils import run_docker
 from aipipeline.projects.uav.args_common import parse_args, POSSIBLE_PLATFORMS, parse_mission_string
 from aipipeline.config_setup import setup_config, SDCAT_KEY
-from aipipeline.prediction.library import run_vss
-from aipipeline.prediction.utils import crop_square_image
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
@@ -47,7 +40,7 @@ def run_mission_detect(element) -> Any:
     gpu_device, mission_name, mission_dir, section, start_image, end_image = parse_mission_string(line)
 
     base_path = Path(config_dict["data"]["processed_path_sdcat"]) / "seedDetections"
-    model = config_dict["sdcat"]["model"]
+    add_args = config_dict["sdcat"]["detect_args"]
 
     if not mission_name:
         logger.error(f"Could not find mission name in path: {mission_dir} that starts with {POSSIBLE_PLATFORMS}")
@@ -67,21 +60,13 @@ def run_mission_detect(element) -> Any:
         str(gpu_device),
         "--config-ini",
         conf_files[SDCAT_KEY],
-        "--scale-percent",
-        "50",
-        "--model",
-        model,
-        "--slice-size-width",
-        "1280",
-        "--slice-size-height",
-        "1280",
-        "--conf",
-        "0.1",
         "--save-dir",
         str(save_dir),
         "--image-dir",
         mission_dir,
     ]
+    if add_args:
+        args += add_args
 
     if start_image:
         args += ["--start-image", start_image]