mirror of
https://github.com/explosion/spaCy.git
synced 2025-06-05 13:43:24 +03:00
* Seems to be working after refactor. Need to wire up more POS tag features, and wire up save/load of POS tags.
This commit is contained in:
parent
08ce602243
commit
234d49bf4d
0
spacy/__init__.pxd
Normal file
0
spacy/__init__.pxd
Normal file
|
@ -155,8 +155,10 @@ cdef class Language:
|
||||||
cdef Lexeme** lexemes
|
cdef Lexeme** lexemes
|
||||||
cdef Lexeme* lexeme
|
cdef Lexeme* lexeme
|
||||||
cdef String span
|
cdef String span
|
||||||
idx = tokens.extend(idx, prefixes.data(), prefixes.size())
|
if prefixes.size():
|
||||||
|
idx = tokens.extend(idx, prefixes.data(), prefixes.size())
|
||||||
if string.n != 0:
|
if string.n != 0:
|
||||||
|
|
||||||
lexemes = <Lexeme**>self.cache.get(string.key)
|
lexemes = <Lexeme**>self.cache.get(string.key)
|
||||||
if lexemes != NULL:
|
if lexemes != NULL:
|
||||||
idx = tokens.extend(idx, lexemes, 0)
|
idx = tokens.extend(idx, lexemes, 0)
|
||||||
|
|
|
@ -42,7 +42,8 @@ def _parse_line(line, sep):
|
||||||
assert len(subtags) == len(subtokens), [t.string for t in subtokens]
|
assert len(subtags) == len(subtokens), [t.string for t in subtokens]
|
||||||
words.append(word)
|
words.append(word)
|
||||||
tags.extend([Tagger.encode_pos(ptb_to_univ(pos)) for pos in subtags])
|
tags.extend([Tagger.encode_pos(ptb_to_univ(pos)) for pos in subtags])
|
||||||
return EN.tokenize(' '.join(words)), tags
|
tokens = EN.tokenize(' '.join(words)), tags
|
||||||
|
return tokens
|
||||||
|
|
||||||
|
|
||||||
def get_tagdict(train_sents):
|
def get_tagdict(train_sents):
|
||||||
|
|
21
spacy/utf8string.pxd
Normal file
21
spacy/utf8string.pxd
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
from preshed.maps cimport PreshMap
|
||||||
|
from cymem.cymem cimport Pool
|
||||||
|
|
||||||
|
from .typedefs cimport utf8_t, id_t, hash_t
|
||||||
|
|
||||||
|
|
||||||
|
cdef struct Utf8Str:
|
||||||
|
id_t i
|
||||||
|
hash_t key
|
||||||
|
utf8_t chars
|
||||||
|
int length
|
||||||
|
|
||||||
|
|
||||||
|
cdef class StringStore:
|
||||||
|
cdef Pool mem
|
||||||
|
cdef PreshMap table
|
||||||
|
cdef Utf8Str* strings
|
||||||
|
cdef int size
|
||||||
|
cdef int _resize_at
|
||||||
|
|
||||||
|
cdef Utf8Str* intern(self, char* chars, int length) except NULL
|
53
spacy/utf8string.pyx
Normal file
53
spacy/utf8string.pyx
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
from libc.string cimport memcpy
|
||||||
|
|
||||||
|
from murmurhash.mrmr cimport hash64
|
||||||
|
|
||||||
|
|
||||||
|
cdef class StringStore:
|
||||||
|
def __init__(self):
|
||||||
|
self.mem = Pool()
|
||||||
|
self.table = PreshMap()
|
||||||
|
self._resize_at = 10000
|
||||||
|
self.strings = <Utf8Str*>self.mem.alloc(self._resize_at, sizeof(Utf8Str))
|
||||||
|
self.size = 1
|
||||||
|
|
||||||
|
property size:
|
||||||
|
def __get__(self):
|
||||||
|
return self.size-1
|
||||||
|
|
||||||
|
def __getitem__(self, string_or_id):
|
||||||
|
cdef bytes byte_string
|
||||||
|
cdef Utf8Str* utf8str
|
||||||
|
if type(string_or_id) == int or type(string_or_id) == long:
|
||||||
|
if string_or_id < 1 or string_or_id >= self.size:
|
||||||
|
raise IndexError(string_or_id)
|
||||||
|
utf8str = &self.strings[<int>string_or_id]
|
||||||
|
return utf8str.chars[:utf8str.length]
|
||||||
|
elif type(string_or_id) == bytes:
|
||||||
|
utf8str = self.intern(<char*>string_or_id, len(string_or_id))
|
||||||
|
return utf8str.i
|
||||||
|
else:
|
||||||
|
raise TypeError(type(string_or_id))
|
||||||
|
|
||||||
|
cdef Utf8Str* intern(self, char* chars, int length) except NULL:
|
||||||
|
# 0 means missing, but we don't bother offsetting the index. We waste
|
||||||
|
# slot 0 to simplify the code, because it doesn't matter.
|
||||||
|
assert length != 0
|
||||||
|
cdef hash_t key = hash64(chars, length * sizeof(char), 0)
|
||||||
|
cdef void* value = self.table.get(key)
|
||||||
|
cdef size_t i
|
||||||
|
if value == NULL:
|
||||||
|
if self.size == self._resize_at:
|
||||||
|
self._resize_at *= 2
|
||||||
|
self.strings = <Utf8Str*>self.mem.realloc(self.strings, self._resize_at * sizeof(Utf8Str))
|
||||||
|
i = self.size
|
||||||
|
self.strings[i].i = self.size
|
||||||
|
self.strings[i].key = key
|
||||||
|
self.strings[i].chars = <char*>self.mem.alloc(length, sizeof(char))
|
||||||
|
memcpy(self.strings[i].chars, chars, length)
|
||||||
|
self.strings[i].length = length
|
||||||
|
self.table.set(key, <void*>self.size)
|
||||||
|
self.size += 1
|
||||||
|
else:
|
||||||
|
i = <size_t>value
|
||||||
|
return &self.strings[i]
|
Loading…
Reference in New Issue
Block a user