explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-01-12 10:16:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/explosion/spaCy into develop

Browse Source
This commit is contained in:
Matthew Honnibal 2017-05-29 14:30:12 -05:00
commit 1e6df0a2a1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spacy/__init__.py
View File

@ -4,9 +4,9 @@ from __future__ import unicode_literals
from .cli.info import info as cli_info from .cli.info import info as cli_info
from .glossary import explain from .glossary import explain
from .deprecated import resolve_load_name from .deprecated import resolve_load_name
from .about import __version__
from . import util from . import util
def load(name, **overrides): def load(name, **overrides):
name = resolve_load_name(name, **overrides) name = resolve_load_name(name, **overrides)
return util.load_model(name, **overrides) return util.load_model(name, **overrides)

2
spacy/language.py
View File

@ -132,7 +132,7 @@ class Language(object):
Defaults = BaseDefaults Defaults = BaseDefaults
lang = None lang = None
def __init__(self, vocab=True, make_doc=True, pipeline=None, meta={}): def __init__(self, vocab=True, make_doc=True, pipeline=None, meta={}, **kwargs):
"""Initialise a Language object. """Initialise a Language object.
vocab (Vocab): A `Vocab` object. If `True`, a vocab is created via vocab (Vocab): A `Vocab` object. If `True`, a vocab is created via

6
spacy/util.py
View File

@ -108,12 +108,12 @@ def load_model(name, **overrides):
model_path = Path(name) model_path = Path(name)
meta = get_package_meta(model_path) meta = get_package_meta(model_path)
cls = get_lang_class(meta['lang']) cls = get_lang_class(meta['lang'])
nlp = cls(pipeline=meta.get('pipeline', True)) nlp = cls(pipeline=meta.get('pipeline', True), meta=meta)
return nlp.from_disk(model_path, **overrides) return nlp.from_disk(model_path, **overrides)
elif hasattr(name, 'exists'): # Path or Path-like to model data elif hasattr(name, 'exists'): # Path or Path-like to model data
meta = get_package_meta(name) meta = get_package_meta(name)
cls = get_lang_class(meta['lang']) cls = get_lang_class(meta['lang'])
nlp = cls(pipeline=meta.get('pipeline', True)) nlp = cls(pipeline=meta.get('pipeline', True), meta=meta)
return nlp.from_disk(name, **overrides) return nlp.from_disk(name, **overrides)
raise IOError("Can't find model '%s'" % name) raise IOError("Can't find model '%s'" % name)
@ -133,7 +133,7 @@ def load_model_from_init_py(init_file, **overrides):
if not model_path.exists(): if not model_path.exists():
raise ValueError("Can't find model directory: %s" % path2str(data_path)) raise ValueError("Can't find model directory: %s" % path2str(data_path))
cls = get_lang_class(meta['lang']) cls = get_lang_class(meta['lang'])
nlp = cls(pipeline=meta.get('pipeline', True)) nlp = cls(pipeline=meta.get('pipeline', True), meta=meta)
return nlp.from_disk(data_path, **overrides) return nlp.from_disk(data_path, **overrides)