Merge branch 'fbopt' into fbopt_output_ma

marrlab · Oct 9, 2023 · 61e42ae · 61e42ae
2 parents 744c525 + aed3081
commit 61e42ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/examples/benchmark/benchmark_fbopt_mnist_diva.yaml b/examples/benchmark/benchmark_fbopt_mnist_diva.yaml
@@ -21,7 +21,6 @@ domainlab_args:
   zx_dim: 0
   zy_dim: 32
   zd_dim: 32
-  gamma_y: 1.0
   nname: conv_bn_pool_2
   nname_dom: conv_bn_pool_2
   nname_topic_distrib_img2topic: conv_bn_pool_2
@@ -73,6 +72,7 @@ diva_fbopt_full:
   aname: diva
   trainer: fbopt
   str_mu: gammad_recon
+  gamma_y: 1.0
 
   shared:
     - ini_setpoint_ratio
@@ -83,6 +83,9 @@ diva_feedforward_full:
   aname: diva
   trainer: hyperscheduler
   str_mu: gammad_recon
+  gamma_y: 1.0
+  shared:
+    - gamma_d
 
 diva_default:
   aname: diva

diff --git a/run_erm.sh b/run_erm.sh
@@ -0,0 +1 @@
+python main_out.py --te_d=1 --tr_d 0 3 --task=mnistcolor10 --bs=16 --aname=deepall --nname=conv_bn_pool_2 --epos=10
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		python main_out.py --te_d=1 --tr_d 0 3 --task=mnistcolor10 --bs=16 --aname=deepall --nname=conv_bn_pool_2 --epos=10