update packages and partially fix detector training script

akucia · Jan 18, 2023 · 43d4650 · 43d4650
1 parent a98329e
commit 43d4650
Show file tree

Hide file tree

Showing 37 changed files with 2,852 additions and 5,756 deletions.
diff --git a/dvc.lock b/dvc.lock
@@ -27,51 +27,51 @@ stages:
       size: 1744824
   train-detector:
     cmd: python watch_recognition/watch_recognition/train/object_detection_task.py  --epochs
-      100  --batch-size 16  --seed 42
+      1  --batch-size 20  --seed 42
     deps:
     - path: datasets/test
-      md5: e3d2ee519a61c5f5a4579568529d2811.dir
-      size: 18637470
-      nfiles: 53
+      md5: 0aeb029db40e49068d63308665810b57.dir
+      size: 18701099
+      nfiles: 54
     - path: datasets/train
-      md5: 28f07f73f06d2e0befe195550531c835.dir
-      size: 136597936
-      nfiles: 347
+      md5: 9c414afa46808b376366ae8e0ff3c786.dir
+      size: 170152358
+      nfiles: 481
     - path: datasets/val
       md5: 1ab506f4b22a797ed4afeaf195c51466.dir
       size: 19774777
       nfiles: 40
     - path: datasets/watch-faces-local.json
-      md5: b70283f3027b17d5c33f72fe0685e3a5
-      size: 1573168
+      md5: ddb1e52cb640b1af3e8ba6c7c85c943a
+      size: 1744824
     - path: watch_recognition/watch_recognition/train/object_detection_task.py
-      md5: 27c40eae990bc1893dc86b8c346ce690
-      size: 11057
+      md5: d9041dfe06970095d1a331f9cb8c22e2
+      size: 11056
     params:
       params.yaml:
         detector:
-          epochs: 100
-          batch-size: 16
+          epochs: 1
+          batch-size: 20
           confidence-threshold: 0.5
         seed: 42
     outs:
     - path: debug/detector/
-      md5: d392c1ac3e579621f39adef8dd682265.dir
-      size: 971686
+      md5: f0064e0537be8585bdbe1a4f53d07a42.dir
+      size: 950728
       nfiles: 4
     - path: example_predictions/detector/test-image.jpg
-      md5: 3301315581f650bfca77e563487eb5dc
-      size: 129446
-    - path: metrics/detector.json
-      md5: 7ce39108312d2b28f8171981381e4151
-      size: 473
-    - path: metrics/detector/scalars
-      md5: f84b1d2eb1288f2c80270ef07e71e4f1.dir
-      size: 34207
+      md5: 753f27c86ade589ba2b889e6c2b0fe65
+      size: 142855
+    - path: metrics/detector/metrics.json
+      md5: 08def9779a8fafd2a854a5fd171c8a24
+      size: 476
+    - path: metrics/detector/plots
+      md5: 166a55f770c4f1085df8278629c5dbdb.dir
+      size: 422
       nfiles: 10
     - path: models/detector/
-      md5: 1fab3506112358531d4e67f67318d577.dir
-      size: 432232708
+      md5: 9b6fb65a98ec61423ed69b8822a11986.dir
+      size: 432220709
       nfiles: 5
   eval-detector:
     cmd: python watch_recognition/watch_recognition/eval/object_detection_eval.py
@@ -156,8 +156,8 @@ stages:
       md5: ddb1e52cb640b1af3e8ba6c7c85c943a
       size: 1744824
     - path: watch_recognition/watch_recognition/train/heatmap_regression_task.py
-      md5: e68e4f6ef260cea287079a8e531c0f9f
-      size: 8954
+      md5: f6a86273f89a38a8abdb8575ec154e9d
+      size: 8953
     params:
       params.yaml:
         keypoint:
@@ -173,22 +173,22 @@ stages:
         seed: 42
     outs:
     - path: debug/keypoint/
-      md5: fdf4e43af869a0912ba4bb95fd963743.dir
-      size: 395201
+      md5: 2ac270cd02a60722351bada220d03d8c.dir
+      size: 399737
       nfiles: 2
     - path: example_predictions/keypoint/test-image-2.jpg
-      md5: 946f8b1842e7753ecd8ade25d8e08148
-      size: 66392
-    - path: metrics/keypoint.json
-      md5: e25f966d1ec22df0d3f5dacb26a50794
-      size: 213
-    - path: metrics/keypoint/scalars/
-      md5: 2faa7b7e018d27bc8eb47e90949af369.dir
-      size: 14919
+      md5: 89d44b8cb435b07ac4634e13eaa00860
+      size: 66334
+    - path: metrics/keypoint/metrics.json
+      md5: c479e42ab5fdf1aa00041a9ea746728e
+      size: 214
+    - path: metrics/keypoint/plots/
+      md5: c6572a9c857b01e34dc8b7b1bc49ff3c.dir
+      size: 8908
       nfiles: 4
     - path: models/keypoint/
-      md5: 8b486b968106ca19a0f65d76db091c4d.dir
-      size: 35964730
+      md5: 4a34792d0d5209c621c38464f1614818.dir
+      size: 35988621
       nfiles: 6
   eval-keypoint:
     cmd: python watch_recognition/watch_recognition/eval/keypoint_detection_eval.py
@@ -262,8 +262,8 @@ stages:
       md5: ddb1e52cb640b1af3e8ba6c7c85c943a
       size: 1744824
     - path: watch_recognition/watch_recognition/train/segmentation_task.py
-      md5: 42b023a3e7c4eb48cfc62a9bf4833087
-      size: 9266
+      md5: af4c58046894343dd442a39bbfbd6411
+      size: 9265
     params:
       params.yaml:
         seed: 42
@@ -277,22 +277,22 @@ stages:
           - WatchFace
     outs:
     - path: debug/segmentation/
-      md5: 5b8d7a0cca9cce2b03eceb6032e23d93.dir
-      size: 766422
+      md5: 78f6047cbb06c4e7889f881f7143064d.dir
+      size: 761590
       nfiles: 4
     - path: example_predictions/segmentation/test-image-2.jpg
-      md5: 2cde89d15e615522ec7bf6486903221e
-      size: 64449
-    - path: metrics/segmentation.json
-      md5: a9b81eeb93d04c7cd45c960d89f280cb
+      md5: 44fc2994fb44e280363c023622c24163
+      size: 64278
+    - path: metrics/segmentation/metrics.json
+      md5: ed15dc7ca524e01ef350507b0f8cda43
       size: 215
-    - path: metrics/segmentation/scalars/
-      md5: c1b34f8e4a4fb6a6cf27f5f2cb213810.dir
-      size: 22612
+    - path: metrics/segmentation/plots/
+      md5: e0203589dc6763f0c85af5d7f2eee974.dir
+      size: 13572
       nfiles: 4
     - path: models/segmentation/
-      md5: fd691bc0af771d3b7e9fa76f05fa7851.dir
-      size: 35949358
+      md5: 986e39bc0071d95599ee1918c760865c.dir
+      size: 35949342
       nfiles: 5
   eval-end-2-end:
     cmd: python watch_recognition/watch_recognition/eval/end_to_end_eval.py --run-concurrently

diff --git a/dvc.yaml b/dvc.yaml
@@ -29,10 +29,10 @@ stages:
       - datasets/watch-faces-local.json
       - watch_recognition/watch_recognition/train/object_detection_task.py
     metrics:
-      - metrics/detector.json:
+      - metrics/detector/metrics.json:
           cache: false
     plots:
-      - metrics/detector/scalars:
+      - metrics/detector/plots:
           cache: false
       - example_predictions/detector/test-image.jpg:
           persist: true
@@ -107,10 +107,10 @@ stages:
       - datasets/watch-faces-local.json
       - watch_recognition/watch_recognition/train/heatmap_regression_task.py
     metrics:
-      - metrics/keypoint.json:
+      - metrics/keypoint/metrics.json:
           cache: false
     plots:
-      - metrics/keypoint/scalars/:
+      - metrics/keypoint/plots/:
           cache: false
       - example_predictions/keypoint/test-image-2.jpg:
           persist: true
@@ -158,10 +158,10 @@ stages:
       - datasets/watch-faces-local.json
       - watch_recognition/watch_recognition/train/segmentation_task.py
     metrics:
-      - metrics/segmentation.json:
+      - metrics/segmentation/metrics.json:
           cache: false
     plots:
-      - metrics/segmentation/scalars/:
+      - metrics/segmentation/plots/:
           cache: false
       - example_predictions/segmentation/test-image-2.jpg:
           persist: true

diff --git a/metrics/detector.json b/metrics/detector.json