diff --git a/pyproject.toml b/pyproject.toml index 837cf1fd8..a19d07d45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = [ "setuptools", "cython>=0.25,<3.0", "cymem>=2.0.2,<2.1.0", - "preshed>=3.0.2,<3.1.0", + "preshed>=4.0.0,<4.1.0", "murmurhash>=0.28.0,<1.1.0", "thinc>=9.0.0.dev2,<9.1.0", "numpy>=1.15.0", diff --git a/requirements.txt b/requirements.txt index 6f4b61918..1c492f1b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ spacy-legacy>=4.0.0.dev0,<4.1.0 spacy-loggers>=1.0.0,<2.0.0 cymem>=2.0.2,<2.1.0 -preshed>=3.0.2,<3.1.0 +preshed>=4.0.0,<4.1.0 thinc>=9.0.0.dev2,<9.1.0 ml_datasets>=0.2.0,<0.3.0 murmurhash>=0.28.0,<1.1.0 diff --git a/setup.cfg b/setup.cfg index 975ec03ce..e8fa96c16 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,7 +36,7 @@ install_requires = spacy-loggers>=1.0.0,<2.0.0 murmurhash>=0.28.0,<1.1.0 cymem>=2.0.2,<2.1.0 - preshed>=3.0.2,<3.1.0 + preshed>=4.0.0,<4.1.0 thinc>=9.0.0.dev2,<9.1.0 wasabi>=0.9.1,<1.2.0 srsly>=2.4.3,<3.0.0 diff --git a/spacy/matcher/phrasematcher.pyx b/spacy/matcher/phrasematcher.pyx index ebe1213c7..9f2da4dff 100644 --- a/spacy/matcher/phrasematcher.pyx +++ b/spacy/matcher/phrasematcher.pyx @@ -47,7 +47,7 @@ cdef class PhraseMatcher: self.mem = Pool() self.c_map = self.mem.alloc(1, sizeof(MapStruct)) self._terminal_hash = 826361138722620965 - map_init(self.mem, self.c_map, 8) + map_init(self.c_map, 8) if isinstance(attr, (int, long)): self.attr = attr @@ -181,17 +181,17 @@ cdef class PhraseMatcher: result = map_get(current_node, token) if not result: internal_node = self.mem.alloc(1, sizeof(MapStruct)) - map_init(self.mem, internal_node, 8) - map_set(self.mem, current_node, token, internal_node) + map_init(internal_node, 8) + map_set(current_node, token, internal_node) result = internal_node current_node = result result = map_get(current_node, self._terminal_hash) if not result: internal_node = self.mem.alloc(1, sizeof(MapStruct)) - map_init(self.mem, internal_node, 8) - map_set(self.mem, current_node, self._terminal_hash, internal_node) + map_init(internal_node, 8) + map_set(current_node, self._terminal_hash, internal_node) result = internal_node - map_set(self.mem, result, self.vocab.strings[key], NULL) + map_set(result, self.vocab.strings[key], NULL) def add(self, key, docs, *, on_match=None):