Merge branch 'main' of hf.co:rsi/PixelsPointsPolygons

ffl/224/v4_image_bs4x16/.hydra/config.yaml

@@ -7,13 +7,13 @@ host:
   update_pbar_every: 1
   ldof_exe: /user/rsulzer/home/cpp/line-DOF-metric/build/calculate_DoF
 run_type:
-  name: release
+  name: debug
   batch_size: 16
-  train_subset: null
-  val_subset: null
-  test_subset: null
-  logging: INFO
-  num_workers: 16
+  train_subset: 256
+  val_subset: 32
+  test_subset: 1024
+  logging: DEBUG
+  num_workers: 0
   log_to_wandb: false
 dataset:
   name: PixelsPointsPolygons
@@ -229,10 +229,9 @@ training:
   best_val_loss: 10000000.0
   best_val_iou: 0.0
 evaluation:
-  split: val
+  split: test
   pred_file: ${..output_dir}/predictions_${..experiment.country}_${.split}/${..checkpoint}.json
-  modes:
-  - iou
+  modes: subset_iou
   eval_file: results/metrics
 output_dir: ${.host.model_root}/${.experiment.model.name}/${.experiment.encoder.in_size}/${.experiment.name}
 checkpoint: best_val_iou

ffl/224/v4_image_bs4x16/.hydra/hydra.yaml

@@ -112,17 +112,18 @@ hydra:
     hydra:
     - hydra.mode=RUN
     task:
-    - run_type=release
-    - host=gin
-    - run_type.log_to_wandb=false
-    - checkpoint=best_val_iou
     - experiment=ffl_image
+    - run_type=debug
+    - evaluation=test
     - experiment.country=NZ
-    - evaluation=val
+    - checkpoint=best_val_iou
+    - host=gin
+    - evaluation.modes=subset_iou
+    - run_type.test_subset=1024
   job:
     name: predict
     chdir: null
-    override_dirname: checkpoint=best_val_iou,evaluation=val,experiment.country=NZ,experiment=ffl_image,host=gin,run_type.log_to_wandb=false,run_type=release
+    override_dirname: checkpoint=best_val_iou,evaluation.modes=subset_iou,evaluation=test,experiment.country=NZ,experiment=ffl_image,host=gin,run_type.test_subset=1024,run_type=debug
     id: ???
     num: ???
     config_name: config
@@ -149,14 +150,14 @@ hydra:
       provider: schema
     output_dir: /data/rsulzer/PixelsPointsPolygons_output/ffl/224/v4_image_bs4x16
     choices:
-      evaluation: val
+      evaluation: test
       training: default
       experiment: ffl_image
       polygonization@experiment.polygonization: asm_acm
       model@experiment.model: ffl
       encoder@experiment.encoder: vit_cnn
       dataset: p3
-      run_type: release
+      run_type: debug
       host: gin
       hydra/env: default
       hydra/callbacks: null

ffl/224/v4_image_bs4x16/.hydra/overrides.yaml

@@ -1,7 +1,8 @@
-- run_type=release
-- host=gin
-- run_type.log_to_wandb=false
-- checkpoint=best_val_iou
 - experiment=ffl_image
+- run_type=debug
+- evaluation=test
 - experiment.country=NZ
-- evaluation=val
+- checkpoint=best_val_iou
+- host=gin
+- evaluation.modes=subset_iou
+- run_type.test_subset=1024

ffl/224/v4_image_bs4x16/predictions_CH_val/best_val_iou.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:975004d13ff0f64029a256772b5c6af0b7c994d2104ed312e546bdd7237ddbc5
+oid sha256:6cc4dd5353a1f1388b802760850c30366971cbdaaeb21331d250f325a9f24cd3
 size 285

hisup/224/lidar_pp_vit_cnn_bs2x16_mnv64/.hydra/config.yaml

@@ -1,164 +0,0 @@
-host:
-  name: gin
-<<<<<<< HEAD
-<<<<<<< HEAD
-  data_root: /data/rsulzer/${..dataset.name}
-=======
-  data_root: /data/rsulzer/${..dataset.name}_dataset
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-=======
-  data_root: /data/rsulzer/${..dataset.name}_dataset
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-  model_root: /data/rsulzer/${..dataset.name}_output
-  multi_gpu: false
-  device: cuda
-  update_pbar_every: 1
-  ldof_exe: /user/rsulzer/home/cpp/line-DOF-metric/build/calculate_DoF
-run_type:
-<<<<<<< HEAD
-<<<<<<< HEAD
-  name: debug
-  batch_size: 16
-  train_subset: 256
-  val_subset: 32
-  test_subset: 32
-  logging: DEBUG
-  num_workers: 0
-  log_to_wandb: false
-=======
-=======
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-  name: release
-  batch_size: 16
-  train_subset: null
-  val_subset: null
-  test_subset: null
-  logging: INFO
-  num_workers: 16
-  log_to_wandb: true
-<<<<<<< HEAD
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-=======
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-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}
-experiment:
-  encoder:
-    name: pointpillars_vit_cnn
-    use_images: false
-    use_lidar: true
-    in_size: 224
-    in_height: ${.in_size}
-    in_width: ${.in_size}
-    in_voxel_size:
-      x: 8
-      'y': 8
-      z: 100
-    max_num_points_per_voxel: 64
-    max_num_voxels:
-      train: 784
-      test: 784
-    out_feature_size: ${..model.decoder.in_feature_size}
-    out_feature_height: ${.out_feature_size}
-    out_feature_width: ${.out_feature_size}
-    out_feature_dim: ${..model.decoder.in_feature_dim}
-    vit:
-      type: vit_small_patch${..patch_size}_${..in_size}.dino
-      checkpoint_file: ${....host.model_root}/backbones/dino_deitsmall8_pretrain.pth
-      pretrained: true
-    patch_size: 8
-    patch_feature_size: 28
-    patch_feature_height: ${.patch_feature_size}
-    patch_feature_width: ${.patch_feature_size}
-    patch_feature_dim: 384
-    augmentations:
-    - D4
-  model:
-    name: hisup
-    decoder:
-      in_feature_size: 224
-      in_feature_width: ${.in_feature_size}
-      in_feature_height: ${.in_feature_size}
-      in_feature_dim: 256
-    point_pillars:
-      out_channels:
-      - 128
-      - 128
-      - 128
-      upsample_strides:
-      - 1
-      - 2
-      - 4
-    batch_size: ${...run_type.batch_size}
-    start_epoch: 0
-    num_epochs: 200
-    milestone: 0
-    learning_rate: 0.0001
-    weight_decay: 0.0001
-    loss_weights:
-      loss_joff: 0.25
-      loss_jloc: 8.0
-      loss_mask: 1.0
-      loss_afm: 0.1
-      loss_remask: 1.0
-  name: lidar_pp_vit_cnn_bs2x16_mnv64
-  group_name: v2_${.model.name}
-<<<<<<< HEAD
-<<<<<<< HEAD
-  country: CH
-=======
-  country: NZ
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-=======
-  country: NZ
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-training:
-  save_best: true
-  save_latest: true
-  save_every: 10
-  val_every: 1
-  best_val_loss: 10000000.0
-  best_val_iou: 0.0
-evaluation:
-  split: val
-  pred_file: ${..output_dir}/predictions_${..experiment.country}_${.split}/${..checkpoint}.json
-  modes:
-<<<<<<< HEAD
-<<<<<<< HEAD
-  - iou
-  eval_file: results/metrics
-experiment.name: debug
-output_dir: ${.host.model_root}/${.experiment.model.name}/${.experiment.encoder.in_size}/${.experiment.name}
-checkpoint: best_val_iou
-num_workers: ${.run_type.num_workers}
-lidar_file: demo_data/lidar0_CH_val.copc.laz
-=======
-=======
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-  - ldof
-  - hausdorff
-  - coco
-  - iou
-  - polis
-  - mta
-  eval_file: results/metrics
-output_dir: ${.host.model_root}/${.experiment.model.name}/${.experiment.encoder.in_size}/${.experiment.name}
-checkpoint: best_val_iou
-num_workers: ${.run_type.num_workers}
-<<<<<<< HEAD
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-=======
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea

hisup/224/lidar_pp_vit_cnn_bs2x16_mnv64/.hydra/hydra.yaml

@@ -1,203 +0,0 @@
-hydra:
-  run:
-    dir: ${...output_dir}
-  sweep:
-    dir: multirun/${now:%Y-%m-%d}/${now:%H-%M-%S}
-    subdir: ${hydra.job.num}
-  launcher:
-    _target_: hydra._internal.core_plugins.basic_launcher.BasicLauncher
-  sweeper:
-    _target_: hydra._internal.core_plugins.basic_sweeper.BasicSweeper
-    max_batch_size: null
-    params: null
-  help:
-    app_name: ${hydra.job.name}
-    header: '${hydra.help.app_name} is powered by Hydra.
-
-      '
-    footer: 'Powered by Hydra (https://hydra.cc)
-
-      Use --hydra-help to view Hydra specific help
-
-      '
-    template: '${hydra.help.header}
-
-      == Configuration groups ==
-
-      Compose your configuration from those groups (group=option)
-
-
-      $APP_CONFIG_GROUPS
-
-
-      == Config ==
-
-      Override anything in the config (foo.bar=value)
-
-
-      $CONFIG
-
-
-      ${hydra.help.footer}
-
-      '
-  hydra_help:
-    template: 'Hydra (${hydra.runtime.version})
-
-      See https://hydra.cc for more info.
-
-
-      == Flags ==
-
-      $FLAGS_HELP
-
-
-      == Configuration groups ==
-
-      Compose your configuration from those groups (For example, append hydra/job_logging=disabled
-      to command line)
-
-
-      $HYDRA_CONFIG_GROUPS
-
-
-      Use ''--cfg hydra'' to Show the Hydra config.
-
-      '
-    hydra_help: ???
-  hydra_logging:
-    version: 1
-    formatters:
-      simple:
-        format: '[%(asctime)s][HYDRA] %(message)s'
-    handlers:
-      console:
-        class: logging.StreamHandler
-        formatter: simple
-        stream: ext://sys.stdout
-    root:
-      level: INFO
-      handlers:
-      - console
-    loggers:
-      logging_example:
-        level: DEBUG
-    disable_existing_loggers: false
-  job_logging:
-    version: 1
-    formatters:
-      simple:
-        format: '[%(asctime)s][%(name)s][%(levelname)s] - %(message)s'
-    handlers:
-      console:
-        class: logging.StreamHandler
-        formatter: simple
-        stream: ext://sys.stdout
-      file:
-        class: logging.FileHandler
-        formatter: simple
-        filename: ${hydra.runtime.output_dir}/${hydra.job.name}.log
-    root:
-      level: INFO
-      handlers:
-      - console
-      - file
-    disable_existing_loggers: false
-  env: {}
-  mode: RUN
-  searchpath: []
-  callbacks: {}
-  output_subdir: .hydra
-  overrides:
-    hydra:
-    - hydra.mode=RUN
-    task:
-<<<<<<< HEAD
-<<<<<<< HEAD
-    - run_type=debug
-    - host=gin
-    - checkpoint=best_val_iou
-    - experiment=hisup_lidar
-    - +lidar_file=demo_data/lidar0_CH_val.copc.laz
-  job:
-    name: predict_demo
-    chdir: null
-    override_dirname: +lidar_file=demo_data/lidar0_CH_val.copc.laz,checkpoint=best_val_iou,experiment=hisup_lidar,host=gin,run_type=debug
-=======
-=======
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-    - experiment=hisup_lidar
-    - run_type=release
-    - evaluation=test
-    - experiment.country=NZ
-    - checkpoint=best_val_iou
-    - host=gin
-    - evaluation.split=val
-  job:
-    name: predict
-    chdir: null
-    override_dirname: checkpoint=best_val_iou,evaluation.split=val,evaluation=test,experiment.country=NZ,experiment=hisup_lidar,host=gin,run_type=release
-<<<<<<< HEAD
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-=======
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-    id: ???
-    num: ???
-    config_name: config
-    env_set: {}
-    env_copy: []
-    config:
-      override_dirname:
-        kv_sep: '='
-        item_sep: ','
-        exclude_keys: []
-  runtime:
-    version: 1.3.2
-    version_base: '1.3'
-    cwd: /run/netsop/u/home-sam/home/rsulzer/remote_python/pixelspointspolygons
-    config_sources:
-    - path: hydra.conf
-      schema: pkg
-      provider: hydra
-    - path: /run/netsop/u/home-sam/home/rsulzer/remote_python/pixelspointspolygons/config
-      schema: file
-      provider: main
-    - path: ''
-      schema: structured
-      provider: schema
-    output_dir: /data/rsulzer/PixelsPointsPolygons_output/hisup/224/lidar_pp_vit_cnn_bs2x16_mnv64
-    choices:
-<<<<<<< HEAD
-<<<<<<< HEAD
-      evaluation: val
-=======
-      evaluation: test
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-=======
-      evaluation: test
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-      training: default
-      experiment: hisup_lidar
-      model@experiment.model: hisup
-      encoder@experiment.encoder: pointpillars_vit_cnn
-      dataset: p3
-<<<<<<< HEAD
-<<<<<<< HEAD
-      run_type: debug
-=======
-      run_type: release
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-=======
-      run_type: release
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-      host: gin
-      hydra/env: default
-      hydra/callbacks: null
-      hydra/job_logging: default
-      hydra/hydra_logging: default
-      hydra/hydra_help: default
-      hydra/help: default
-      hydra/sweeper: basic
-      hydra/launcher: basic
-      hydra/output: default
-  verbose: false

hisup/224/lidar_pp_vit_cnn_bs2x16_mnv64/.hydra/overrides.yaml

@@ -1,21 +0,0 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-- run_type=debug
-- host=gin
-- checkpoint=best_val_iou
-- experiment=hisup_lidar
-- +lidar_file=demo_data/lidar0_CH_val.copc.laz
-=======
-=======
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-- experiment=hisup_lidar
-- run_type=release
-- evaluation=test
-- experiment.country=NZ
-- checkpoint=best_val_iou
-- host=gin
-- evaluation.split=val
-<<<<<<< HEAD
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea
-=======
->>>>>>> df6ab2ddb053c3193f7a0b1cb97a915421b3d2ea

hisup/224/lidar_pp_vit_cnn_bs2x16_mnv64/predictions_NZ_val/best_val_iou.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c3f8294b97ffcac4204b27197499047f8e88228a41ccf996cab4fbd02b2b634
+oid sha256:0c61ff86661d65d29f752bd24651e1c4af5d66001f52ee63327381b84389cc42
 size 285

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

@@ -1,6 +1,6 @@
 host:
   name: gin
-  data_root: /data/rsulzer/${..dataset.name}
+  data_root: /data/rsulzer/${..dataset.name}_dataset
   model_root: /data/rsulzer/${..dataset.name}_output
   multi_gpu: false
   device: cuda
@@ -106,9 +106,13 @@ evaluation:
   split: val
   pred_file: ${..output_dir}/predictions_${..experiment.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}
 checkpoint: best_val_iou
 num_workers: ${.run_type.num_workers}
-image_file: /user/rsulzer/home/inria4.tiff

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

@@ -112,14 +112,17 @@ hydra:
     hydra:
     - hydra.mode=RUN
     task:
-    - checkpoint=best_val_iou
     - experiment=hisup_image
-    - +image_file=/user/rsulzer/home/inria4.tiff
+    - run_type=release
+    - evaluation=test
+    - experiment.country=CH
+    - checkpoint=best_val_iou
     - host=gin
+    - evaluation.split=val
   job:
-    name: predict_demo
+    name: predict
     chdir: null
-    override_dirname: +image_file=/user/rsulzer/home/inria4.tiff,checkpoint=best_val_iou,experiment=hisup_image,host=gin
+    override_dirname: checkpoint=best_val_iou,evaluation.split=val,evaluation=test,experiment.country=CH,experiment=hisup_image,host=gin,run_type=release
     id: ???
     num: ???
     config_name: config
@@ -146,7 +149,7 @@ hydra:
       provider: schema
     output_dir: /data/rsulzer/PixelsPointsPolygons_output/hisup/224/v3_image_vit_cnn_bs4x12
     choices:
-      evaluation: val
+      evaluation: test
       training: default
       experiment: hisup_image
       model@experiment.model: hisup

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

@@ -1,4 +1,7 @@
-- checkpoint=best_val_iou
 - experiment=hisup_image
-- +image_file=/user/rsulzer/home/inria4.tiff
+- run_type=release
+- evaluation=test
+- experiment.country=CH
+- checkpoint=best_val_iou
 - host=gin
+- evaluation.split=val

pix2poly/224/{early_fusion_bs2x16_mnv64/predictions_Switzerland_test/best_val_iou.json → building_fusion_bs2x16/checkpoints/best_val_iou.pth}

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32aaae717da6b591cb500441daed20d8860b0cd3855e8d5689103251e4f42c5c
-size 8250273
+oid sha256:8ac09924d838e68f24a1483d867b5cea3d46750e020464d0b980146c4fe784c5
+size 415475562

pix2poly/224/{early_fusion_bs2x16_mnv64/predictions_Switzerland_val/best_val_iou.json → building_fusion_bs2x16/checkpoints/best_val_loss.pth}

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59976072d0dc38f45f5352f8ab5989235f692f1419aee00517cd023b21aefe56
-size 510924
+oid sha256:aaf57af1b4dc4d53a572efb74b6202875f4d3ce3370cb3b886a1d1a6d1ad6aa4
+size 415476801

pix2poly/224/{early_fusion_bs2x16_mnv64/predictions_test/best_val_iou.json → building_fusion_bs2x16/checkpoints/latest.pth}

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8ca0264672c4651170f5f539066f2aa72ca86c304f2123d0bbf5058bc16f442
-size 48328
+oid sha256:1e53ce7eb81a66f7b2165c4975246c177cc66e162ca1ca2a55fe1564736ee2d4
+size 415463584

{ffl/224/v4_image_bs4x16/predictions_CH_val/acm.tol_1 → pix2poly/224/building_fusion_bs2x16/predictions_CH_val}/best_val_iou.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:975004d13ff0f64029a256772b5c6af0b7c994d2104ed312e546bdd7237ddbc5
-size 285
+oid sha256:8c7ad275642418da3908d5585482c746654c9d5904ab4d00981bd76cac0418c1
+size 864044

pix2poly/224/early_fusion_bs2x16_mnv64/predictions_val/best_val_iou.json

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f63a11cfda672222ee84e4e4ecaaee6874b22ce9663a817f2d82665625d19bb3
-size 942258