Rooba
/
spaCy
mirror of https://github.com/explosion/spaCy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit f41e626844.
This commit is contained in:
Matthew Honnibal 2018-03-27 19:22:52 +02:00
parent f41e626844
commit 8b7a74570f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spacy/util.py
View File

@ -14,6 +14,7 @@ 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
@ -241,7 +242,12 @@ def is_in_jupyter():
def get_cuda_stream(require=False): def get_cuda_stream(require=False):
return CudaStream() if CudaStream is not None else None if CudaStream is 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):