Merge branch 'fbopt' into fbopt_setpoint_ma_output_ma

marrlab · Oct 10, 2023 · ddde147 · ddde147
2 parents e748524 + 76a3511
commit ddde147
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/examples/benchmark/benchmark_fbopt_mnist_diva.yaml b/examples/benchmark/benchmark_fbopt_mnist_diva.yaml
@@ -47,39 +47,38 @@ Shared params:
     distribution: loguniform
 
   mu_init:
-    min: 0.01
-    max: 0.05
+    min: 0.000001
+    max: 0.00001
     num: 5
     distribution: loguniform
 
   gamma_y:
-    min: 1e4
+    min: 1.0
     max: 1e6
-    step: 100
     num: 3
     distribution: loguniform
 
   gamma_d:
-    min: 1e4
+    min: 1.0
     max: 1e6
     step: 100
     num: 3
     distribution: loguniform
 
 # Test fbopt with different hyperparameter configurations
 
-diva_fbopt_full:
+diva_fbopt_a:
   aname: diva
   trainer: fbopt
   str_mu: gammad_recon
   gamma_y: 1.0
+  init_setpoint_ratio: 0.99
 
   shared:
-    - ini_setpoint_ratio
     - k_i_gain
     - mu_init
 
-diva_feedforward_full:
+diva_feedforward_a:
   aname: diva
   trainer: hyperscheduler
   str_mu: gammad_recon

diff --git a/examples/benchmark/benchmark_fbopt_pacs_diva.yaml b/examples/benchmark/benchmark_fbopt_pacs_diva.yaml
@@ -23,7 +23,7 @@ domainlab_args:
   npath_topic_distrib_img2topic: examples/nets/resnet50domainbed.py
   npath_encoder_sandwich_layer_img2h4zd: examples/nets/resnet50domainbed.py
   exp_shoulder_clip: 10
-  mu_clip: 10_000
+  mu_clip: 1000_000
   coeff_ma: 0.5
   zx_dim: 0
   zy_dim: 64
@@ -41,25 +41,25 @@ Shared params:
 
   k_i_gain:
     min: 0.0001
-    max: 0.1
+    max: 0.01
     num: 3
     distribution: uniform
 
   mu_init:
-    min: 0.00001
-    max: 0.001
+    min: 0.000001
+    max: 0.00001
     num: 3
     distribution: loguniform
 
   gamma_y:
-    min: 1e4
+    min: 1.0
     max: 1e6
     step: 100
     num: 3
     distribution: loguniform
 
   gamma_d:
-    min: 1e4
+    min: 1.0
     max: 1e6
     step: 100
     num: 3
@@ -74,7 +74,7 @@ diva_fbopt_full:
   trainer: fbopt
   str_mu: gammad_recon
   gamma_y: 1.0
-  ini_setpoint_ratio: 0.95
+  ini_setpoint_ratio: 0.99
   shared:
     - k_i_gain
     - mu_init