explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2024-12-25 17:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update thinc imports for 6.9

Browse Source
This commit is contained in:
Matthew Honnibal 2017-10-03 20:07:17 +02:00
parent 4a59f6358c
commit 5454b20cd7
3 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spacy/_ml.py
View File

@ -1,33 +1,28 @@
import ujson import ujson
from thinc.v2v import Model, Maxout, Softmax, Affine, ReLu, SELU
from thinc.i2v import HashEmbed, StaticVectors
from thinc.t2t import ExtractWindow, ParametricAttention
from thinc.t2v import Pooling, max_pool, mean_pool, sum_pool
from thinc.misc import Residual
from thinc.misc import BatchNorm as BN
from thinc.misc import LayerNorm as LN
from thinc.api import add, layerize, chain, clone, concatenate, with_flatten from thinc.api import add, layerize, chain, clone, concatenate, with_flatten
from thinc.neural._classes.model import Model from thinc.api import FeatureExtracter, with_getitem
from thinc.neural._classes.maxout import Maxout from thinc.api import uniqued, wrap, flatten_add_lengths, noop
from thinc.neural._classes.softmax import Softmax
from thinc.neural._classes.affine import Affine from thinc.linear.linear import LinearModel
from thinc.neural._classes.hash_embed import HashEmbed
from thinc.neural.ops import NumpyOps, CupyOps from thinc.neural.ops import NumpyOps, CupyOps
from thinc.neural.util import get_array_module from thinc.neural.util import get_array_module
import random import random
import cytoolz import cytoolz
from thinc.neural._classes.convolution import ExtractWindow
from thinc.neural._classes.static_vectors import StaticVectors
from thinc.neural._classes.batchnorm import BatchNorm as BN
from thinc.neural._classes.layernorm import LayerNorm as LN
from thinc.neural._classes.resnet import Residual
from thinc.neural._classes.relu import ReLu
from thinc.neural._classes.selu import SELU
from thinc import describe from thinc import describe
from thinc.describe import Dimension, Synapses, Biases, Gradient from thinc.describe import Dimension, Synapses, Biases, Gradient
from thinc.neural._classes.affine import _set_dimensions_if_needed from thinc.neural._classes.affine import _set_dimensions_if_needed
from thinc.api import FeatureExtracter, with_getitem
from thinc.neural.pooling import Pooling, max_pool, mean_pool, sum_pool
from thinc.neural._classes.attention import ParametricAttention
from thinc.linear.linear import LinearModel
from thinc.api import uniqued, wrap, flatten_add_lengths, noop
import thinc.extra.load_nlp import thinc.extra.load_nlp
from .attrs import ID, ORTH, LOWER, NORM, PREFIX, SUFFIX, SHAPE, TAG, DEP, CLUSTER from .attrs import ID, ORTH, LOWER, NORM, PREFIX, SUFFIX, SHAPE, TAG, DEP, CLUSTER
from .tokens.doc import Doc from .tokens.doc import Doc
from . import util from . import util

18
spacy/pipeline.pyx
View File

@ -13,20 +13,18 @@ import ujson
import msgpack import msgpack
from thinc.api import add, layerize, chain, clone, concatenate, with_flatten from thinc.api import add, layerize, chain, clone, concatenate, with_flatten
from thinc.neural._classes.model import Model from thinc.v2v import Model, Maxout, Softmax, Affine, ReLu, SELU
from thinc.neural._classes.maxout import Maxout from thinc.i2v import HashEmbed
from thinc.neural._classes.softmax import Softmax from thinc.t2v import Pooling, max_pool, mean_pool, sum_pool
from thinc.neural._classes.affine import Affine from thinc.t2t import ExtractWindow, ParametricAttention
from thinc.neural._classes.hash_embed import HashEmbed from thinc.misc import Residual
from thinc.misc import BatchNorm as BN
from thinc.misc import LayerNorm as LN
from thinc.neural.util import to_categorical from thinc.neural.util import to_categorical
from thinc.neural.pooling import Pooling, max_pool, mean_pool
from thinc.neural._classes.difference import Siamese, CauchySimilarity from thinc.neural._classes.difference import Siamese, CauchySimilarity
from thinc.neural._classes.convolution import ExtractWindow
from thinc.neural._classes.resnet import Residual
from thinc.neural._classes.batchnorm import BatchNorm as BN
from .tokens.doc cimport Doc from .tokens.doc cimport Doc
from .syntax.parser cimport Parser as LinearParser from .syntax.parser cimport Parser as LinearParser
from .syntax.nn_parser cimport Parser as NeuralParser from .syntax.nn_parser cimport Parser as NeuralParser

10
spacy/syntax/nn_parser.pyx
View File

@ -38,13 +38,9 @@ from preshed.maps cimport MapStruct
from preshed.maps cimport map_get from preshed.maps cimport map_get
from thinc.api import layerize, chain, noop, clone, with_flatten from thinc.api import layerize, chain, noop, clone, with_flatten
from thinc.neural._classes.model import Model from thinc.v2v import Model, Maxout, Softmax, Affine, ReLu, SELU
from thinc.neural._classes.affine import Affine from thinc.misc import LayerNorm
from thinc.neural._classes.relu import ReLu
from thinc.neural._classes.maxout import Maxout
from thinc.neural._classes.batchnorm import BatchNorm as BN
from thinc.neural._classes.selu import SELU
from thinc.neural._classes.layernorm import LayerNorm
from thinc.neural.ops import NumpyOps, CupyOps from thinc.neural.ops import NumpyOps, CupyOps
from thinc.neural.util import get_array_module from thinc.neural.util import get_array_module