From dcdfb42cbc918dd8cf39f8bed4dfd3679587e291 Mon Sep 17 00:00:00 2001
From: Alex Lee <alexleegk@gmail.com>
Date: Wed, 23 Jan 2019 12:41:01 -0800
Subject: [PATCH] Update hparams json files.
---
.../bair/ours_deterministic_l1/model_hparams.json | 14 --------------
.../bair/ours_deterministic_l2/model_hparams.json | 14 --------------
hparams/bair/ours_gan/model_hparams.json | 13 -------------
hparams/bair/ours_savp/model_hparams.json | 12 ------------
hparams/bair/ours_vae_l1/model_hparams.json | 12 ------------
hparams/bair/ours_vae_l2/model_hparams.json | 12 ------------
hparams/bair/sna_l1/model_hparams.json | 12 ------------
hparams/bair/sna_l2/model_hparams.json | 12 ------------
hparams/bair/sv2p_time_variant/model_hparams.json | 12 ------------
.../ours_deterministic_l1/model_hparams.json | 3 +--
.../ours_deterministic_l2/model_hparams.json | 3 +--
.../bair_action_free/ours_gan/model_hparams.json | 7 ++++---
.../bair_action_free/ours_savp/model_hparams.json | 8 +++++---
.../ours_vae_l2/model_hparams.json | 12 ------------
.../sv2p_time_invariant/model_hparams.json | 2 +-
.../kth/ours_deterministic_l1/model_hparams.json | 3 +--
.../kth/ours_deterministic_l2/model_hparams.json | 3 +--
hparams/kth/ours_gan/model_hparams.json | 6 ++++--
hparams/kth/ours_savp/model_hparams.json | 11 +++++++----
hparams/kth/ours_vae_l1/model_hparams.json | 3 ++-
hparams/kth/sv2p_time_invariant/model_hparams.json | 12 ------------
hparams/kth/sv2p_time_variant/model_hparams.json | 12 ------------
22 files changed, 27 insertions(+), 171 deletions(-)
delete mode 100644 hparams/bair/ours_deterministic_l1/model_hparams.json
delete mode 100644 hparams/bair/ours_deterministic_l2/model_hparams.json
delete mode 100644 hparams/bair/ours_gan/model_hparams.json
delete mode 100644 hparams/bair/ours_savp/model_hparams.json
delete mode 100644 hparams/bair/ours_vae_l1/model_hparams.json
delete mode 100644 hparams/bair/ours_vae_l2/model_hparams.json
delete mode 100644 hparams/bair/sna_l1/model_hparams.json
delete mode 100644 hparams/bair/sna_l2/model_hparams.json
delete mode 100644 hparams/bair/sv2p_time_variant/model_hparams.json
delete mode 100644 hparams/bair_action_free/ours_vae_l2/model_hparams.json
delete mode 100644 hparams/kth/sv2p_time_invariant/model_hparams.json
delete mode 100644 hparams/kth/sv2p_time_variant/model_hparams.json
diff --git a/hparams/bair/ours_deterministic_l1/model_hparams.json b/hparams/bair/ours_deterministic_l1/model_hparams.json
deleted file mode 100644
index 25fb9307..00000000
--- a/hparams/bair/ours_deterministic_l1/model_hparams.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "batch_size": 32,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 1.0,
- "l2_weight": 0.0,
- "kl_weight": 0.0,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0001,
- "nz": 0,
- "e_net": "none"
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_deterministic_l2/model_hparams.json b/hparams/bair/ours_deterministic_l2/model_hparams.json
deleted file mode 100644
index 6d6145e5..00000000
--- a/hparams/bair/ours_deterministic_l2/model_hparams.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "batch_size": 32,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 0.0,
- "l2_weight": 1.0,
- "kl_weight": 0.0,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0001,
- "nz": 0,
- "e_net": "none"
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_gan/model_hparams.json b/hparams/bair/ours_gan/model_hparams.json
deleted file mode 100644
index 8631fa25..00000000
--- a/hparams/bair/ours_gan/model_hparams.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "batch_size": 16,
- "lr": 0.0002,
- "beta1": 0.5,
- "beta2": 0.999,
- "l1_weight": 100.0,
- "l2_weight": 0.0,
- "kl_weight": 0.0,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 1.0,
- "state_weight": 0.001,
- "e_net": "none"
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_savp/model_hparams.json b/hparams/bair/ours_savp/model_hparams.json
deleted file mode 100644
index 5295839d..00000000
--- a/hparams/bair/ours_savp/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 16,
- "lr": 0.0002,
- "beta1": 0.5,
- "beta2": 0.999,
- "l1_weight": 100.0,
- "l2_weight": 0.0,
- "kl_weight": 0.1,
- "video_sn_vae_gan_weight": 1.0,
- "video_sn_gan_weight": 1.0,
- "state_weight": 0.001
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_vae_l1/model_hparams.json b/hparams/bair/ours_vae_l1/model_hparams.json
deleted file mode 100644
index 0536e4f4..00000000
--- a/hparams/bair/ours_vae_l1/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 32,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 1.0,
- "l2_weight": 0.0,
- "kl_weight": 0.001,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair/ours_vae_l2/model_hparams.json b/hparams/bair/ours_vae_l2/model_hparams.json
deleted file mode 100644
index 1b4fd290..00000000
--- a/hparams/bair/ours_vae_l2/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 32,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 0.0,
- "l2_weight": 1.0,
- "kl_weight": 0.001,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair/sna_l1/model_hparams.json b/hparams/bair/sna_l1/model_hparams.json
deleted file mode 100644
index f32b4e7b..00000000
--- a/hparams/bair/sna_l1/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 32,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 1.0,
- "l2_weight": 0.0,
- "kl_weight": 0.0,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair/sna_l2/model_hparams.json b/hparams/bair/sna_l2/model_hparams.json
deleted file mode 100644
index 992882e5..00000000
--- a/hparams/bair/sna_l2/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 32,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 0.0,
- "l2_weight": 1.0,
- "kl_weight": 0.0,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair/sv2p_time_variant/model_hparams.json b/hparams/bair/sv2p_time_variant/model_hparams.json
deleted file mode 100644
index 9a10efc2..00000000
--- a/hparams/bair/sv2p_time_variant/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 32,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 0.0,
- "l2_weight": 1.0,
- "kl_weight": 0.008,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0001
-}
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json b/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
index a499cd54..4a1b23ed 100644
--- a/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
+++ b/hparams/bair_action_free/ours_deterministic_l1/model_hparams.json
@@ -9,6 +9,5 @@
"video_sn_vae_gan_weight": 0.0,
"video_sn_gan_weight": 0.0,
"state_weight": 0.0,
- "nz": 0,
- "e_net": "none"
+ "nz": 0
}
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json b/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
index b961c647..31e7152a 100644
--- a/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
+++ b/hparams/bair_action_free/ours_deterministic_l2/model_hparams.json
@@ -9,6 +9,5 @@
"video_sn_vae_gan_weight": 0.0,
"video_sn_gan_weight": 0.0,
"state_weight": 0.0,
- "nz": 0,
- "e_net": "none"
+ "nz": 0
}
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_gan/model_hparams.json b/hparams/bair_action_free/ours_gan/model_hparams.json
index 9874d3ee..38837822 100644
--- a/hparams/bair_action_free/ours_gan/model_hparams.json
+++ b/hparams/bair_action_free/ours_gan/model_hparams.json
@@ -7,7 +7,8 @@
"l2_weight": 0.0,
"kl_weight": 0.0,
"video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 1.0,
- "state_weight": 0.0,
- "e_net": "none"
+ "video_sn_gan_weight": 0.1,
+ "vae_gan_feature_cdist_weight": 0.0,
+ "gan_feature_cdist_weight": 10.0,
+ "state_weight": 0.0
}
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_savp/model_hparams.json b/hparams/bair_action_free/ours_savp/model_hparams.json
index 95c70ceb..a6eea83a 100644
--- a/hparams/bair_action_free/ours_savp/model_hparams.json
+++ b/hparams/bair_action_free/ours_savp/model_hparams.json
@@ -5,8 +5,10 @@
"beta2": 0.999,
"l1_weight": 100.0,
"l2_weight": 0.0,
- "kl_weight": 0.1,
- "video_sn_vae_gan_weight": 1.0,
- "video_sn_gan_weight": 1.0,
+ "kl_weight": 1.0,
+ "video_sn_vae_gan_weight": 0.1,
+ "video_sn_gan_weight": 0.1,
+ "vae_gan_feature_cdist_weight": 10.0,
+ "gan_feature_cdist_weight": 0.0,
"state_weight": 0.0
}
\ No newline at end of file
diff --git a/hparams/bair_action_free/ours_vae_l2/model_hparams.json b/hparams/bair_action_free/ours_vae_l2/model_hparams.json
deleted file mode 100644
index 4fddf0ee..00000000
--- a/hparams/bair_action_free/ours_vae_l2/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 32,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 0.0,
- "l2_weight": 1.0,
- "kl_weight": 0.001,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0
-}
\ No newline at end of file
diff --git a/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json b/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
index 329acdf7..4fddf0ee 100644
--- a/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
+++ b/hparams/bair_action_free/sv2p_time_invariant/model_hparams.json
@@ -5,7 +5,7 @@
"beta2": 0.999,
"l1_weight": 0.0,
"l2_weight": 1.0,
- "kl_weight": 0.008,
+ "kl_weight": 0.001,
"video_sn_vae_gan_weight": 0.0,
"video_sn_gan_weight": 0.0,
"state_weight": 0.0
diff --git a/hparams/kth/ours_deterministic_l1/model_hparams.json b/hparams/kth/ours_deterministic_l1/model_hparams.json
index a499cd54..4a1b23ed 100644
--- a/hparams/kth/ours_deterministic_l1/model_hparams.json
+++ b/hparams/kth/ours_deterministic_l1/model_hparams.json
@@ -9,6 +9,5 @@
"video_sn_vae_gan_weight": 0.0,
"video_sn_gan_weight": 0.0,
"state_weight": 0.0,
- "nz": 0,
- "e_net": "none"
+ "nz": 0
}
\ No newline at end of file
diff --git a/hparams/kth/ours_deterministic_l2/model_hparams.json b/hparams/kth/ours_deterministic_l2/model_hparams.json
index b961c647..31e7152a 100644
--- a/hparams/kth/ours_deterministic_l2/model_hparams.json
+++ b/hparams/kth/ours_deterministic_l2/model_hparams.json
@@ -9,6 +9,5 @@
"video_sn_vae_gan_weight": 0.0,
"video_sn_gan_weight": 0.0,
"state_weight": 0.0,
- "nz": 0,
- "e_net": "none"
+ "nz": 0
}
\ No newline at end of file
diff --git a/hparams/kth/ours_gan/model_hparams.json b/hparams/kth/ours_gan/model_hparams.json
index 9874d3ee..3d14b63e 100644
--- a/hparams/kth/ours_gan/model_hparams.json
+++ b/hparams/kth/ours_gan/model_hparams.json
@@ -7,7 +7,9 @@
"l2_weight": 0.0,
"kl_weight": 0.0,
"video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 1.0,
+ "video_sn_gan_weight": 0.1,
+ "vae_gan_feature_cdist_weight": 0.0,
+ "gan_feature_cdist_weight": 10.0,
"state_weight": 0.0,
- "e_net": "none"
+ "nz": 32
}
\ No newline at end of file
diff --git a/hparams/kth/ours_savp/model_hparams.json b/hparams/kth/ours_savp/model_hparams.json
index 7638a1ca..5eaa29c8 100644
--- a/hparams/kth/ours_savp/model_hparams.json
+++ b/hparams/kth/ours_savp/model_hparams.json
@@ -5,8 +5,11 @@
"beta2": 0.999,
"l1_weight": 100.0,
"l2_weight": 0.0,
- "kl_weight": 0.001,
- "video_sn_vae_gan_weight": 1.0,
- "video_sn_gan_weight": 1.0,
- "state_weight": 0.0
+ "kl_weight": 0.01,
+ "video_sn_vae_gan_weight": 0.1,
+ "video_sn_gan_weight": 0.1,
+ "vae_gan_feature_cdist_weight": 10.0,
+ "gan_feature_cdist_weight": 0.0,
+ "state_weight": 0.0,
+ "nz": 32
}
\ No newline at end of file
diff --git a/hparams/kth/ours_vae_l1/model_hparams.json b/hparams/kth/ours_vae_l1/model_hparams.json
index efef6a00..dee3ce9f 100644
--- a/hparams/kth/ours_vae_l1/model_hparams.json
+++ b/hparams/kth/ours_vae_l1/model_hparams.json
@@ -8,5 +8,6 @@
"kl_weight": 1e-05,
"video_sn_vae_gan_weight": 0.0,
"video_sn_gan_weight": 0.0,
- "state_weight": 0.0
+ "state_weight": 0.0,
+ "nz": 32
}
\ No newline at end of file
diff --git a/hparams/kth/sv2p_time_invariant/model_hparams.json b/hparams/kth/sv2p_time_invariant/model_hparams.json
deleted file mode 100644
index f1273998..00000000
--- a/hparams/kth/sv2p_time_invariant/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 16,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 0.0,
- "l2_weight": 1.0,
- "kl_weight": 0.008,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0
-}
\ No newline at end of file
diff --git a/hparams/kth/sv2p_time_variant/model_hparams.json b/hparams/kth/sv2p_time_variant/model_hparams.json
deleted file mode 100644
index f1273998..00000000
--- a/hparams/kth/sv2p_time_variant/model_hparams.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "batch_size": 16,
- "lr": 0.001,
- "beta1": 0.9,
- "beta2": 0.999,
- "l1_weight": 0.0,
- "l2_weight": 1.0,
- "kl_weight": 0.008,
- "video_sn_vae_gan_weight": 0.0,
- "video_sn_gan_weight": 0.0,
- "state_weight": 0.0
-}
\ No newline at end of file
--
GitLab