Skip to content

Change CUDA StreamExecutor to use new member function in AlgorithmDesc #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whchung merged 1 commit into from
Jul 19, 2018
Merged

Change CUDA StreamExecutor to use new member function in AlgorithmDesc #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions tensorflow/stream_executor/cuda/cuda_dnn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1980,7 +1980,7 @@ GetCudnnConvolutionBackwardFilterAlgo(const CudnnHandle& cudnn,

port::StatusOr<DeviceMemory<uint8>> AllocateCudnnConvolutionForwardWorkspace(
Stream* stream, const CudnnHandle& cudnn,
const dnn::AlgorithmDesc& algorithm_desc,
dnn::AlgorithmDesc& algorithm_desc,
const CudnnTensorDescriptor& input_nd, const CudnnFilterDescriptor& filter,
const CudnnConvolutionDescriptor& conv,
const CudnnTensorDescriptor& output_nd,
Expand All @@ -1998,6 +1998,7 @@ port::StatusOr<DeviceMemory<uint8>> AllocateCudnnConvolutionForwardWorkspace(
/*wDesc=*/filter.handle(), /*convDesc=*/conv.handle(),
/*yDesc=*/output_nd.handle(), /*algo=*/ToConvForwardAlgo(algorithm_desc),
/*sizeInBytes=*/&size_in_bytes));
algorithm_desc.set_scratch_size(size_in_bytes);
int64 size_in_bytes_int64 = size_in_bytes;

if (TF_PREDICT_FALSE(size_in_bytes_int64 < 0)) {
Expand Down Expand Up @@ -2042,6 +2043,7 @@ AllocateCudnnConvolutionBackwardDataWorkspace(
/*dxDesc=*/input_nd.handle(),
/*algo=*/ToConvBackwardDataAlgo(algorithm_desc),
/*sizeInBytes=*/&size_in_bytes));
algorithm_desc.set_scratch_size(size_in_bytes);
int64 size_in_bytes_int64 = size_in_bytes;

if (TF_PREDICT_FALSE(size_in_bytes_int64 < 0)) {
Expand All @@ -2066,7 +2068,7 @@ AllocateCudnnConvolutionBackwardDataWorkspace(
port::StatusOr<DeviceMemory<uint8>>
AllocateCudnnConvolutionBackwardFilterWorkspace(
Stream* stream, const CudnnHandle& cudnn,
const dnn::AlgorithmDesc& algorithm_desc,
dnn::AlgorithmDesc& algorithm_desc,
const CudnnTensorDescriptor& input_nd, const CudnnFilterDescriptor& filter,
const CudnnConvolutionDescriptor& conv,
const CudnnTensorDescriptor& output_nd,
Expand All @@ -2086,6 +2088,7 @@ AllocateCudnnConvolutionBackwardFilterWorkspace(
/*gradDesc=*/filter.handle(),
/*algo=*/ToConvBackwardFilterAlgo(algorithm_desc),
/*sizeInBytes=*/&size_in_bytes));
algorithm_desc.set_scratch_size(size_in_bytes);
int64 size_in_bytes_int64 = size_in_bytes;

if (TF_PREDICT_FALSE(size_in_bytes_int64 < 0)) {
Expand Down