mirror of
https://github.com/explosion/spaCy.git
synced 2025-01-11 17:56:30 +03:00
Add actual deprecation warning for n_threads (resolves #3410)
This commit is contained in:
parent
cb5dbfa63a
commit
bec8db91e6
|
@ -76,6 +76,10 @@ class Warnings(object):
|
||||||
W015 = ("As of v2.1.0, the use of keyword arguments to exclude fields from "
|
W015 = ("As of v2.1.0, the use of keyword arguments to exclude fields from "
|
||||||
"being serialized or deserialized is deprecated. Please use the "
|
"being serialized or deserialized is deprecated. Please use the "
|
||||||
"`exclude` argument instead. For example: exclude=['{arg}'].")
|
"`exclude` argument instead. For example: exclude=['{arg}'].")
|
||||||
|
W016 = ("The keyword argument `n_threads` on the is now deprecated, as "
|
||||||
|
"the v2.x models cannot release the global interpreter lock. "
|
||||||
|
"Future versions may introduce a `n_process` argument for "
|
||||||
|
"parallel inference via multiprocessing.")
|
||||||
|
|
||||||
|
|
||||||
@add_codes
|
@add_codes
|
||||||
|
|
|
@ -666,6 +666,8 @@ class Language(object):
|
||||||
|
|
||||||
DOCS: https://spacy.io/api/language#pipe
|
DOCS: https://spacy.io/api/language#pipe
|
||||||
"""
|
"""
|
||||||
|
if n_threads != -1:
|
||||||
|
deprecation_warning(Warnings.W016)
|
||||||
if as_tuples:
|
if as_tuples:
|
||||||
text_context1, text_context2 = itertools.tee(texts)
|
text_context1, text_context2 = itertools.tee(texts)
|
||||||
texts = (tc[0] for tc in text_context1)
|
texts = (tc[0] for tc in text_context1)
|
||||||
|
|
|
@ -19,7 +19,7 @@ from ..attrs cimport ID, attr_id_t, NULL_ATTR, ORTH
|
||||||
|
|
||||||
from ._schemas import TOKEN_PATTERN_SCHEMA
|
from ._schemas import TOKEN_PATTERN_SCHEMA
|
||||||
from ..util import get_json_validator, validate_json
|
from ..util import get_json_validator, validate_json
|
||||||
from ..errors import Errors, MatchPatternError
|
from ..errors import Errors, MatchPatternError, Warnings, deprecation_warning
|
||||||
from ..strings import get_string_id
|
from ..strings import get_string_id
|
||||||
from ..attrs import IDS
|
from ..attrs import IDS
|
||||||
|
|
||||||
|
@ -160,6 +160,8 @@ cdef class Matcher:
|
||||||
batch_size (int): Number of documents to accumulate into a working set.
|
batch_size (int): Number of documents to accumulate into a working set.
|
||||||
YIELDS (Doc): Documents, in order.
|
YIELDS (Doc): Documents, in order.
|
||||||
"""
|
"""
|
||||||
|
if n_threads != -1:
|
||||||
|
deprecation_warning(Warnings.W016)
|
||||||
for doc in docs:
|
for doc in docs:
|
||||||
self(doc)
|
self(doc)
|
||||||
yield doc
|
yield doc
|
||||||
|
|
|
@ -182,6 +182,8 @@ cdef class PhraseMatcher:
|
||||||
|
|
||||||
DOCS: https://spacy.io/api/phrasematcher#pipe
|
DOCS: https://spacy.io/api/phrasematcher#pipe
|
||||||
"""
|
"""
|
||||||
|
if n_threads != -1:
|
||||||
|
deprecation_warning(Warnings.W016)
|
||||||
if as_tuples:
|
if as_tuples:
|
||||||
for doc, context in stream:
|
for doc, context in stream:
|
||||||
matches = self(doc)
|
matches = self(doc)
|
||||||
|
|
21
spacy/tests/regression/test_issue3410.py
Normal file
21
spacy/tests/regression/test_issue3410.py
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
# coding: utf8
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from spacy.lang.en import English
|
||||||
|
from spacy.matcher import Matcher, PhraseMatcher
|
||||||
|
|
||||||
|
|
||||||
|
def test_issue3410():
|
||||||
|
texts = ["Hello world", "This is a test"]
|
||||||
|
nlp = English()
|
||||||
|
matcher = Matcher(nlp.vocab)
|
||||||
|
phrasematcher = PhraseMatcher(nlp.vocab)
|
||||||
|
with pytest.deprecated_call():
|
||||||
|
docs = list(nlp.pipe(texts, n_threads=4))
|
||||||
|
with pytest.deprecated_call():
|
||||||
|
docs = list(nlp.tokenizer.pipe(texts, n_threads=4))
|
||||||
|
with pytest.deprecated_call():
|
||||||
|
list(matcher.pipe(docs, n_threads=4))
|
||||||
|
with pytest.deprecated_call():
|
||||||
|
list(phrasematcher.pipe(docs, n_threads=4))
|
|
@ -134,6 +134,8 @@ cdef class Tokenizer:
|
||||||
|
|
||||||
DOCS: https://spacy.io/api/tokenizer#pipe
|
DOCS: https://spacy.io/api/tokenizer#pipe
|
||||||
"""
|
"""
|
||||||
|
if n_threads != -1:
|
||||||
|
deprecation_warning(Warnings.W016)
|
||||||
for text in texts:
|
for text in texts:
|
||||||
yield self(text)
|
yield self(text)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user