Fix tensorizer on GPU

honnibal · honnibal · commit 2b35bb76addc · 2017-11-05T15:34:40.000+01:00
diff --git a/spacy/pipeline.pyx b/spacy/pipeline.pyx
@@ -415,7 +415,11 @@ class Tagger(Pipe):
                     vocab.morphology.assign_tag_id(&doc.c[j], tag_id)
                 idx += 1
             if tensors is not None:
-                doc.extend_tensor(tensors[i])
+                if isinstance(doc.tensor, numpy.ndarray) \
+                and not isinstance(tensors[i], numpy.ndarray):
+                    doc.extend_tensor(tensors[i].get())
+                else:
+                    doc.extend_tensor(tensors[i])
         doc.is_tagged = True
 
     def update(self, docs, golds, drop=0., sgd=None, losses=None):
diff --git a/spacy/syntax/nn_parser.pyx b/spacy/syntax/nn_parser.pyx
@@ -751,7 +751,11 @@ cdef class Parser:
             for j in range(doc.length):
                 doc.c[j] = state.c._sent[j]
             if tensors is not None:
-                doc.extend_tensor(tensors[i])
+                if isinstance(doc.tensor, numpy.ndarray) \
+                and not isinstance(tensors[i], numpy.ndarray):
+                    doc.extend_tensor(tensors[i].get())
+                else:
+                    doc.extend_tensor(tensors[i])
             self.moves.finalize_doc(doc)
 
             for hook in self.postprocesses:
