Add all plots, merge conflicts.

YannDubs · May 3, 2019 · a54b794 · a54b794
2 parents 406e684 + ebfe614
commit a54b794
Show file tree

Hide file tree

Showing 76 changed files with 18 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ experiments/
 archive*
 log*
 pretrained_models
+test/
 
 # Byte-compiled / optimized / DLL files
 *.egg-info

diff --git a/bin/plot_all.sh b/bin/plot_all.sh
@@ -9,7 +9,7 @@ echo "STARTING" > $logger
 
 # many idcs sameas https://github.com/1Konny/FactorVAE/blob/master/solver.py
 # to compare
-cherry_celeba_idcs="32260 191281 143307 101535 70059 88413 87889 176606 131612 179144"
+cherry_celeba_idcs="88413 176606 179144 32260 191281 143307 101535 70059 87889 131612 "
 cherry_mnist_idcs="1 40 25 7 92 41001 90 41002 823 41219" # take every number in order
 cherry_dsprites_idcs="92595 339150 656090" #take every shape: square ellipse heart
 cherry_chairs_idcs="40919 5172 22330"
@@ -56,6 +56,7 @@ do
 done
 
 python main_viz.py best_celeba all -i $cherry_celeba_idcs $kwargs
+python main_viz.py best_dsprites all -i $cherry_dsprites_idcs $kwargs
 
 
 echo "### GIF GRID MUTUAL INFO ###" >> $logger

diff --git a/bin/train_all.sh b/bin/train_all.sh
@@ -17,6 +17,8 @@ do
     wait
 done
 
-#echo "best_celeba" >> $logger
-#python main.py best_celeba -x best_celeba --no-progress-bar
+echo "best_celeba" >> $logger
+python main.py best_celeba -x best_celeba --no-progress-bar &
 
+echo "best_dsprites" >> $logger
+python main.py best_dsprites -x best_dsprites --no-progress-bar
diff --git a/bin/train_mutual_info.sh b/bin/train_mutual_info.sh
@@ -10,4 +10,3 @@ do
         python main.py "$loss"_"$dataset"_a$alpha -x "$loss"_"$dataset" --btcvae-A $alpha --no-progress-bar &
     done
 done
-
diff --git a/hyperparam.ini b/hyperparam.ini
@@ -140,7 +140,7 @@
 # those don't use the common section by default (need to be <loss>_<data> to use)!
 
 [best_celeba]
-    btcvae_A = 0
+    btcvae_A = -10
     btcvae_B = 20
     dataset = 'celeba'
     loss = "btcvae"
@@ -149,6 +149,15 @@
     lr = ${Common_btcvae:lr}
     rec_dist = "laplace"
 
+[best_dsprites]
+    btcvae_A = -5
+    btcvae_B = 10
+    dataset = 'dsprites'
+    loss = "btcvae"
+    epochs = ${Common_dsprites:epochs}
+    checkpoint_every = ${Common_dsprites:checkpoint_every}
+    lr = ${Common_btcvae:lr}
+
 [debug]
     epochs = 1
     log_level = "debug"

diff --git a/main.py b/main.py
@@ -19,7 +19,7 @@
 CONFIG_FILE = "hyperparam.ini"
 RES_DIR = "results"
 LOG_LEVELS = list(logging._levelToName.values())
-ADDITIONAL_EXP = ['custom', "debug", "best_celeba"]
+ADDITIONAL_EXP = ['custom', "debug", "best_celeba", "best_dsprites"]
 EXPERIMENTS = ADDITIONAL_EXP + ["{}_{}".format(loss, data)
                                 for loss in LOSSES
                                 for data in DATASETS]

diff --git a/results/VAE_celeba/data_samples.png b/results/VAE_celeba/data_samples.png
diff --git a/results/VAE_celeba/posterior_traversals.gif b/results/VAE_celeba/posterior_traversals.gif
diff --git a/results/VAE_celeba/posterior_traversals.png b/results/VAE_celeba/posterior_traversals.png
diff --git a/results/VAE_celeba/reconstruct.png b/results/VAE_celeba/reconstruct.png
diff --git a/results/VAE_celeba/reconstruct_traverse.png b/results/VAE_celeba/reconstruct_traverse.png
diff --git a/results/best_celeba/data_samples.png b/results/best_celeba/data_samples.png
diff --git a/results/best_celeba/posterior_traversals.gif b/results/best_celeba/posterior_traversals.gif
diff --git a/results/best_celeba/posterior_traversals.png b/results/best_celeba/posterior_traversals.png
diff --git a/results/best_celeba/reconstruct.png b/results/best_celeba/reconstruct.png
diff --git a/results/best_celeba/reconstruct_traverse.png b/results/best_celeba/reconstruct_traverse.png
diff --git a/results/best_celeba/samples.png b/results/best_celeba/samples.png
diff --git a/results/betaB_celeba/data_samples.png b/results/betaB_celeba/data_samples.png
diff --git a/results/betaB_celeba/posterior_traversals.gif b/results/betaB_celeba/posterior_traversals.gif
diff --git a/results/betaB_celeba/posterior_traversals.png b/results/betaB_celeba/posterior_traversals.png
diff --git a/results/betaB_celeba/reconstruct.png b/results/betaB_celeba/reconstruct.png
diff --git a/results/betaB_celeba/reconstruct_traverse.png b/results/betaB_celeba/reconstruct_traverse.png
diff --git a/results/betaH_celeba/data_samples.png b/results/betaH_celeba/data_samples.png
diff --git a/results/betaH_celeba/posterior_traversals.gif b/results/betaH_celeba/posterior_traversals.gif
diff --git a/results/betaH_celeba/posterior_traversals.png b/results/betaH_celeba/posterior_traversals.png
diff --git a/results/betaH_celeba/reconstruct.png b/results/betaH_celeba/reconstruct.png
diff --git a/results/betaH_celeba/reconstruct_traverse.png b/results/betaH_celeba/reconstruct_traverse.png
diff --git a/results/btcvae_celeba/data_samples.png b/results/btcvae_celeba/data_samples.png
diff --git a/results/btcvae_celeba/posterior_traversals.gif b/results/btcvae_celeba/posterior_traversals.gif
diff --git a/results/btcvae_celeba/posterior_traversals.png b/results/btcvae_celeba/posterior_traversals.png
diff --git a/results/btcvae_celeba/reconstruct.png b/results/btcvae_celeba/reconstruct.png
diff --git a/results/btcvae_celeba/reconstruct_traverse.png b/results/btcvae_celeba/reconstruct_traverse.png
diff --git a/results/btcvae_celeba_a-1/data_samples.png b/results/btcvae_celeba_a-1/data_samples.png
diff --git a/results/btcvae_celeba_a-1/posterior_traversals.gif b/results/btcvae_celeba_a-1/posterior_traversals.gif
diff --git a/results/btcvae_celeba_a-1/posterior_traversals.png b/results/btcvae_celeba_a-1/posterior_traversals.png
diff --git a/results/btcvae_celeba_a-1/reconstruct.png b/results/btcvae_celeba_a-1/reconstruct.png
diff --git a/results/btcvae_celeba_a-1/reconstruct_traverse.png b/results/btcvae_celeba_a-1/reconstruct_traverse.png
diff --git a/results/btcvae_celeba_a-1/samples.png b/results/btcvae_celeba_a-1/samples.png
diff --git a/results/btcvae_celeba_a-10/posterior_traversals.gif b/results/btcvae_celeba_a-10/posterior_traversals.gif
diff --git a/results/btcvae_celeba_a-100/posterior_traversals.gif b/results/btcvae_celeba_a-100/posterior_traversals.gif
diff --git a/results/btcvae_celeba_a-25/posterior_traversals.gif b/results/btcvae_celeba_a-25/posterior_traversals.gif
diff --git a/results/btcvae_celeba_a-5/posterior_traversals.gif b/results/btcvae_celeba_a-5/posterior_traversals.gif
diff --git a/results/btcvae_celeba_a-50/posterior_traversals.gif b/results/btcvae_celeba_a-50/posterior_traversals.gif
diff --git a/results/btcvae_celeba_a0/posterior_traversals.gif b/results/btcvae_celeba_a0/posterior_traversals.gif
diff --git a/results/btcvae_celeba_a1/data_samples.png b/results/btcvae_celeba_a1/data_samples.png
diff --git a/results/btcvae_celeba_a1/posterior_traversals.gif b/results/btcvae_celeba_a1/posterior_traversals.gif
diff --git a/results/btcvae_celeba_a1/posterior_traversals.png b/results/btcvae_celeba_a1/posterior_traversals.png
diff --git a/results/btcvae_celeba_a1/reconstruct.png b/results/btcvae_celeba_a1/reconstruct.png
diff --git a/results/btcvae_celeba_a1/reconstruct_traverse.png b/results/btcvae_celeba_a1/reconstruct_traverse.png
diff --git a/results/btcvae_celeba_a1/samples.png b/results/btcvae_celeba_a1/samples.png
diff --git a/results/btcvae_celeba_a5/posterior_traversals.gif b/results/btcvae_celeba_a5/posterior_traversals.gif
diff --git a/results/btcvae_dsprites_a-1/data_samples.png b/results/btcvae_dsprites_a-1/data_samples.png
diff --git a/results/btcvae_dsprites_a-1/posterior_traversals.gif b/results/btcvae_dsprites_a-1/posterior_traversals.gif
diff --git a/results/btcvae_dsprites_a-1/posterior_traversals.png b/results/btcvae_dsprites_a-1/posterior_traversals.png
diff --git a/results/btcvae_dsprites_a-1/reconstruct.png b/results/btcvae_dsprites_a-1/reconstruct.png
diff --git a/results/btcvae_dsprites_a-1/reconstruct_traverse.png b/results/btcvae_dsprites_a-1/reconstruct_traverse.png
diff --git a/results/btcvae_dsprites_a-1/samples.png b/results/btcvae_dsprites_a-1/samples.png
diff --git a/results/btcvae_dsprites_a-10/posterior_traversals.gif b/results/btcvae_dsprites_a-10/posterior_traversals.gif
diff --git a/results/btcvae_dsprites_a-25/posterior_traversals.gif b/results/btcvae_dsprites_a-25/posterior_traversals.gif
diff --git a/results/btcvae_dsprites_a-5/posterior_traversals.gif b/results/btcvae_dsprites_a-5/posterior_traversals.gif
diff --git a/results/btcvae_dsprites_a-50/posterior_traversals.gif b/results/btcvae_dsprites_a-50/posterior_traversals.gif
diff --git a/results/btcvae_dsprites_a0/posterior_traversals.gif b/results/btcvae_dsprites_a0/posterior_traversals.gif
diff --git a/results/btcvae_dsprites_a1/data_samples.png b/results/btcvae_dsprites_a1/data_samples.png
diff --git a/results/btcvae_dsprites_a1/posterior_traversals.gif b/results/btcvae_dsprites_a1/posterior_traversals.gif
diff --git a/results/btcvae_dsprites_a1/posterior_traversals.png b/results/btcvae_dsprites_a1/posterior_traversals.png
diff --git a/results/btcvae_dsprites_a1/reconstruct.png b/results/btcvae_dsprites_a1/reconstruct.png
diff --git a/results/btcvae_dsprites_a1/reconstruct_traverse.png b/results/btcvae_dsprites_a1/reconstruct_traverse.png
diff --git a/results/btcvae_dsprites_a1/samples.png b/results/btcvae_dsprites_a1/samples.png
diff --git a/results/btcvae_dsprites_a5/posterior_traversals.gif b/results/btcvae_dsprites_a5/posterior_traversals.gif
diff --git a/results/factor_celeba/data_samples.png b/results/factor_celeba/data_samples.png
diff --git a/results/factor_celeba/posterior_traversals.gif b/results/factor_celeba/posterior_traversals.gif
diff --git a/results/factor_celeba/posterior_traversals.png b/results/factor_celeba/posterior_traversals.png
diff --git a/results/factor_celeba/reconstruct.png b/results/factor_celeba/reconstruct.png
diff --git a/results/factor_celeba/reconstruct_traverse.png b/results/factor_celeba/reconstruct_traverse.png
diff --git a/results/grid_posteriors.gif b/results/grid_posteriors.gif
diff --git a/results/grid_posteriors_mutual_info.gif b/results/grid_posteriors_mutual_info.gif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,3 @@ do
		python main.py "$loss"_"$dataset"_a$alpha -x "$loss"_"$dataset" --btcvae-A $alpha --no-progress-bar &
		done
		done