Merge pull request yzhangcs#62 from KoichiYasuoka/main

yzhangcs · web-flow · commit 0365e33d12d6 · 2021-03-09T17:28:36.000-08:00
torch&gt;=1.7.0 (GPU version) support
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='supar',
-    version='1.0.0+dev20201223',
+    version='1.0.0+dev20210310',
     author='Yu Zhang',
     author_email='yzhang.cs@outlook.com',
     description='Syntactic Parsing Models',
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), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).cpu(), 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), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).cpu(), 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), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).cpu(), 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), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).cpu(), 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), True, False)
+        x = pack_padded_sequence(embed, mask.sum(1).cpu(), 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
@@ -54,7 +54,7 @@ def forward(self, x):
         # [batch_size, seq_len, fix_len]
         mask = x.ne(self.pad_index)
         # [batch_size, seq_len]
-        lens = mask.sum(-1)
+        lens = mask.sum(-1).cpu()
         char_mask = lens.gt(0)
 
         # [n, fix_len, n_embed]
