Requires torch>=1.7.0 (yzhangcs#62)

yzhangcs · yzhangcs · commit 1e3e05166381 · 2021-03-23T20:37:57.000+08:00
diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
     setup_requires=[
         'setuptools>=18.0',
     ],
-    install_requires=['torch>=1.4.0', 'transformers>=3.1.0', 'nltk'],
+    install_requires=['torch>=1.7.0', 'transformers>=3.1.0', 'nltk'],
     entry_points={
         'console_scripts': [
             'biaffine-dependency=supar.cmds.biaffine_dependency:main',
diff --git a/supar/models/constituency.py b/supar/models/constituency.py
@@ -186,7 +186,7 @@ def forward(self, words, feats):
         # concatenate the word and feat representations
         embed = torch.cat((word_embed, feat_embed), -1)
 
-        x = pack_padded_sequence(embed, mask.sum(1).cpu(), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).tolist(), True, False)
         x, _ = self.lstm(x)
         x, _ = pad_packed_sequence(x, True, total_length=seq_len)
         x = self.lstm_dropout(x)
diff --git a/supar/models/dependency.py b/supar/models/dependency.py
@@ -185,7 +185,7 @@ def forward(self, words, feats):
         # concatenate the word and feat representations
         embed = torch.cat((word_embed, feat_embed), -1)
 
-        x = pack_padded_sequence(embed, mask.sum(1).cpu(), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).tolist(), True, False)
         x, _ = self.lstm(x)
         x, _ = pad_packed_sequence(x, True, total_length=seq_len)
         x = self.lstm_dropout(x)
@@ -645,7 +645,7 @@ def forward(self, words, feats):
         # concatenate the word and feat representations
         embed = torch.cat((word_embed, feat_embed), -1)
 
-        x = pack_padded_sequence(embed, mask.sum(1).cpu(), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).tolist(), True, False)
         x, _ = self.lstm(x)
         x, _ = pad_packed_sequence(x, True, total_length=seq_len)
         x = self.lstm_dropout(x)
diff --git a/supar/models/semantic_dependency.py b/supar/models/semantic_dependency.py
@@ -219,7 +219,7 @@ def forward(self, words, feats):
         # concatenate the word and feat representations
         embed = torch.cat((word_embed, feat_embed), -1)
 
-        x = pack_padded_sequence(embed, mask.sum(1).cpu(), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).tolist(), True, False)
         x, _ = self.lstm(x)
         x, _ = pad_packed_sequence(x, True, total_length=seq_len)
         x = self.lstm_dropout(x)
@@ -503,7 +503,7 @@ def forward(self, words, feats):
         # concatenate the word and feat representations
         embed = torch.cat((word_embed, feat_embed), -1)
 
-        x = pack_padded_sequence(embed, mask.sum(1).cpu(), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).tolist(), True, False)
         x, _ = self.lstm(x)
         x, _ = pad_packed_sequence(x, True, total_length=seq_len)
         x = self.lstm_dropout(x)
diff --git a/supar/modules/char_lstm.py b/supar/modules/char_lstm.py
@@ -29,10 +29,8 @@ def __init__(self, n_chars, n_embed, n_out, pad_index=0):
         self.n_out = n_out
         self.pad_index = pad_index
 
-        # the embedding layer
         self.embed = nn.Embedding(num_embeddings=n_chars,
                                   embedding_dim=n_embed)
-        # the lstm layer
         self.lstm = nn.LSTM(input_size=n_embed,
                             hidden_size=n_out//2,
                             batch_first=True,
@@ -54,12 +52,12 @@ def forward(self, x):
         # [batch_size, seq_len, fix_len]
         mask = x.ne(self.pad_index)
         # [batch_size, seq_len]
-        lens = mask.sum(-1).cpu()
+        lens = mask.sum(-1)
         char_mask = lens.gt(0)
 
         # [n, fix_len, n_embed]
         x = self.embed(x[char_mask])
-        x = pack_padded_sequence(x, lens[char_mask], True, False)
+        x = pack_padded_sequence(x, lens[char_mask].tolist(), True, False)
         x, (h, _) = self.lstm(x)
         # [n, fix_len, n_out]
         h = torch.cat(torch.unbind(h), -1)
diff --git a/supar/utils/transform.py b/supar/utils/transform.py
@@ -106,7 +106,7 @@ def __contains__(self, key):
 
     def __getattr__(self, name):
         if name in self.__dict__:
-            return self.__dict__[name]        
+            return self.__dict__[name]
         elif name in self.maps:
             return self.values[self.maps[name]]
         else:
