提交 c956b2ba authored 作者: Frederic Bastien's avatar Frederic Bastien

correctly detect if CudaNdarray may share memory when scipy is not available.

上级 36e9cfdf
...@@ -10,35 +10,27 @@ from theano.tensor.basic import TensorType ...@@ -10,35 +10,27 @@ from theano.tensor.basic import TensorType
try: try:
import scipy.sparse import scipy.sparse
from theano.sparse.basic import _is_sparse, SparseType
except ImportError: except ImportError:
#scipy not imported, their can be only ndarray #scipy not imported, their can be only ndarray and cudandarray
def may_share_memory(a, b, raise_other_type=True): def _is_sparse(a):
if not isinstance(a, numpy.ndarray) or not isinstance(b, numpy.ndarray):
if raise_other_type:
raise TypeError("may_share_memory support only ndarray when scipy is not available")
return False return False
return numpy.may_share_memory(a,b)
import theano.sandbox.cuda as cuda
if cuda.cuda_available:
def _is_cuda(a):
return isinstance(a, cuda.CudaNdarray)
else: else:
#scipy imported, their can be ndarray and sparse type def _is_cuda(a):
from theano.sparse.basic import _is_sparse, SparseType return False
def may_share_memory(a, b, raise_other_type=True):
def may_share_memory(a, b, raise_other_type=True):
a_ndarray = isinstance(a, numpy.ndarray) a_ndarray = isinstance(a, numpy.ndarray)
b_ndarray = isinstance(b, numpy.ndarray) b_ndarray = isinstance(b, numpy.ndarray)
try:
a_sparse = _is_sparse(a) a_sparse = _is_sparse(a)
except NotImplementedError:
a_sparse = False
try:
b_sparse = _is_sparse(b) b_sparse = _is_sparse(b)
except NotImplementedError: a_cuda = _is_cuda(a)
b_sparse = False b_cuda = _is_cuda(b)
a_cuda = False
b_cuda = False
if a.__class__.__name__ == "CudaNdarray":
a_cuda = True
if b.__class__.__name__ == "CudaNdarray":
b_cuda = True
if not(a_ndarray or a_sparse or a_cuda) or not(b_ndarray or b_sparse or b_cuda): if not(a_ndarray or a_sparse or a_cuda) or not(b_ndarray or b_sparse or b_cuda):
if raise_other_type: if raise_other_type:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论