explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2024-12-26 18:06:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Matthew Honnibal 2018-12-03 02:20:20 +01:00
commit c7b33b24f1
8 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/training/conllu.py
View File

@ -22,7 +22,6 @@ from spacy.matcher import Matcher
import itertools import itertools
import random import random
import numpy.random import numpy.random
import cytoolz
import conll17_ud_eval import conll17_ud_eval

2
requirements.txt
View File

@ -11,7 +11,7 @@ regex==2018.01.10
requests>=2.13.0,<3.0.0 requests>=2.13.0,<3.0.0
jsonschema>=2.6.0,<3.0.0 jsonschema>=2.6.0,<3.0.0
wasabi>=0.0.8,<1.1.0 wasabi>=0.0.8,<1.1.0
srsly>=0.0.4,<1.1.0 srsly>=0.0.5,<1.1.0
pathlib==1.0.1; python_version < "3.4" pathlib==1.0.1; python_version < "3.4"
# Development dependencies # Development dependencies
cython>=0.25 cython>=0.25

2
setup.py
View File

@ -208,7 +208,7 @@ def setup_package():
"requests>=2.13.0,<3.0.0", "requests>=2.13.0,<3.0.0",
"jsonschema>=2.6.0,<3.0.0", "jsonschema>=2.6.0,<3.0.0",
"wasabi>=0.0.8,<1.1.0", "wasabi>=0.0.8,<1.1.0",
"srsly>=0.0.4,<1.1.0", "srsly>=0.0.5,<1.1.0",
'pathlib==1.0.1; python_version < "3.4"', 'pathlib==1.0.1; python_version < "3.4"',
], ],
setup_requires=["wheel"], setup_requires=["wheel"],

4
spacy/cli/converters/iob2json.py
View File

@ -1,7 +1,7 @@
# coding: utf8 # coding: utf8
from __future__ import unicode_literals from __future__ import unicode_literals
from cytoolz import partition_all import cytoolz
from ...gold import iob_to_biluo from ...gold import iob_to_biluo
@ -11,7 +11,7 @@ def iob2json(input_data, n_sents=10, *args, **kwargs):
Convert IOB files into JSON format for use with train cli. Convert IOB files into JSON format for use with train cli.
""" """
docs = [] docs = []
for group in partition_all(n_sents, docs): for group in cytoolz.partition_all(n_sents, docs):
group = list(group) group = list(group)
first = group.pop(0) first = group.pop(0)
to_extend = first["paragraphs"][0]["sentences"] to_extend = first["paragraphs"][0]["sentences"]

1
spacy/cli/ud/ud_run_test.py
View File

@ -30,7 +30,6 @@ Fused_inside = None
import itertools import itertools
import random import random
import numpy.random import numpy.random
import cytoolz
from . import conll17_ud_eval from . import conll17_ud_eval

1
spacy/cli/ud/ud_train.py
View File

@ -25,7 +25,6 @@ from timeit import default_timer as timer
import itertools import itertools
import random import random
import numpy.random import numpy.random
import cytoolz
from . import conll17_ud_eval from . import conll17_ud_eval

1
spacy/gold.pyx
View File

@ -4,7 +4,6 @@ from __future__ import unicode_literals, print_function
import re import re
import random import random
import itertools
import numpy import numpy
import tempfile import tempfile
import shutil import shutil

1
spacy/syntax/_parser_model.pyx
View File

@ -7,7 +7,6 @@ from __future__ import unicode_literals, print_function
from collections import OrderedDict from collections import OrderedDict
import numpy import numpy
cimport cython.parallel cimport cython.parallel
import cytoolz
import numpy.random import numpy.random
cimport numpy as np cimport numpy as np
from libc.math cimport exp from libc.math cimport exp