提交 2dced45c authored 作者: carriepl's avatar carriepl

Merge pull request #2892 from nouiz/gpuarray_crash

fix crash in debugmode
import pkg_resources
import theano import theano
from theano.sandbox.cuda.type import CudaNdarrayType from theano.sandbox.cuda.type import CudaNdarrayType
from theano.sandbox.cuda import GpuOp from theano.sandbox.cuda import GpuOp
from theano.sandbox.cuda.basic_ops import as_cuda_ndarray_variable from theano.sandbox.cuda.basic_ops import as_cuda_ndarray_variable
try: try:
...@@ -15,7 +16,7 @@ cula_available = False ...@@ -15,7 +16,7 @@ cula_available = False
try: try:
from scikits.cuda import cula from scikits.cuda import cula
cula_available = True cula_available = True
except (ImportError, OSError): except (ImportError, OSError, pkg_resources.DistributionNotFound):
pass pass
cula_initialized = False cula_initialized = False
......
...@@ -189,8 +189,8 @@ class GpuGer(BlasOp, Ger): ...@@ -189,8 +189,8 @@ class GpuGer(BlasOp, Ger):
inplace = self.destructive inplace = self.destructive
if inplace and not A.flags.forc: if inplace and not A.flags.forc:
inplace = False inplace = False
outputs[0][0] = blas.ger(alpha, x, y, A, out[0][0] = blas.ger(alpha, x, y, A,
overwrite_a=inplace) overwrite_a=inplace)
def c_code(self, node, name, inp, out, sub): def c_code(self, node, name, inp, out, sub):
vars = dict(out=out[0], A=inp[0], alpha=inp[1], x=inp[2], y=inp[3], vars = dict(out=out[0], A=inp[0], alpha=inp[1], x=inp[2], y=inp[3],
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论