diff options
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) |