From b34971fd29de206c79b9ff4bf5fbe4855d70be4d Mon Sep 17 00:00:00 2001 From: iShohei220 Date: Tue, 22 Jan 2019 18:21:44 +0900 Subject: [PATCH 1/4] modify loss function --- .idea/libraries/R_User_Library.xml | 6 ++++++ .idea/vcs.xml | 6 ++++++ model.py | 7 +++---- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 .idea/libraries/R_User_Library.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/libraries/R_User_Library.xml b/.idea/libraries/R_User_Library.xml new file mode 100644 index 0000000..71f5ff7 --- /dev/null +++ b/.idea/libraries/R_User_Library.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/model.py b/model.py index ca375a3..1c16af6 100644 --- a/model.py +++ b/model.py @@ -21,11 +21,10 @@ def __init__(self, batch_size=16, seq_len=16, b_size=50, x_size=1*64*64, c_size= self.p_d = Decoder() # losses - self.kl = KullbackLeibler(self.q, self.p_b1) - self.b_ll = -NLL(self.p_b2) - self.t_nll = NLL(self.p_t) + self.kl_1 = KullbackLeibler(self.q, self.p_b1) + self.kl_2 = KullbackLeibler(self.p_b2, self.p_t) self.d_nll = NLL(self.p_d) - self.loss_cls = (self.kl+self.b_ll+self.t_nll+self.d_nll).mean() + self.loss_cls = (self.kl_1+self.kl_2+self.d_nll).mean() def forward(self, batch): batch_size, seq_len, *_ = batch.size() From 7b0976a6ae930edd793c6d6b83dcdf60b9bd5fbd Mon Sep 17 00:00:00 2001 From: iShohei220 Date: Tue, 22 Jan 2019 18:23:39 +0900 Subject: [PATCH 2/4] git ignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 11614af..3bbfed7 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,5 @@ dmypy.json # Pyre type checker .pyre/ + +.idea/* From 28837c06ffc0b28696201f07f3d1b88d8d5a5d28 Mon Sep 17 00:00:00 2001 From: iShohei220 Date: Tue, 22 Jan 2019 18:25:17 +0900 Subject: [PATCH 3/4] git ignore --- .gitignore | 1 - .idea/libraries/R_User_Library.xml | 6 ------ .idea/vcs.xml | 6 ------ 3 files changed, 13 deletions(-) delete mode 100644 .idea/libraries/R_User_Library.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 3bbfed7..24482e2 100644 --- a/.gitignore +++ b/.gitignore @@ -114,4 +114,3 @@ dmypy.json # Pyre type checker .pyre/ -.idea/* diff --git a/.idea/libraries/R_User_Library.xml b/.idea/libraries/R_User_Library.xml deleted file mode 100644 index 71f5ff7..0000000 --- a/.idea/libraries/R_User_Library.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 111c96db09df9253ab5dd2f83a3ff0126c2d0cf6 Mon Sep 17 00:00:00 2001 From: iShohei220 Date: Tue, 22 Jan 2019 18:25:47 +0900 Subject: [PATCH 4/4] git ignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 24482e2..11614af 100644 --- a/.gitignore +++ b/.gitignore @@ -113,4 +113,3 @@ dmypy.json # Pyre type checker .pyre/ -