no change

hisup/224/v3_image_vit_cnn_bs4x12/.hydra/config.yaml

@@ -1,42 +1,46 @@
 host:
   name: gin
-  data_root: /data/rsulzer/${..dataset.name}_dataset
-  model_root: /data/rsulzer/${..dataset.name}_output
+  dataset_root: /data/rsulzer
+  model_root: /data/rsulzer
   multi_gpu: false
   device: cuda
   update_pbar_every: 1
   ldof_exe: /user/rsulzer/home/cpp/line-DOF-metric/build/calculate_DoF
+  dino_v2_repo: /user/rsulzer/home/remote_python/dinov2
 run_type:
-  name: release
+  name: debug
   batch_size: 16
-  train_subset: null
-  val_subset: null
-  test_subset: null
-  logging: INFO
-  num_workers: 16
-  log_to_wandb: true
-dataset:
-  name: PixelsPointsPolygons
-  size: ${..experiment.encoder.in_size}
-  path: ${host.data_root}/data/${.size}
-  annotations:
-    train: ${..path}/annotations/annotations_${...experiment.country}_train.json
-    val: ${..path}/annotations/annotations_${...experiment.country}_val.json
-    test: ${..path}/annotations/annotations_${...experiment.country}_test.json
-  ffl_stats:
-    train: ${..path}/ffl/train/stats-${...experiment.country}.pt
-    val: ${..path}/ffl/val/stats-${...experiment.country}.pt
-    test: ${..path}/ffl/test/stats-${...experiment.country}.pt
-  train_subset: ${..run_type.train_subset}
-  val_subset: ${..run_type.val_subset}
-  test_subset: ${..run_type.test_subset}
+  train_subset: 256
+  val_subset: 32
+  test_subset: 32
+  logging: DEBUG
+  num_workers: 0
+  log_to_wandb: false
 experiment:
+  dataset:
+    name: PixelsPointsPolygons
+    size: ${..encoder.in_size}
+    in_path: ${host.dataset_root}/${..dataset.name}_dataset/data/${.size}
+    out_path: ${host.model_root}/${..dataset.name}_output
+    annotation_type: blocks
+    country: CH
+    annotations:
+      train: ${..in_path}/annotations/${..annotation_type}/annotations_${..country}_train.json
+      val: ${..in_path}/annotations/${..annotation_type}/annotations_${..country}_val.json
+      test: ${..in_path}/annotations/${..annotation_type}/annotations_${..country}_test.json
+    ffl_stats:
+      train: ${..in_path}/ffl/train/stats-${..country}.pt
+      val: ${..in_path}/ffl/val/stats-${..country}.pt
+      test: ${..in_path}/ffl/test/stats-${..country}.pt
+    train_subset: ${...run_type.train_subset}
+    val_subset: ${...run_type.val_subset}
+    test_subset: ${...run_type.test_subset}
   encoder:
     name: vit_cnn
     use_images: true
     use_lidar: false
     type: vit_small_patch${.patch_size}_${.in_size}.dino
-    checkpoint_file: ${...host.model_root}/backbones/dino_deitsmall8_pretrain.pth
+    checkpoint_file: ${..dataset.out_path}/backbones/dino_deitsmall8_pretrain.pth
     pretrained: true
     in_size: 224
     in_height: ${.in_size}
@@ -94,25 +98,21 @@ experiment:
       loss_remask: 1.0
   name: v3_image_vit_cnn_bs4x12
   group_name: v2_${.model.name}
-  country: CH
+  project_name: HiSup
 training:
   save_best: true
   save_latest: true
   save_every: 10
-  val_every: 1
+  val_every: 5
   best_val_loss: 10000000.0
   best_val_iou: 0.0
 evaluation:
   split: val
-  pred_file: ${..output_dir}/predictions_${..experiment.country}_${.split}/${..checkpoint}.json
+  pred_file: ${..output_dir}/predictions_${..experiment.dataset.country}_${.split}/${..checkpoint}.json
   modes:
-  - ldof
-  - hausdorff
-  - coco
   - iou
-  - polis
-  - mta
   eval_file: results/metrics
-output_dir: ${.host.model_root}/${.experiment.model.name}/${.experiment.encoder.in_size}/${.experiment.name}
+output_dir: ${.experiment.dataset.out_path}/${.experiment.model.name}/${.experiment.encoder.in_size}/${.experiment.name}
 checkpoint: best_val_iou
 num_workers: ${.run_type.num_workers}
+image_file: demo_data/image0_CH_val.tif

hisup/224/v3_image_vit_cnn_bs4x12/.hydra/hydra.yaml

@@ -112,17 +112,15 @@ hydra:
     hydra:
     - hydra.mode=RUN
     task:
-    - experiment=hisup_image
-    - run_type=release
-    - evaluation=test
-    - experiment.country=CH
-    - checkpoint=best_val_iou
+    - run_type=debug
     - host=gin
-    - evaluation.split=val
+    - checkpoint=best_val_iou
+    - experiment=hisup_image
+    - +image_file=demo_data/image0_CH_val.tif
   job:
-    name: predict
+    name: predict_demo
     chdir: null
-    override_dirname: checkpoint=best_val_iou,evaluation.split=val,evaluation=test,experiment.country=CH,experiment=hisup_image,host=gin,run_type=release
+    override_dirname: +image_file=demo_data/image0_CH_val.tif,checkpoint=best_val_iou,experiment=hisup_image,host=gin,run_type=debug
     id: ???
     num: ???
     config_name: config
@@ -149,13 +147,13 @@ hydra:
       provider: schema
     output_dir: /data/rsulzer/PixelsPointsPolygons_output/hisup/224/v3_image_vit_cnn_bs4x12
     choices:
-      evaluation: test
+      evaluation: val
       training: default
       experiment: hisup_image
       model@experiment.model: hisup
       encoder@experiment.encoder: vit_cnn
-      dataset: p3
-      run_type: release
+      dataset@experiment.dataset: p3
+      run_type: debug
       host: gin
       hydra/env: default
       hydra/callbacks: null

hisup/224/v3_image_vit_cnn_bs4x12/.hydra/overrides.yaml

@@ -1,7 +1,5 @@
-- experiment=hisup_image
-- run_type=release
-- evaluation=test
-- experiment.country=CH
-- checkpoint=best_val_iou
+- run_type=debug
 - host=gin
-- evaluation.split=val
+- checkpoint=best_val_iou
+- experiment=hisup_image
+- +image_file=demo_data/image0_CH_val.tif

pix2poly/224/image_bs2x16/predictions_CH_val/best_val_iou.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:417117afafadfe360062181df75c55caedac3d370159a5b17cdfec528687196e
-size 467261
+oid sha256:1e33a00bfd76c962dfbe6734f8a2b9b4ed1aebb7754d6fccb43dd83ccc141d96
+size 33457

pix2poly/224/v4_image_vit_bs4x16/predictions_CH_val/best_val_iou.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1126f59e7ed29ec45143e31ec7de667abe64c89df29376d1a8323ffe0b5845a3
-size 458422
+oid sha256:96ffc916fa37450666cb606a281e01a117f60687fd85242c39f5c804b80f3589
+size 35885