提交 420a832b authored 作者: Frederic Bastien's avatar Frederic Bastien 提交者: Mathieu Germain

Repair compilation with cudnn v4.

上级 9f62985e
...@@ -241,7 +241,6 @@ class GpuDnnConvDesc(GpuOp): ...@@ -241,7 +241,6 @@ class GpuDnnConvDesc(GpuOp):
} }
} }
// err = cudnnSetConvolutionNdDescriptor_v3(
err = cudnnSetConvolutionNdDescriptor( err = cudnnSetConvolutionNdDescriptor(
%(desc)s, %(desc)s,
%(nb_dim)d, %(nb_dim)d,
...@@ -1362,8 +1361,9 @@ class GpuDnnPoolDesc(GpuOp): ...@@ -1362,8 +1361,9 @@ class GpuDnnPoolDesc(GpuOp):
int win[%(nd)d] = {%(win)s}; int win[%(nd)d] = {%(win)s};
int pad[%(nd)d] = {%(pad)s}; int pad[%(nd)d] = {%(pad)s};
int str[%(nd)d] = {%(str)s}; int str[%(nd)d] = {%(str)s};
err = cudnnSetPoolingNdDescriptor_v3( err = cudnnSetPoolingNdDescriptor_v4(
%(desc)s, %(mode_flag)s, %(nd)d, %(desc)s, %(mode_flag)s,
CUDNN_PROPAGATE_NAN, %(nd)d,
win, pad, str); win, pad, str);
} }
if (err != CUDNN_STATUS_SUCCESS) { if (err != CUDNN_STATUS_SUCCESS) {
...@@ -1544,8 +1544,9 @@ for(int i = 0; i < %(nd)d; i++) { ...@@ -1544,8 +1544,9 @@ for(int i = 0; i < %(nd)d; i++) {
for(int i = 0; i < %(nd)d; i++) { for(int i = 0; i < %(nd)d; i++) {
str[i] = *((npy_intp*)PyArray_GETPTR1(%(str)s, i)); str[i] = *((npy_intp*)PyArray_GETPTR1(%(str)s, i));
} }
err = cudnnSetPoolingNdDescriptor_v3( err = cudnnSetPoolingNdDescriptor_v4(
pool%(name)s, %(mode_flag)s, %(nd)d, pool%(name)s, %(mode_flag)s,
CUDNN_PROPAGATE_NAN, %(nd)d,
win, pad, str); win, pad, str);
if (err != CUDNN_STATUS_SUCCESS) { if (err != CUDNN_STATUS_SUCCESS) {
...@@ -1822,8 +1823,9 @@ for(int i = 0; i < %(nd)d; i++) { ...@@ -1822,8 +1823,9 @@ for(int i = 0; i < %(nd)d; i++) {
for(int i = 0; i < %(nd)d; i++) { for(int i = 0; i < %(nd)d; i++) {
str[i] = *((npy_intp*)PyArray_GETPTR1(%(str)s, i)); str[i] = *((npy_intp*)PyArray_GETPTR1(%(str)s, i));
} }
err%(name)s = cudnnSetPoolingNdDescriptor_v3( err%(name)s = cudnnSetPoolingNdDescriptor_v4(
pool%(name)s, %(mode_flag)s, %(nd)d, pool%(name)s, %(mode_flag)s,
CUDNN_PROPAGATE_NAN, %(nd)d,
win, pad, str); win, pad, str);
if (err%(name)s != CUDNN_STATUS_SUCCESS) { if (err%(name)s != CUDNN_STATUS_SUCCESS) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论