提交 101fbd90 authored 作者: notoraptor's avatar notoraptor

Update cuDNN upper limit; convert some comments to TODO.

上级 ec080139
...@@ -47,7 +47,7 @@ class CuDNNV51(object): ...@@ -47,7 +47,7 @@ class CuDNNV51(object):
('CUDNN_CONVOLUTION_FWD_ALGO_FFT', 'fft'), ('CUDNN_CONVOLUTION_FWD_ALGO_FFT', 'fft'),
('CUDNN_CONVOLUTION_FWD_ALGO_FFT_TILING', 'fft_tiling'), ('CUDNN_CONVOLUTION_FWD_ALGO_FFT_TILING', 'fft_tiling'),
('CUDNN_CONVOLUTION_FWD_ALGO_WINOGRAD', 'winograd'), ('CUDNN_CONVOLUTION_FWD_ALGO_WINOGRAD', 'winograd'),
# Not yet tested/documented: # TODO: Not yet tested/documented:
('CUDNN_CONVOLUTION_FWD_ALGO_WINOGRAD_NONFUSED', 'winograd_non_fused'), ('CUDNN_CONVOLUTION_FWD_ALGO_WINOGRAD_NONFUSED', 'winograd_non_fused'),
ctype='cudnnConvolutionFwdAlgo_t') ctype='cudnnConvolutionFwdAlgo_t')
...@@ -59,7 +59,7 @@ class CuDNNV51(object): ...@@ -59,7 +59,7 @@ class CuDNNV51(object):
('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_3', 'small'), ('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_3', 'small'),
# not implemented: # not implemented:
('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_WINOGRAD'), ('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_WINOGRAD'),
# not yet tested/documented: # TODO: not yet tested/documented:
('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_WINOGRAD_NONFUSED', 'winograd_non_fused'), ('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_WINOGRAD_NONFUSED', 'winograd_non_fused'),
ctype='cudnnConvolutionBwdFilterAlgo_t') ctype='cudnnConvolutionBwdFilterAlgo_t')
...@@ -70,7 +70,7 @@ class CuDNNV51(object): ...@@ -70,7 +70,7 @@ class CuDNNV51(object):
('CUDNN_CONVOLUTION_BWD_DATA_ALGO_FFT', 'fft'), ('CUDNN_CONVOLUTION_BWD_DATA_ALGO_FFT', 'fft'),
('CUDNN_CONVOLUTION_BWD_DATA_ALGO_FFT_TILING', 'fft_tiling'), ('CUDNN_CONVOLUTION_BWD_DATA_ALGO_FFT_TILING', 'fft_tiling'),
('CUDNN_CONVOLUTION_BWD_DATA_ALGO_WINOGRAD', 'winograd'), ('CUDNN_CONVOLUTION_BWD_DATA_ALGO_WINOGRAD', 'winograd'),
# not yet tested/documented: # TODO: not yet tested/documented:
('CUDNN_CONVOLUTION_BWD_DATA_ALGO_WINOGRAD_NONFUSED', 'winograd_non_fused'), ('CUDNN_CONVOLUTION_BWD_DATA_ALGO_WINOGRAD_NONFUSED', 'winograd_non_fused'),
ctype='cudnnConvolutionBwdDataAlgo_t') ctype='cudnnConvolutionBwdDataAlgo_t')
...@@ -101,7 +101,6 @@ class CuDNNV6(CuDNNV51): ...@@ -101,7 +101,6 @@ class CuDNNV6(CuDNNV51):
cudnnPoolingMode_t = CEnumType(('CUDNN_POOLING_MAX', 'max'), cudnnPoolingMode_t = CEnumType(('CUDNN_POOLING_MAX', 'max'),
('CUDNN_POOLING_AVERAGE_COUNT_INCLUDE_PADDING', 'average_inc_pad'), ('CUDNN_POOLING_AVERAGE_COUNT_INCLUDE_PADDING', 'average_inc_pad'),
('CUDNN_POOLING_AVERAGE_COUNT_EXCLUDE_PADDING', 'average_exc_pad'), ('CUDNN_POOLING_AVERAGE_COUNT_EXCLUDE_PADDING', 'average_exc_pad'),
# tested but not yet documented:
# new in v6: # new in v6:
('CUDNN_POOLING_MAX_DETERMINISTIC', 'max_deterministic'), ('CUDNN_POOLING_MAX_DETERMINISTIC', 'max_deterministic'),
ctype='cudnnPoolingMode_t') ctype='cudnnPoolingMode_t')
...@@ -112,7 +111,7 @@ class CuDNNV6(CuDNNV51): ...@@ -112,7 +111,7 @@ class CuDNNV6(CuDNNV51):
('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_3', 'small'), ('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_3', 'small'),
('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_WINOGRAD'), ('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_WINOGRAD'),
('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_WINOGRAD_NONFUSED', 'winograd_non_fused'), ('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_WINOGRAD_NONFUSED', 'winograd_non_fused'),
# not yet tested/documented: # TODO: not yet tested/documented:
# new in v6: # new in v6:
('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_FFT_TILING', 'fft_tiling'), ('CUDNN_CONVOLUTION_BWD_FILTER_ALGO_FFT_TILING', 'fft_tiling'),
ctype='cudnnConvolutionBwdFilterAlgo_t') ctype='cudnnConvolutionBwdFilterAlgo_t')
......
...@@ -141,7 +141,7 @@ def _dnn_check_version(): ...@@ -141,7 +141,7 @@ def _dnn_check_version():
warnings.warn("Your cuDNN version is more recent than " warnings.warn("Your cuDNN version is more recent than "
"Theano. If you encounter problems, try " "Theano. If you encounter problems, try "
"updating Theano or downgrading cuDNN to " "updating Theano or downgrading cuDNN to "
"a version >= v5 and < v6.1.") "a version >= v5 and <= v6.")
return True, None return True, None
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论