Merge pull request #10 from lucasalvaa/experiments

Add hydra's config composition for experiments

Author: lucasalvaa

.dvc/config

@@ -1,5 +1,7 @@
 [core]
     remote = origin
     autostage = true
+[hydra]
+    enabled = True
 ['remote "origin"']
     url = https://dagshub.com/lucasalvaa/SkinDetector.dvc

.gitignore

@@ -207,5 +207,5 @@ marimo/_lsp/
 __marimo__/
 
 data
-/data_balanced
-/data_augmented
+*/data/augmented
+*/params.yaml

baseline/dvc.yaml

@@ -3,17 +3,19 @@ stages:
     foreach: [ effnet_s, effnet_m, convnext ]
     do:
       wdir: ..
-      cmd: python -m src.train --pipeline baseline --model ${item}
+      cmd: >
+        python -m src.train 
+        pipeline=baseline 
+        model=${item}
       deps:
         - data/split/train
         - data/split/val
         - src/train.py
         - src/common.py
       params:
-        - baseline/params.yaml:
-          - base
-          - data
-          - train
+        - conf/config.yaml:
+        - conf/pipeline/baseline.yaml:
+        - conf/model/${item}.yaml:
       outs:
         - baseline/${item}/model.pth
         - baseline/${item}/loss.json
@@ -22,17 +24,18 @@ stages:
     foreach: [ effnet_s, effnet_m, convnext ]
     do:
       wdir: ..
-      cmd: python -m src.evaluate --pipeline baseline --model ${item}
+      cmd: >
+        python -m src.evaluate 
+        pipeline=baseline 
+        model=${item}
       deps:
         - data/split/test
         - src/evaluate.py
         - src/common.py
         - baseline/${item}/model.pth
       params:
-        - baseline/params.yaml:
-          - base
-          - data
-          - evaluate
+        - conf/config.yaml:
+        - conf/pipeline/baseline.yaml:
       metrics:
         - baseline/${item}/metrics.json:
             cache: false
@@ -49,7 +52,6 @@ plots:
       template: linear
       x: epoch
       y:
-        # Qui confrontiamo le performance di addestramento tra i modelli
         effnet_s/loss.json: train_loss
         effnet_m/loss.json: train_loss
         convnext/loss.json: train_loss

baseline/params.yaml

@@ -0,0 +1,18 @@
+defaults:
+  - pipeline: baseline  # Carica conf/pipeline/baseline.yaml
+  - model: effnet_s     # Carica conf/model/effnet_s.yaml
+  - _self_
+
+base:
+  image_res: 224
+  seed: 42
+
+train:
+  alpha: 5.0 # GL alpha value
+
+evaluate:
+  batch_size: 16
+
+data:
+  valset_path: data/split/val
+  testset_path: data/split/test

conf/config.yaml

@@ -0,0 +1,4 @@
+name: convnext
+fullname: convnext_tiny
+layer: 2
+weights: ConvNeXt_Tiny_Weights.DEFAULT

conf/model/convnext.yaml

@@ -0,0 +1,4 @@
+name: effnet_m
+fullname: efficientnet_v2_m
+layer: 1
+weights: EfficientNet_V2_M_Weights.DEFAULT

conf/model/effnet_m.yaml

@@ -0,0 +1,4 @@
+name: effnet_s
+fullname: efficientnet_v2_s
+layer: 1
+weights: EfficientNet_V2_S_Weights.DEFAULT

conf/model/effnet_s.yaml

@@ -0,0 +1,10 @@
+out_dir: baseline/
+
+trainset_path: data/split/train
+
+train:
+  lr: 0.001
+  epochs: 4
+  batch_size: 16
+
+tsft: false

conf/pipeline/baseline.yaml

@@ -0,0 +1,15 @@
+out_dir: pipeline1/
+
+trainset_path: pipeline1/data/augmented/train
+
+augment:
+  src_dir: data/split
+  dst_dir: pipeline1/data/augmented
+  force: False
+
+train:
+  lr: 0.001
+  epochs: 4
+  batch_size: 16
+
+tsft: false