Update by commit

Author: threelittlemonkeys

rnn_decoder.py

@@ -32,11 +32,11 @@ def __init__(self, x_wti, y_wti):
 
     def forward(self, xw, yi, mask):
 
-        x = self.embed(None, None, yi)
+        h = self.embed(None, None, yi)
 
         if ATTN:
-            x = torch.cat([x, self.h], 2) # input feeding
-            h, self.H = self.rnn(x, self.H)
+            h = torch.cat([h, self.h], 2) # input feeding
+            h, self.H = self.rnn(h, self.H)
             self.attn(self.M, h, mask)
             self.h = self.Wc(torch.cat([self.attn.V, h], 2)).tanh()
             h = self.Wo(self.h).squeeze(1) # [B, V]
@@ -46,8 +46,8 @@ def forward(self, xw, yi, mask):
             _M = self.M[:, :-1] # remove EOS token [B, L' = L - 1]
             self.attn(self.M, self.h, mask) # attentive read
             self.copy.attn(_M) # selective read
-            x = torch.cat([x, self.attn.V, self.copy.R], 2)
-            self.h, self.H = self.rnn(x, self.H)
+            h = torch.cat([h, self.attn.V, self.copy.R], 2)
+            self.h, self.H = self.rnn(h, self.H)
             g = self.Wo(self.h).squeeze(1) # generation scores [B, V]
             c = self.copy.score(_M, self.h, mask) # copy scores [B, L']
             yo = self.copy.mix(xw, g, c) # [B, V']

rnn_encoder.py

@@ -34,9 +34,9 @@ def forward(self, xc, xw, lens):
         b = len(lens)
         s = self.init_state(b)
 
-        x = self.embed(b, xc, xw)
-        x = nn.utils.rnn.pack_padded_sequence(x, lens.cpu(), batch_first = True)
-        h, s = self.rnn(x, s)
+        h = self.embed(b, xc, xw)
+        h = nn.utils.rnn.pack_padded_sequence(h, lens, batch_first = True)
+        h, s = self.rnn(h, s)
         h, _ = nn.utils.rnn.pad_packed_sequence(h, batch_first = True)
 
         return h, s

utils.py

@@ -82,7 +82,7 @@ def save_loss(filename, epoch, loss_array):
 def maskset(x):
 
     mask = x.eq(PAD_IDX)
-    lens = x.size(1) - mask.sum(1) # x.ne(PAD_IDX).sum(1)
+    lens = (x.size(1) - mask.sum(1)).tolist() # x.ne(PAD_IDX).sum(1)
 
     return mask, lens