From f41e626844c62c1cf1333a99df2e027ec205a7c6 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 27 Mar 2018 19:22:25 +0200 Subject: [PATCH] Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop" This reverts commit c9ba3d3c2dc7067cf8bd55f878cec45a8c6d73d4, reversing changes made to f57bfbccdcaa463b641f5502451ad4cb6b131cab. --- spacy/util.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/spacy/util.py b/spacy/util.py index f6b0b6a35..dc51e467d 100644 --- a/spacy/util.py +++ b/spacy/util.py @@ -14,7 +14,6 @@ from collections import OrderedDict import inspect import warnings from thinc.neural._classes.model import Model -from thinc.neural.ops import NumpyOps import functools import cytoolz import itertools @@ -242,12 +241,7 @@ def is_in_jupyter(): def get_cuda_stream(require=False): - if CudaStream is None: - return None - elif isinstance(Model.ops, NumpyOps): - return None - else: - return CudaStream() + return CudaStream() if CudaStream is not None else None def get_async(stream, numpy_array):