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

Fix merge mistake with GpuFromHost.

上级 69c71a3f
...@@ -392,13 +392,14 @@ class GpuFromHost(Op): ...@@ -392,13 +392,14 @@ class GpuFromHost(Op):
if (%(name)s_tmp == NULL) if (%(name)s_tmp == NULL)
%(fail)s %(fail)s
Py_XDECREF(%(out)s); Py_XDECREF(%(out)s);
%(out)s = pygpu_fromhostdata(PyArray_DATA(%(inp)s), %(out)s = pygpu_fromhostdata(PyArray_DATA(%(name)s_tmp),
get_typecode((PyObject *)PyArray_DESCR(%(inp)s)), get_typecode((PyObject *)PyArray_DESCR(%(name)s_tmp)),
PyArray_NDIM(%(inp)s), PyArray_NDIM(%(name)s_tmp),
(size_t *)PyArray_DIMS(%(inp)s), (size_t *)PyArray_DIMS(%(name)s_tmp),
(ssize_t *)PyArray_STRIDES(%(inp)s), (ssize_t *)PyArray_STRIDES(%(name)s_tmp),
%(ctx)s, %(ctx)s,
Py_None); Py_None);
Py_DECREF(%(name)s_tmp);
if (%(out)s == NULL) { if (%(out)s == NULL) {
%(fail)s %(fail)s
} }
...@@ -406,7 +407,7 @@ class GpuFromHost(Op): ...@@ -406,7 +407,7 @@ class GpuFromHost(Op):
'out': outputs[0], 'fail': sub['fail']} 'out': outputs[0], 'fail': sub['fail']}
def c_code_cache_version(self): def c_code_cache_version(self):
return (6,) return (7,)
class GpuToGpu(Op): class GpuToGpu(Op):
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论