Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop"

This reverts commit c9ba3d3c2d, reversing
changes made to f57bfbccdc.
This commit is contained in:
Matthew Honnibal 2018-03-27 19:22:25 +02:00
parent c9ba3d3c2d
commit f41e626844

View File

@ -14,7 +14,6 @@ from collections import OrderedDict
import inspect import inspect
import warnings import warnings
from thinc.neural._classes.model import Model from thinc.neural._classes.model import Model
from thinc.neural.ops import NumpyOps
import functools import functools
import cytoolz import cytoolz
import itertools import itertools
@ -242,12 +241,7 @@ def is_in_jupyter():
def get_cuda_stream(require=False): def get_cuda_stream(require=False):
if CudaStream is None: return CudaStream() if CudaStream is not None else None
return None
elif isinstance(Model.ops, NumpyOps):
return None
else:
return CudaStream()
def get_async(stream, numpy_array): def get_async(stream, numpy_array):