Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict artefacts

This commit is contained in:
Matthew Honnibal 2017-05-23 18:47:11 +02:00
parent 01e59e4e6e
commit d44b1eafc4
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spacy/tokens/doc.pyx
View File

@ -562,16 +562,6 @@ cdef class Doc:
for i in range(self.length): for i in range(self.length):
self.c[i] = parsed[i] self.c[i] = parsed[i]
<<<<<<< HEAD
def from_array(self, attrs, int[:, :] array):
"""Load attributes from a numpy array. Write to a `Doc` object, from an
`(M, N)` array of attributes.
attrs (ints): A list of attribute ID ints.
array (numpy.ndarray[ndim=2, dtype='int32']) The attribute values to load.
RETURNS (Doc): Itself.
"""
=======
def from_array(self, attrs, array): def from_array(self, attrs, array):
if SENT_START in attrs and HEAD in attrs: if SENT_START in attrs and HEAD in attrs:
raise ValueError( raise ValueError(
@ -582,7 +572,6 @@ cdef class Doc:
"potentially override the sentence boundaries set by SENT_START.\n" "potentially override the sentence boundaries set by SENT_START.\n"
"See https://github.com/spacy-io/spaCy/issues/235 for details and " "See https://github.com/spacy-io/spaCy/issues/235 for details and "
"workarounds, and to propose solutions.") "workarounds, and to propose solutions.")
>>>>>>> 45ad8684... * Add SENT_START attribute
cdef int i, col cdef int i, col
cdef attr_id_t attr_id cdef attr_id_t attr_id
cdef TokenC* tokens = self.c cdef TokenC* tokens = self.c