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

Remove cupy imports from parser, so it can work on CPU

Browse Source
This commit is contained in:
Matthew Honnibal 2017-05-14 00:37:53 +02:00
parent 613ba79e2e
commit f8c02b4341
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spacy/syntax/parser.pyx
View File

@ -6,9 +6,6 @@ from __future__ import unicode_literals, print_function
from collections import Counter from collections import Counter
import ujson import ujson
from cupy.cuda.stream import Stream
import cupy
from libc.math cimport exp from libc.math cimport exp
cimport cython cimport cython
cimport cython.parallel cimport cython.parallel
@ -36,7 +33,9 @@ from thinc.api import layerize, chain
from thinc.neural import BatchNorm, Model, Affine, ELU, ReLu, Maxout from thinc.neural import BatchNorm, Model, Affine, ELU, ReLu, Maxout
from thinc.neural.ops import NumpyOps from thinc.neural.ops import NumpyOps
from ..util import get_cuda_stream
from .._ml import zero_init, PrecomputableAffine, PrecomputableMaxouts from .._ml import zero_init, PrecomputableAffine, PrecomputableMaxouts
from . import _parse_features from . import _parse_features
from ._parse_features cimport CONTEXT_SIZE from ._parse_features cimport CONTEXT_SIZE
from ._parse_features cimport fill_context from ._parse_features cimport fill_context
@ -380,7 +379,7 @@ cdef class Parser:
np.ndarray py_scores np.ndarray py_scores
int[500] is_valid # Hacks for now int[500] is_valid # Hacks for now
cuda_stream = Stream() cuda_stream = get_cuda_stream()
docs, tokvecs = docs_tokvecs docs, tokvecs = docs_tokvecs
lower_model = get_greedy_model_for_batch(len(docs), tokvecs, self.feature_maps, lower_model = get_greedy_model_for_batch(len(docs), tokvecs, self.feature_maps,
cuda_stream) cuda_stream)
@ -419,7 +418,7 @@ cdef class Parser:
np.ndarray scores np.ndarray scores
docs, tokvecs = docs_tokvecs docs, tokvecs = docs_tokvecs
cuda_stream = Stream() cuda_stream = get_cuda_stream()
lower_model = get_greedy_model_for_batch(len(docs), lower_model = get_greedy_model_for_batch(len(docs),
tokvecs, self.feature_maps, cuda_stream=cuda_stream, tokvecs, self.feature_maps, cuda_stream=cuda_stream,
drop=drop) drop=drop)
@ -445,6 +444,7 @@ cdef class Parser:
loss = 0. loss = 0.
total = 1e-4 total = 1e-4
follow_gold = False follow_gold = False
cupy = self.feature_maps.ops.xp
while len(todo) >= 4: while len(todo) >= 4:
states, offsets, golds = zip(*todo) states, offsets, golds = zip(*todo)

10
spacy/util.py
View File

@ -47,6 +47,16 @@ def ensure_path(path):
return path return path
def get_cuda_stream(require=False):
# TODO: Error and tell to install chainer if not found
# Requires GPU
try:
from cupy.cuda.stream import Stream
except ImportError:
return None
return Stream()
def read_regex(path): def read_regex(path):
path = ensure_path(path) path = ensure_path(path)
with path.open() as file_: with path.open() as file_: