diff options
| author | Boris Fomitchev <bfomitchev@nvidia.com> | 2015-11-13 01:57:11 +0300 |
|---|---|---|
| committer | Boris Fomitchev <bfomitchev@nvidia.com> | 2015-11-13 01:57:11 +0300 |
| commit | 0d5095fba39362bb2fe4a064f058dc79b7eee824 (patch) | |
| tree | 25f4eb3fc333aeb0917dcf5d1800c135ce968701 /test | |
| parent | 413634aa8e27d4daed18d03e56da20046c62ce66 (diff) | |
| parent | 507c3a35e3bfbba2af102fbead0c2fb41e9db9b0 (diff) | |
rebase from upstream
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.lua | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/test.lua b/test/test.lua index 9b85499..9d13dfd 100644 --- a/test/test.lua +++ b/test/test.lua @@ -731,6 +731,7 @@ function cudnntest.LogSoftMax_batch() end function cudnntest.SpatialLogSoftMax() +<<<<<<< HEAD -- batch local numLabels = math.random(5,10) local h = math.random(5,10) @@ -824,8 +825,6 @@ function cudnntest.SpatialCrossEntropyCriterion() end - - function cudnntest.functional_bias2D() local bs = math.random(1,32) local from = math.random(1,32) |