diff options
| author | Boris Fomitchev <bfomitchev@nvidia.com> | 2015-10-14 04:30:01 +0300 |
|---|---|---|
| committer | Boris Fomitchev <bfomitchev@nvidia.com> | 2015-10-14 04:30:01 +0300 |
| commit | ab763a99d1a7e04f329a117916d1ea4a798f7f1e (patch) | |
| tree | fe438785e427218c6b846104184bc66d0bf7d2a4 /SpatialConvolution.lua | |
| parent | 88a9b959196d24013c3cbb9246b75da66b775c34 (diff) | |
Conmpleting the merge
Diffstat (limited to 'SpatialConvolution.lua')
| -rw-r--r-- | SpatialConvolution.lua | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/SpatialConvolution.lua b/SpatialConvolution.lua index f1597f1..bbdffe2 100644 --- a/SpatialConvolution.lua +++ b/SpatialConvolution.lua @@ -263,7 +263,6 @@ function SpatialConvolution:createIODescriptors(input) algSearchMode = 'CUDNN_CONVOLUTION_BWD_DATA_PREFER_FASTEST' end if cudnn.benchmark then -- the manual auto-tuner is run -<<<<<<< HEAD if autotunerCache[3][autotunerHash] then algType[0] = autotunerCache[3][autotunerHash] else @@ -285,19 +284,6 @@ function SpatialConvolution:createIODescriptors(input) shape(self.weight), shape(input[input_slice]), shape(self.output[output_slice]))) end -======= - local perfResults = ffi.new("cudnnConvolutionBwdDataAlgoPerf_t[?]", 1) - local intt = torch.IntTensor(1); - errcheck('cudnnFindConvolutionBackwardDataAlgorithm', - cudnn.getHandle(), - self.weightDesc[0], self.oDesc[0], - self.convDesc[0], self.iDesc[0], - 1, intt:data(), perfResults) - algType[0] = perfResults[0].algo - if cudnn.verbose then - print('cudnnConvolutionBwdDataAlgoPerf_t\tAutoTuning:', perfResults[0].time, '\t', - tonumber(perfResults[0].memory), '\t', tonumber(perfResults[0].algo)) ->>>>>>> 350243991bf7c1f76648c668df2df6be644a2b31 end else errcheck('cudnnGetConvolutionBackwardDataAlgorithm', |