Fix issue #684: GloVe vectors not loaded in spacy.en.English.

This commit is contained in:
Matthew Honnibal 2016-12-18 22:46:31 +01:00
parent 404019ad2f
commit 618b50a064

View File

@ -4,6 +4,7 @@ from __future__ import unicode_literals, print_function
from os import path from os import path
from ..util import match_best_version from ..util import match_best_version
from ..util import get_data_path
from ..language import Language from ..language import Language
from ..lemmatizer import Lemmatizer from ..lemmatizer import Lemmatizer
from ..vocab import Vocab from ..vocab import Vocab
@ -37,10 +38,11 @@ def _fix_deprecated_glove_vectors_loading(overrides):
if 'data_dir' in overrides and 'path' not in overrides: if 'data_dir' in overrides and 'path' not in overrides:
raise ValueError("The argument 'data_dir' has been renamed to 'path'") raise ValueError("The argument 'data_dir' has been renamed to 'path'")
if overrides.get('path') is None: if overrides.get('path') is None:
return overrides data_path = get_data_path()
path = overrides['path'] else:
if 'add_vectors' not in overrides: path = overrides['path']
data_path = path.parent data_path = path.parent
if 'add_vectors' not in overrides:
if 'vectors' in overrides: if 'vectors' in overrides:
vec_path = match_best_version(overrides['vectors'], None, data_path) vec_path = match_best_version(overrides['vectors'], None, data_path)
if vec_path is None: if vec_path is None: