Merge branch 'master' into v2.3.x

This commit is contained in:
Adriane Boyd 2020-11-24 14:37:03 +01:00
commit 08fc87611a
2 changed files with 7 additions and 8 deletions

View File

@ -8,11 +8,11 @@ python:
os: os:
- linux - linux
install: install:
- "pip install -r requirements.txt" - "python -m pip install -U pip setuptools"
- "python setup.py build_ext --inplace" - "pip install -e . --prefer-binary"
- "pip install -e ."
script: script:
- "cat /proc/cpuinfo | grep flags | head -n 1" - "cat /proc/cpuinfo | grep flags | head -n 1"
- "pip install -r requirements.txt"
- "python -m pytest --tb=native spacy" - "python -m pytest --tb=native spacy"
branches: branches:
except: except:

View File

@ -137,9 +137,6 @@ def train(
output_path.mkdir() output_path.mkdir()
msg.good("Created output directory: {}".format(output_path)) msg.good("Created output directory: {}".format(output_path))
tag_map = {}
if tag_map_path is not None:
tag_map = srsly.read_json(tag_map_path)
# Take dropout and batch size as generators of values -- dropout # Take dropout and batch size as generators of values -- dropout
# starts high and decays sharply, to force the optimizer to explore. # starts high and decays sharply, to force the optimizer to explore.
# Batch size starts at 1 and grows, so that we make updates quickly # Batch size starts at 1 and grows, so that we make updates quickly
@ -250,6 +247,8 @@ def train(
pipe_cfg = {} pipe_cfg = {}
nlp.add_pipe(nlp.create_pipe(pipe, config=pipe_cfg)) nlp.add_pipe(nlp.create_pipe(pipe, config=pipe_cfg))
if tag_map_path is not None:
tag_map = srsly.read_json(tag_map_path)
# Replace tag map with provided mapping # Replace tag map with provided mapping
nlp.vocab.morphology.load_tag_map(tag_map) nlp.vocab.morphology.load_tag_map(tag_map)