explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-03-22 19:04:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rewrap sort as stdsort for OS X

Browse Source
This commit is contained in:
Adriane Boyd 2019-09-27 10:03:30 +02:00
parent ccd94809fa
commit 5983b7b612
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spacy/tokenizer.pyx
View File

@ -6,7 +6,6 @@ from __future__ import unicode_literals
from cython.operator cimport dereference as deref from cython.operator cimport dereference as deref
from cython.operator cimport preincrement as preinc from cython.operator cimport preincrement as preinc
from libc.string cimport memcpy, memset from libc.string cimport memcpy, memset
from libcpp.algorithm cimport sort
from libcpp.set cimport set as stdset from libcpp.set cimport set as stdset
from libc.stdio cimport printf from libc.stdio cimport printf
from cymem.cymem cimport Pool from cymem.cymem cimport Pool
@ -325,7 +324,7 @@ cdef class Tokenizer:
cdef int seen_i cdef int seen_i
cdef MatchStruct span cdef MatchStruct span
cdef stdset[int] seen_tokens cdef stdset[int] seen_tokens
sort(original.begin(), original.end(), len_start_cmp) stdsort(original.begin(), original.end(), len_start_cmp)
cdef int orig_i = original.size() - 1 cdef int orig_i = original.size() - 1
while orig_i >= 0: while orig_i >= 0:
span = original[orig_i] span = original[orig_i]
@ -334,7 +333,7 @@ cdef class Tokenizer:
for seen_i in range(span.start, span.end): for seen_i in range(span.start, span.end):
seen_tokens.insert(seen_i) seen_tokens.insert(seen_i)
orig_i -= 1 orig_i -= 1
sort(filtered.begin(), filtered.end(), start_cmp) stdsort(filtered.begin(), filtered.end(), start_cmp)
cdef int _try_cache(self, hash_t key, Doc tokens) except -1: cdef int _try_cache(self, hash_t key, Doc tokens) except -1:
cached = <_Cached*>self._cache.get(key) cached = <_Cached*>self._cache.get(key)
@ -690,6 +689,10 @@ def _get_regex_pattern(regex):
return None if regex is None else regex.__self__.pattern return None if regex is None else regex.__self__.pattern
cdef extern from "<algorithm>" namespace "std" nogil:
void stdsort "sort"(...)
cdef bint len_start_cmp(MatchStruct a, MatchStruct b) nogil: cdef bint len_start_cmp(MatchStruct a, MatchStruct b) nogil:
if a.end - a.start == b.end - b.start: if a.end - a.start == b.end - b.start:
return a.start < b.start return a.start < b.start