diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-07-18 17:15:56 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-07-18 17:21:17 -0700 |
| commit | f55028af4861bc78516164975a43f259507adf60 (patch) | |
| tree | e33b3346296403c3663058371901d9821e275ca6 /tensorflow/stream_executor | |
| parent | ae62a692ddb53253462c1f79702fbc45baeb4ae3 (diff) | |
Automated rollback of commit 36a66347e8e344cddee4a8d9123ccbcae40011b1
PiperOrigin-RevId: 205164273
Diffstat (limited to 'tensorflow/stream_executor')
| -rw-r--r-- | tensorflow/stream_executor/cuda/cuda_dnn.cc | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/tensorflow/stream_executor/cuda/cuda_dnn.cc b/tensorflow/stream_executor/cuda/cuda_dnn.cc index e85b6db511..766a0dafb5 100644 --- a/tensorflow/stream_executor/cuda/cuda_dnn.cc +++ b/tensorflow/stream_executor/cuda/cuda_dnn.cc @@ -2411,19 +2411,6 @@ port::Status CudnnSupport::DoConvolveImpl( stream, cudnn, algorithm_config, input_nd, filter, conv, output_nd, scratch_allocator, &scratch)); - if (cudnn_type == CUDNN_DATA_HALF && - filter_descriptor.layout() == dnn::FilterLayout::kOutputYXInput && - (algo_desc.algo_id() != CUDNN_CONVOLUTION_FWD_ALGO_IMPLICIT_GEMM || - input_descriptor.layout() != dnn::DataLayout::kBatchYXDepth || - output_descriptor.layout() != dnn::DataLayout::kBatchYXDepth)) { - // TODO(timshen): Attach a nvbugs number. - return port::Status( - port::error::INTERNAL, - "Cudnn doesn't return an error code on this documented unsupported " - "layout combination. Instead, it accesses out-of-bounds memory. " - "Being nice and returning an error instead."); - } - std::unique_ptr<CUDATimer, TimerDeleter> timer; if (is_profiling) { timer.reset(new CUDATimer(parent_)); // NOLINT @@ -3093,21 +3080,9 @@ port::Status CudnnSupport::DoConvolveBackwardDataImpl( } } - if (cudnn_type == CUDNN_DATA_HALF && - filter_descriptor.layout() == dnn::FilterLayout::kOutputYXInput && - ((algo_desc.algo_id() != CUDNN_CONVOLUTION_BWD_FILTER_ALGO_0 && - algo_desc.algo_id() != CUDNN_CONVOLUTION_BWD_FILTER_ALGO_1) || - input_descriptor.layout() != dnn::DataLayout::kBatchYXDepth || - output_descriptor.layout() != dnn::DataLayout::kBatchYXDepth)) { - return port::Status( - port::error::INTERNAL, - "Cudnn doesn't return an error code on this documented unsupported " - "layout combination. Instead, it crashes. Being nice and returning an " - "error instead. See nvbugs/2260917"); - } - // Cudnn 7.1.4 has a bug if the workspace of the following convolution is not - // zero-initialized. See nvbugs/2254619. + // zero-initialized. + // TODO(timshen): Add an nvbugs/ link. if (CUDNN_VERSION >= 7000 && algorithm_config.algorithm().algo_id() == CUDNN_CONVOLUTION_BWD_DATA_ALGO_1 && |