提交 6480e7f0 authored 作者: Frederic Bastien's avatar Frederic Bastien

Made error msg more explicit and small refactoring following code review.

上级 b9f3daec
...@@ -2982,18 +2982,20 @@ CudaNdarray_dimshuffle(CudaNdarray * self, unsigned int len, const int * pattern ...@@ -2982,18 +2982,20 @@ CudaNdarray_dimshuffle(CudaNdarray * self, unsigned int len, const int * pattern
} }
else if(dims_taken[pattern[i]]) else if(dims_taken[pattern[i]])
{ {
PyErr_SetString(PyExc_ValueError, "Cudandarray_dimshuffle: The same input dimension may not appear twice in the list of output dimensions"); PyErr_Format(PyExc_ValueError, "Cudandarray_dimshuffle: invalid pattern for Cudandarray_dimshuffle. You used the dimensions %d multiple time",
pattern[i]);
free(newdims); free(newdims);
return -1; return -1;
} }
else else if (pattern[i]>= self->nd)
{ {
if ((dims_taken[pattern[i]]) || (pattern[i]>= self->nd)) PyErr_Format(PyExc_ValueError, "Cudandarray_dimshuffle: invalid pattern for Cudandarray_dimshuffle. You asked for a dimensions that don't exist %d for a %d dims CudaNdarray",
{ pattern[i], self->nd);
PyErr_SetString(PyExc_ValueError, "Cudandarray_dimshuffle: invalid pattern for Cudandarray_dimshuffle"); free(newdims);
free(newdims); return -1;
return -1; }
} else
{
newdims[i] = CudaNdarray_HOST_DIMS(self)[pattern[i]]; newdims[i] = CudaNdarray_HOST_DIMS(self)[pattern[i]];
newstrides[i] = CudaNdarray_HOST_STRIDES(self)[pattern[i]]; newstrides[i] = CudaNdarray_HOST_STRIDES(self)[pattern[i]];
dims_taken[pattern[i]] = 1; dims_taken[pattern[i]] = 1;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论