Merge branch 'fbopt' into fbopt_output_ma

marrlab · Oct 9, 2023 · 534a1d3 · 534a1d3
2 parents 61e42ae + 47a6fff
commit 534a1d3
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 16 deletions.
diff --git a/examples/benchmark/benchmark_fbopt_mnist_diva.yaml b/examples/benchmark/benchmark_fbopt_mnist_diva.yaml
@@ -4,7 +4,7 @@ output_dir: zoutput/benchmarks/benchmark_fbopt
 
 sampling_seed: 0
 startseed: 0
-endseed: 2
+endseed: 4
 
 test_domains:
   - 0

diff --git a/examples/benchmark/benchmark_fbopt_mnist_jigen.yaml b/examples/benchmark/benchmark_fbopt_mnist_jigen.yaml
@@ -4,7 +4,7 @@ output_dir: zoutput/benchmarks/benchmark_fbopt
 
 sampling_seed: 0
 startseed: 0
-endseed: 2
+endseed: 4
 
 test_domains:
   - 0
@@ -50,7 +50,7 @@ Shared params:
 
   gamma_reg:
     min: 0.01
-    max: 1000
+    max: 10
     num: 10
     distribution: loguniform
 
@@ -61,12 +61,10 @@ Shared params:
 jigen_feedback:
   aname: jigen
   trainer: fbopt
-
+  ini_setpoint_ratio: 0.99
   shared:
-    - ini_setpoint_ratio
     - k_i_gain
     - mu_init
-    - pperm
 
 jigen_feedforward:
   aname: jigen

diff --git a/examples/benchmark/benchmark_fbopt_pacs_diva.yaml b/examples/benchmark/benchmark_fbopt_pacs_diva.yaml
@@ -46,20 +46,62 @@ Shared params:
     distribution: uniform
 
   mu_init:
-    min: 0.0001
+    min: 0.00001
     max: 0.001
     num: 3
     distribution: loguniform
 
+  gamma_y:
+    min: 1e4
+    max: 1e6
+    step: 100
+    num: 3
+    distribution: loguniform
+
+  gamma_d:
+    min: 1e4
+    max: 1e6
+    step: 100
+    num: 3
+    distribution: loguniform
+
 
 
 # Test fbopt with different hyperparameter configurations
 
-diva_fbopt:
+diva_fbopt_full:
   aname: diva
   trainer: fbopt
+  str_mu: gammad_recon
   gamma_y: 1.0
+  ini_setpoint_ratio: 0.95
   shared:
-    - ini_setpoint_ratio
     - k_i_gain
     - mu_init
+
+diva_feedforward_full:
+  aname: diva
+  trainer: hyperscheduler
+  str_mu: gammad_recon
+  gamma_y: 1.0
+  shared:
+    - gamma_d
+
+diva_default:
+  aname: diva
+  trainer: hyperscheduler
+  str_mu: default
+  shared:
+    - gamma_d
+    - gamma_y
+
+diva_fixed_penalty:
+  aname: diva
+  trainer: basic
+  str_mu: default
+  shared:
+    - gamma_d
+    - gamma_y
+
+erm:
+  aname: deepall
diff --git a/examples/benchmark/benchmark_fbopt_pacs_jigen.yaml b/examples/benchmark/benchmark_fbopt_pacs_jigen.yaml
@@ -5,7 +5,7 @@ output_dir: zoutput/benchmarks/benchmark_fbopt_pacs_full
 sampling_seed: 0
 
 startseed: 0
-endseed: 2
+endseed: 4
 
 test_domains:
   - sketch
@@ -40,8 +40,8 @@ Shared params:
 
   mu_init:
     min: 0.00001
-    max: 0.001
-    num: 4
+    max: 0.0001
+    num: 3
     distribution: loguniform
 
   pperm:
@@ -52,20 +52,20 @@ Shared params:
 
   gamma_reg:
     min: 0.01
-    max: 1000
+    max: 10
     num: 10
     distribution: loguniform
 
 # Test fbopt with different hyperparameter configurations
 
-jigen_fbopt:
+jigen_feedback:
   aname: jigen
-  init_setpoint_ratio: 0.99
   trainer: fbopt
+  ini_setpoint_ratio: 0.99
   shared:
     - k_i_gain
     - mu_init
-
+    
 jigen_feedforward:
   aname: jigen
   trainer: hyperscheduler