From 7b3acc633a7dbb2a0e507bcb78a65f5995a0b5e3 Mon Sep 17 00:00:00 2001 From: pikaliov Date: Fri, 8 May 2026 09:52:15 +0300 Subject: [PATCH] Update dataset path (SSD_2_TB) --- CLAUDE.md | 14 +++++++------- GTA-UAV-LR_Dataset_Analysis.md | 6 +++--- README.md | 6 +++--- UAV-VisLoc_Dataset_Analysis.md | 2 +- in/config_files/gtauav_balanced/pipeline.gin | 4 ++-- in/config_files/gtauav_balanced_asym/pipeline.gin | 4 ++-- in/config_files/gtauav_balanced_sofia/pipeline.gin | 4 ++-- .../gtauav_balanced_sofia_v1/pipeline.gin | 4 ++-- .../gtauav_balanced_stripnet/pipeline.gin | 4 ++-- .../gtauav_balanced_stripnet_unfrozen/pipeline.gin | 4 ++-- in/config_files/gtauav_baseline/pipeline.gin | 4 ++-- in/config_files/gtauav_baseline_asym/pipeline.gin | 4 ++-- in/config_files/gtauav_baseline_sofia/pipeline.gin | 4 ++-- .../gtauav_baseline_sofia_v1/pipeline.gin | 4 ++-- .../gtauav_baseline_stripnet/pipeline.gin | 4 ++-- .../gtauav_baseline_stripnet_unfrozen/pipeline.gin | 4 ++-- in/config_files/gtauav_image_heavy/pipeline.gin | 4 ++-- in/config_files/gtauav_text_heavy/pipeline.gin | 4 ++-- in/config_files/preprocess/preprocess.gin | 4 ++-- pre_refactor_analysis.md | 14 +++++++------- scripts/filter_segmentation.py | 2 +- scripts/make_split.py | 2 +- src/conf/pipeline_conf.py | 4 ++-- src/conf/preprocess_conf.py | 4 ++-- src/datasets/gtauav_dataset.py | 4 ++-- 25 files changed, 59 insertions(+), 59 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 3bc2d57..e974979 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -175,20 +175,20 @@ Eval: Resize(256) + CenterCrop(256) + ImageNet normalization. ## Датасет: GTA-UAV-LR -- **RGB:** `/home/servml/Документы/datasets/GTA-UAV-LR/` +- **RGB:** `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR/` - Drone: 33,763 PNG (512x384), altitudes 100-600m - Satellite: 14,640 PNG (256x256 RGBA) - Pairs: `cross-area-drone2sate-{train,test}.json` (primary split) - Metadata: `*_drone_meta.csv` (height, yaw, roll, pitch) - Origin: GTA V simulation (Los Santos) -- **Captions:** `/home/servml/Документы/datasets/GTA-UAV-LR-captions/` +- **Captions:** `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions/` - Drone: 33,411 JSON (32,635 multi-paragraph P1/P2/P3 + 776 short water-only) - Satellite: 6,546 JSON (все multi-paragraph) - Формат: 3 абзаца (P1 Inventory + P2 Spatial + P3 Fingerprint) - Token counts: ~430 output tokens per caption -- **Segmentation:** `/home/servml/Документы/datasets/GTA-UAV-LR-aug/` +- **Segmentation:** `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-aug/` - 48,403 images, 17 классов (background, building, road, vegetation, water, ...) - Modalities: segm/, depth/, edge/, chm/, safetensors/ - Query: 512x512, DB: 256x256 @@ -331,7 +331,7 @@ python -m scripts.compare_runs \ ### UAV-VisLoc Prepare - **Путь:** `/home/servml/Документы/code/Yaroslav/UAV-VisLoc-prepare/scripts/prepare_dataset.py` -- **Статус:** выполнен (2026-04-17), данные в `/home/servml/Документы/datasets/UAV_VisLoc_processed/` (25 GB) +- **Статус:** выполнен (2026-04-17), данные в `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/UAV_VisLoc_processed/` (25 GB) - **Задача:** нарезка satellite кропов 512x512, stride 256 + resize drone -> 512x512 - **Подробности:** см. ниже @@ -376,7 +376,7 @@ Binary masks — natural FiLM gates. Modality dropout: text 0.3, CHM 0.5, seg 0. ## Датасеты (справочник) ### UAV-VisLoc -- **Путь:** `/home/servml/Документы/datasets/UAV_VisLoc_dataset/` +- **Путь:** `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/UAV_VisLoc_dataset/` - **Структура:** 11 маршрутов (папки `01`-`11`), каждая содержит: - `drone/` — drone-снимки (`XX_NNNN.JPG`) - `satelliteXX.tif` — спутниковая карта @@ -403,8 +403,8 @@ Binary masks — natural FiLM gates. Modality dropout: text 0.3, CHM 0.5, seg 0. ### Запуск ```bash python scripts/prepare_dataset.py \ - --src /home/servml/Документы/datasets/UAV_VisLoc_dataset \ - --dst /home/servml/Документы/datasets/UAV_VisLoc_processed \ + --src /media/servml/SSD_2_2TB/datasets/cvgl_datasets/UAV_VisLoc_dataset \ + --dst /media/servml/SSD_2_2TB/datasets/cvgl_datasets/UAV_VisLoc_processed \ --crop-size 512 --stride 256 --target-size 512 ``` diff --git a/GTA-UAV-LR_Dataset_Analysis.md b/GTA-UAV-LR_Dataset_Analysis.md index 970e35e..231a047 100644 --- a/GTA-UAV-LR_Dataset_Analysis.md +++ b/GTA-UAV-LR_Dataset_Analysis.md @@ -2,8 +2,8 @@ **Дата анализа:** 2026-04-21 **Метод:** Эмпирический анализ данных на диске + статья arXiv:2409.16925 + GitHub-репозиторий авторов -**Путь к данным:** `/home/servml/Документы/datasets/GTA-UAV-LR/` -**Путь к аугментациям:** `/home/servml/Документы/datasets/GTA-UAV-LR-aug/` +**Путь к данным:** `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR/` +**Путь к аугментациям:** `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-aug/` --- @@ -284,7 +284,7 @@ ## 8. АУГМЕНТИРОВАННЫЙ НАБОР (GTA-UAV-LR-aug) -**Путь:** `/home/servml/Документы/datasets/GTA-UAV-LR-aug/` +**Путь:** `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-aug/` **Объём:** ~71 GB ### 8.1. Сгенерированные модальности diff --git a/README.md b/README.md index 0131bf3..162e123 100644 --- a/README.md +++ b/README.md @@ -377,9 +377,9 @@ that list it as a valid candidate. `n_scored_g2q` is reported in metrics for tra ### V3 — GTA-UAV + DINOv3 + DGTRS-CLIP (active) **Dataset:** GTA-UAV-LR (33K drone + 14K satellite, GTA V synthetic) -- RGB: `/home/servml/Документы/datasets/GTA-UAV-LR/` -- Captions: `/home/servml/Документы/datasets/GTA-UAV-LR-captions/` (40K JSON, 3-paragraph VLM) -- Segmentation: `/home/servml/Документы/datasets/GTA-UAV-LR-aug/` (17 classes) +- RGB: `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR/` +- Captions: `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions/` (40K JSON, 3-paragraph VLM) +- Segmentation: `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-aug/` (17 classes) - Seg filter: 37,498 passed / 10,905 excluded (>=90% background+water) - Split: 80/20 random (26,966 train / 6,742 test → 24,891/6,252 after seg filter) diff --git a/UAV-VisLoc_Dataset_Analysis.md b/UAV-VisLoc_Dataset_Analysis.md index e1e4457..80a7246 100644 --- a/UAV-VisLoc_Dataset_Analysis.md +++ b/UAV-VisLoc_Dataset_Analysis.md @@ -2,7 +2,7 @@ **Дата анализа:** 2026-04-17 **Метод:** Эмпирический анализ данных на диске + статья arXiv:2405.11936 + GitHub-репозиторий авторов -**Путь к данным:** `/home/servml/Документы/datasets/UAV_VisLoc_dataset/` +**Путь к данным:** `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/UAV_VisLoc_dataset/` --- diff --git a/in/config_files/gtauav_balanced/pipeline.gin b/in/config_files/gtauav_balanced/pipeline.gin index 3d5190b..334c272 100644 --- a/in/config_files/gtauav_balanced/pipeline.gin +++ b/in/config_files/gtauav_balanced/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_balanced_asym/pipeline.gin b/in/config_files/gtauav_balanced_asym/pipeline.gin index a0f65e9..ca91477 100644 --- a/in/config_files/gtauav_balanced_asym/pipeline.gin +++ b/in/config_files/gtauav_balanced_asym/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_balanced_sofia/pipeline.gin b/in/config_files/gtauav_balanced_sofia/pipeline.gin index 90f28d9..a757065 100644 --- a/in/config_files/gtauav_balanced_sofia/pipeline.gin +++ b/in/config_files/gtauav_balanced_sofia/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_balanced_sofia_v1/pipeline.gin b/in/config_files/gtauav_balanced_sofia_v1/pipeline.gin index d92a5d5..7943668 100644 --- a/in/config_files/gtauav_balanced_sofia_v1/pipeline.gin +++ b/in/config_files/gtauav_balanced_sofia_v1/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_balanced_stripnet/pipeline.gin b/in/config_files/gtauav_balanced_stripnet/pipeline.gin index d51c699..a551683 100644 --- a/in/config_files/gtauav_balanced_stripnet/pipeline.gin +++ b/in/config_files/gtauav_balanced_stripnet/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_balanced_stripnet_unfrozen/pipeline.gin b/in/config_files/gtauav_balanced_stripnet_unfrozen/pipeline.gin index c96c8e8..bd57683 100644 --- a/in/config_files/gtauav_balanced_stripnet_unfrozen/pipeline.gin +++ b/in/config_files/gtauav_balanced_stripnet_unfrozen/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_baseline/pipeline.gin b/in/config_files/gtauav_baseline/pipeline.gin index 50f53ed..e4440d0 100644 --- a/in/config_files/gtauav_baseline/pipeline.gin +++ b/in/config_files/gtauav_baseline/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_baseline_asym/pipeline.gin b/in/config_files/gtauav_baseline_asym/pipeline.gin index 2017a42..c8d93eb 100644 --- a/in/config_files/gtauav_baseline_asym/pipeline.gin +++ b/in/config_files/gtauav_baseline_asym/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_baseline_sofia/pipeline.gin b/in/config_files/gtauav_baseline_sofia/pipeline.gin index 227e5d2..d3490a8 100644 --- a/in/config_files/gtauav_baseline_sofia/pipeline.gin +++ b/in/config_files/gtauav_baseline_sofia/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_baseline_sofia_v1/pipeline.gin b/in/config_files/gtauav_baseline_sofia_v1/pipeline.gin index dfcca01..6a23731 100644 --- a/in/config_files/gtauav_baseline_sofia_v1/pipeline.gin +++ b/in/config_files/gtauav_baseline_sofia_v1/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_baseline_stripnet/pipeline.gin b/in/config_files/gtauav_baseline_stripnet/pipeline.gin index 6e878be..993ed74 100644 --- a/in/config_files/gtauav_baseline_stripnet/pipeline.gin +++ b/in/config_files/gtauav_baseline_stripnet/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_baseline_stripnet_unfrozen/pipeline.gin b/in/config_files/gtauav_baseline_stripnet_unfrozen/pipeline.gin index 1eb0d5c..f1e52be 100644 --- a/in/config_files/gtauav_baseline_stripnet_unfrozen/pipeline.gin +++ b/in/config_files/gtauav_baseline_stripnet_unfrozen/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_image_heavy/pipeline.gin b/in/config_files/gtauav_image_heavy/pipeline.gin index 5745058..a238b82 100644 --- a/in/config_files/gtauav_image_heavy/pipeline.gin +++ b/in/config_files/gtauav_image_heavy/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/gtauav_text_heavy/pipeline.gin b/in/config_files/gtauav_text_heavy/pipeline.gin index 5cc13c8..8f8e148 100644 --- a/in/config_files/gtauav_text_heavy/pipeline.gin +++ b/in/config_files/gtauav_text_heavy/pipeline.gin @@ -1,8 +1,8 @@ # Pipeline: GTA-UAV-LR with text captions, servml workstation paths. PipelineConfig.train_json = 'meta/train_80.json' PipelineConfig.test_json = 'meta/test_20.json' -PipelineConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PipelineConfig.caption_root = '/home/servml/Документы/datasets/GTA-UAV-LR-captions' +PipelineConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PipelineConfig.caption_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions' PipelineConfig.filter_meta = 'meta/seg_filter.json' PipelineConfig.epochs = 10 diff --git a/in/config_files/preprocess/preprocess.gin b/in/config_files/preprocess/preprocess.gin index b42c8bf..acf9f52 100644 --- a/in/config_files/preprocess/preprocess.gin +++ b/in/config_files/preprocess/preprocess.gin @@ -2,8 +2,8 @@ # scripts/filter_segmentation.py. Independent from training pipeline. # Inputs. -PreprocessConfig.rgb_root = '/home/servml/Документы/datasets/GTA-UAV-LR' -PreprocessConfig.segm_root = '/home/servml/Документы/datasets/GTA-UAV-LR-aug/segm' +PreprocessConfig.rgb_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR' +PreprocessConfig.segm_root = '/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-aug/segm' # make_split.py — 80/20 split with seed=42. PreprocessConfig.split_ratio = 0.8 diff --git a/pre_refactor_analysis.md b/pre_refactor_analysis.md index 1ea8615..ca18e31 100644 --- a/pre_refactor_analysis.md +++ b/pre_refactor_analysis.md @@ -174,8 +174,8 @@ TrainConfigGTAUAV.output_dir = "out/gtauav/balanced_asym" ```python # src/training/train_gtauav.py (module level) -_RGB_ROOT = "/home/servml/Документы/datasets/GTA-UAV-LR" -_CAPTION_ROOT = "/home/servml/Документы/datasets/GTA-UAV-LR-captions" +_RGB_ROOT = "/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR" +_CAPTION_ROOT = "/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions" _TRAIN_JSON = "meta/train_80.json" _TEST_JSON = "meta/test_20.json" _DINO_WEB = "nn_models/DINO_WEB/dinov3-vitl16-pretrain-lvd1689m.pth" @@ -183,17 +183,17 @@ _DINO_SAT = "nn_models/DINO_SAT/model.safetensors" _LRSCLIP = "nn_models/LRSCLIP/DGTRS-CLIP-ViT-L-14.pt" # src/datasets/gtauav_dataset.py (module level) — ДУБЛЬ: -_RGB_ROOT = Path("/home/servml/Документы/datasets/GTA-UAV-LR") -_CAPTION_ROOT = Path("/home/servml/Документы/datasets/GTA-UAV-LR-captions") +_RGB_ROOT = Path("/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR") +_CAPTION_ROOT = Path("/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions") # scripts/make_split.py (module level): -_RGB_ROOT = Path("/home/servml/Документы/datasets/GTA-UAV-LR") +_RGB_ROOT = Path("/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR") # scripts/filter_segmentation.py (module level): -SEGM_ROOT = Path("/home/servml/Документы/datasets/GTA-UAV-LR-aug/segm") +SEGM_ROOT = Path("/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-aug/segm") ``` -**Главная проблема — не сам факт хардкода**, а то, что один и тот же путь `/home/servml/Документы/datasets/GTA-UAV-LR` дублируется в **трёх** местах: train_gtauav.py + gtauav_dataset.py + make_split.py. Если переехать на другую машину — нужно править 3 файла; если забыть один — silent breakage. +**Главная проблема — не сам факт хардкода**, а то, что один и тот же путь `/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR` дублируется в **трёх** местах: train_gtauav.py + gtauav_dataset.py + make_split.py. Если переехать на другую машину — нужно править 3 файла; если забыть один — silent breakage. **Масштаб:** 4 файла, ~10 module-level констант пути. diff --git a/scripts/filter_segmentation.py b/scripts/filter_segmentation.py index 42e5887..2f0571e 100644 --- a/scripts/filter_segmentation.py +++ b/scripts/filter_segmentation.py @@ -25,7 +25,7 @@ from tqdm import tqdm LOGGER = logging.getLogger("caption_test.filter_seg") -SEGM_ROOT = Path("/home/servml/Документы/datasets/GTA-UAV-LR-aug/segm") +SEGM_ROOT = Path("/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-aug/segm") EXCLUDE_CLASSES = {0, 4} # background, water DEFAULT_THRESHOLD = 0.90 diff --git a/scripts/make_split.py b/scripts/make_split.py index 64e8138..aa5a0b1 100644 --- a/scripts/make_split.py +++ b/scripts/make_split.py @@ -19,7 +19,7 @@ import coloredlogs LOGGER = logging.getLogger("caption_test.make_split") -_RGB_ROOT = Path("/home/servml/Документы/datasets/GTA-UAV-LR") +_RGB_ROOT = Path("/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR") def main() -> None: diff --git a/src/conf/pipeline_conf.py b/src/conf/pipeline_conf.py index 5845519..1e17ee1 100644 --- a/src/conf/pipeline_conf.py +++ b/src/conf/pipeline_conf.py @@ -19,8 +19,8 @@ class PipelineConfig: # Data inputs. train_json: str = "meta/train_80.json", test_json: str = "meta/test_20.json", - rgb_root: str = "/home/servml/Документы/datasets/GTA-UAV-LR", - caption_root: str = "/home/servml/Документы/datasets/GTA-UAV-LR-captions", + rgb_root: str = "/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR", + caption_root: str = "/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions", filter_meta: str | None = None, # Training schedule. epochs: int = 10, diff --git a/src/conf/preprocess_conf.py b/src/conf/preprocess_conf.py index 7102e39..dd244ad 100644 --- a/src/conf/preprocess_conf.py +++ b/src/conf/preprocess_conf.py @@ -18,8 +18,8 @@ class PreprocessConfig: def __init__( self, # Inputs. - rgb_root: str = "/home/servml/Документы/datasets/GTA-UAV-LR", - segm_root: str = "/home/servml/Документы/datasets/GTA-UAV-LR-aug/segm", + rgb_root: str = "/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR", + segm_root: str = "/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-aug/segm", # make_split.py params. split_ratio: float = 0.8, split_seed: int = 42, diff --git a/src/datasets/gtauav_dataset.py b/src/datasets/gtauav_dataset.py index 7d49517..ec78bfc 100644 --- a/src/datasets/gtauav_dataset.py +++ b/src/datasets/gtauav_dataset.py @@ -30,8 +30,8 @@ LOGGER = logging.getLogger("caption_test.gtauav_dataset") coloredlogs.install(level="INFO", logger=LOGGER, fmt="%(asctime)s %(name)s %(levelname)s %(message)s") # Default paths. -_RGB_ROOT = Path("/home/servml/Документы/datasets/GTA-UAV-LR") -_CAPTION_ROOT = Path("/home/servml/Документы/datasets/GTA-UAV-LR-captions") +_RGB_ROOT = Path("/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR") +_CAPTION_ROOT = Path("/media/servml/SSD_2_2TB/datasets/cvgl_datasets/GTA-UAV-LR-captions") _EMPTY_CAPTION = "" # Regex to split P1/P2/P3 sections.