提交 669cf0d1 authored 作者: Pascal Lamblin's avatar Pascal Lamblin

Merge pull request #3183 from kelvinxu/cpu_contiguous_fix

Cpu Contiguous Dim Check
...@@ -40,6 +40,7 @@ class CpuContiguous(theano.Op): ...@@ -40,6 +40,7 @@ class CpuContiguous(theano.Op):
if (!PyArray_CHKFLAGS(%(x)s, NPY_ARRAY_C_CONTIGUOUS)){ if (!PyArray_CHKFLAGS(%(x)s, NPY_ARRAY_C_CONTIGUOUS)){
// check to see if output is contiguous first // check to see if output is contiguous first
if (%(y)s != NULL && if (%(y)s != NULL &&
PyArray_CompareLists(PyArray_DIMS(%(y)s), PyArray_DIMS(%(x)s), PyArray_NDIM(%(x)s)) &&
PyArray_CHKFLAGS(%(y)s, NPY_ARRAY_C_CONTIGUOUS)){ PyArray_CHKFLAGS(%(y)s, NPY_ARRAY_C_CONTIGUOUS)){
PyArray_CopyInto(%(y)s, %(x)s); PyArray_CopyInto(%(y)s, %(x)s);
} }
...@@ -57,7 +58,7 @@ class CpuContiguous(theano.Op): ...@@ -57,7 +58,7 @@ class CpuContiguous(theano.Op):
return code return code
def c_code_cache_version(self): def c_code_cache_version(self):
return (0,) return (1,)
cpu_contiguous = CpuContiguous() cpu_contiguous = CpuContiguous()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论