diff options
| author | Boris Fomitchev <bfomitchev@nvidia.com> | 2017-02-23 00:54:06 +0300 |
|---|---|---|
| committer | Boris Fomitchev <bfomitchev@nvidia.com> | 2017-02-23 00:54:06 +0300 |
| commit | f4ec352c55a29be06b14f01ca77087d0f9b0e1a4 (patch) | |
| tree | 527b07beac28ec0da23cdffa2270f280a8006007 | |
| parent | 0e5a9452567aacb72530781282b825c9580e5806 (diff) | |
Putting in-place tests back
| -rw-r--r-- | cmake/FindCUDNN.cmake | 2 | ||||
| -rw-r--r-- | test/test.lua | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cmake/FindCUDNN.cmake b/cmake/FindCUDNN.cmake index 14f6b39..b1f7349 100644 --- a/cmake/FindCUDNN.cmake +++ b/cmake/FindCUDNN.cmake @@ -62,7 +62,7 @@ function(CUDNN_INSTALL version dest_libdir dest_incdir dest_bindir) # Download and install CUDNN locally if not found on the system if(url_arch_name) - set(download_dir ${CMAKE_CURRENT_BINARY_DIR}/downloads) + set(download_dir ${CMAKE_CURRENT_BINARY_DIR}/downloads/cudnn${version}) file(MAKE_DIRECTORY ${download_dir}) set(cudnn_filename cudnn-${CUDA_VERSION}-${url_arch_name}-v${version}.tgz) set(base_url http://developer.download.nvidia.com/compute/redist/cudnn) diff --git a/test/test.lua b/test/test.lua index e37a1c1..ffe6cc3 100644 --- a/test/test.lua +++ b/test/test.lua @@ -1,6 +1,7 @@ require 'cudnn' require 'cunn' + local cudnntest = torch.TestSuite() local times = {} local mytester @@ -550,11 +551,11 @@ function cudnntest.ReLU() nonlin('ReLU', false) -- out of place end function cudnntest.Tanh() --- nonlin('Tanh', true) -- inplace + nonlin('Tanh', true) -- inplace nonlin('Tanh', false) -- out of place end function cudnntest.Sigmoid() --- nonlin('Sigmoid', true) -- inplace + nonlin('Sigmoid', true) -- inplace nonlin('Sigmoid', false) -- out of place end @@ -1057,5 +1058,3 @@ for i = 1, 1 do -- cutorch.getDeviceCount() do end os.execute('rm -f modelTemp.t7') - - |