提交 5670530c 编写于 作者: K Kaipeng Deng 提交者: chengduo

Revert "not use PERSISTENT in batch_norm. test=develop" (#16333)

上级 d2b938ef
...@@ -75,15 +75,11 @@ class BatchNormKernel<platform::CUDADeviceContext, T> ...@@ -75,15 +75,11 @@ class BatchNormKernel<platform::CUDADeviceContext, T>
<< "CUDNN_BN_MIN_EPSILON instead."; << "CUDNN_BN_MIN_EPSILON instead.";
} }
epsilon = std::max(epsilon, CUDNN_BN_MIN_EPSILON); epsilon = std::max(epsilon, CUDNN_BN_MIN_EPSILON);
#if CUDNN_VERSION_MIN(7, 0, 0)
// TODO(dengkaipeng): use PERSISTENT mode in training may incur errors mode_ = CUDNN_BATCHNORM_SPATIAL_PERSISTENT;
// in inference period, cuDNN fixed issues on PERSISTENT mode in version #else
// 7.0.2, 7.0.4 and 7.3.0, we disable this mode currently.
// #if CUDNN_VERSION_MIN(7, 0, 0)
// mode_ = CUDNN_BATCHNORM_SPATIAL_PERSISTENT;
// #else
mode_ = CUDNN_BATCHNORM_SPATIAL; mode_ = CUDNN_BATCHNORM_SPATIAL;
// #endif #endif
VLOG(3) << "Setting descriptors."; VLOG(3) << "Setting descriptors.";
std::vector<int> dims; std::vector<int> dims;
...@@ -305,15 +301,11 @@ class BatchNormGradKernel<platform::CUDADeviceContext, T> ...@@ -305,15 +301,11 @@ class BatchNormGradKernel<platform::CUDADeviceContext, T>
<< "CUDNN_BN_MIN_EPSILON instead."; << "CUDNN_BN_MIN_EPSILON instead.";
} }
epsilon = std::max(epsilon, CUDNN_BN_MIN_EPSILON); epsilon = std::max(epsilon, CUDNN_BN_MIN_EPSILON);
#if CUDNN_VERSION_MIN(7, 0, 0)
// TODO(dengkaipeng): use PERSISTENT mode in training may incur errors mode_ = CUDNN_BATCHNORM_SPATIAL_PERSISTENT;
// in inference period, cuDNN fixed issues on PERSISTENT mode in version #else
// 7.0.2, 7.0.4 and 7.3.0, we disable this mode currently.
// #if CUDNN_VERSION_MIN(7, 0, 0)
// mode_ = CUDNN_BATCHNORM_SPATIAL_PERSISTENT;
// #else
mode_ = CUDNN_BATCHNORM_SPATIAL; mode_ = CUDNN_BATCHNORM_SPATIAL;
// #endif #endif
CUDNN_ENFORCE(platform::dynload::cudnnSetTensorNdDescriptor( CUDNN_ENFORCE(platform::dynload::cudnnSetTensorNdDescriptor(
data_desc_, CudnnDataType<T>::type, data_desc_, CudnnDataType<T>::type,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册