提交 e4a14f54 authored 作者: Arnaud Bergeron's avatar Arnaud Bergeron

Fixes from test_blas.py

上级 14539bc2
...@@ -249,7 +249,7 @@ class GpuDot22(BlasOp, Dot22): ...@@ -249,7 +249,7 @@ class GpuDot22(BlasOp, Dot22):
dims[1] = PyGpuArray_DIMS(%(B)s)[1]; dims[1] = PyGpuArray_DIMS(%(B)s)[1];
if (theano_prep_output(&%(out)s, 2, dims, %(typecode)s, GA_C_ORDER, if (theano_prep_output(&%(out)s, 2, dims, %(typecode)s, GA_C_ORDER,
%(A)s->ctx)) { %(A)s->context)) {
%(fail)s %(fail)s
} }
......
...@@ -158,6 +158,8 @@ class GpuArrayType(Type): ...@@ -158,6 +158,8 @@ class GpuArrayType(Type):
return data return data
def filter_variable(self, other, allow_convert=True): def filter_variable(self, other, allow_convert=True):
from theano.sandbox.gpuarray import GpuFromHost
if hasattr(other, '_as_GpuArrayVariable'): if hasattr(other, '_as_GpuArrayVariable'):
other = other._as_GpuArrayVariable(self.context_name) other = other._as_GpuArrayVariable(self.context_name)
...@@ -188,7 +190,7 @@ class GpuArrayType(Type): ...@@ -188,7 +190,7 @@ class GpuArrayType(Type):
str(self.broadcastable))) str(self.broadcastable)))
other = other2 other = other2
return theano.sandbox.gpuarray.basic_ops.gpu_from_host(other) return GpuFromHost(self.context_name)(other)
@staticmethod @staticmethod
def values_eq(a, b): def values_eq(a, b):
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论