X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dagnn.git;a=blobdiff_plain;f=test-dagnn.lua;h=a41d8802931ec51f500a42ba4e2608540addf340;hp=cac5a944a365a8e9b189c71d53b9e08179058798;hb=da6186a657b7563841416c42336e52937b76d67f;hpb=d0743d66135ed7cedcb3777cfa5dda883cbeadb3

diff --git a/test-dagnn.lua b/test-dagnn.lua
index cac5a94..a41d880 100755
--- a/test-dagnn.lua
+++ b/test-dagnn.lua
@@ -1,10 +1,32 @@
 #!/usr/bin/env luajit
 
+--[[
+
+   Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+   Written by Francois Fleuret <francois.fleuret@idiap.ch>
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 3 as
+   published by the Free Software Foundation.
+
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
+]]--
+
 require 'torch'
 require 'nn'
-
 require 'dagnn'
 
+-- torch.setnumthreads(params.nbThreads)
+torch.setdefaulttensortype('torch.DoubleTensor')
+torch.manualSeed(2)
+
 function checkGrad(model, criterion, input, target)
    local params, gradParams = model:getParameters()
 
@@ -32,10 +54,18 @@ function checkGrad(model, criterion, input, target)
 
       local ana = analyticalGradParam[i]
       local num = (loss1 - loss0) / (2 * epsilon)
-      local err = torch.abs(num - ana) / torch.abs(num)
+      local err
+
+      if num == ana then
+         err = 0
+      else
+         err = torch.abs(num - ana) / torch.abs(num)
+      end
 
       print(
-         err .. ' checkGrad ' .. i
+         'CHECK '
+            .. err
+            .. ' checkGrad ' .. i
             .. ' analytical ' .. ana
             .. ' numerical ' .. num
       )
@@ -54,63 +84,34 @@ function printTensorTable(t)
    end
 end
 
--- torch.setnumthreads(params.nbThreads)
-torch.setdefaulttensortype('torch.DoubleTensor')
-torch.manualSeed(2)
+--               +- Linear(10, 10) -> ReLU ---> d --+
+--              /                              /     \
+--             /                              /       \
+--  --> a --> b -----------> c --------------+         e -->
+--                            \                       /
+--                             \                     /
+--                              +-- Mul(-1) --------+
 
---                     +--> c ----> e --+
---                    /            /     \
---                   /            /       \
---  input --> a --> b ---> d ----+         g --> output
---                          \             /
---                           \           /
---                            +--> f ---+
+model = nn.DAG()
 
-a = nn.Linear(10, 10)
+a = nn.Linear(50, 10)
 b = nn.ReLU()
-c = nn.Linear(10, 3)
-d = nn.Linear(10, 3)
-e = nn.CMulTable()
-f = nn.Linear(3, 3)
-g = nn.CAddTable()
-
-----------------------------------------------------------------------
-
-model = nn.DAG()
+c = nn.Linear(10, 15)
+d = nn.CMulTable()
+e = nn.CAddTable()
 
 model:addEdge(a, b)
-model:addEdge(b, c)
-model:addEdge(b, d)
-model:addEdge(c, e)
+model:addEdge(b, nn.Linear(10, 15), nn.ReLU(), d)
 model:addEdge(d, e)
-model:addEdge(d, f)
-model:addEdge(e, g)
-model:addEdge(f, g)
+model:addEdge(b, c)
+model:addEdge(c, d)
+model:addEdge(c, nn.Mul(-1), e)
 
 model:setInput(a)
-model:setOutput(g)
-
-input = torch.Tensor(3, 10):uniform()
-
-print('******************************************************************')
-print('** updateOutput **************************************************')
-print('******************************************************************')
-
-output = model:updateOutput(input):clone()
-
-printTensorTable(output)
-
-print('******************************************************************')
-print('** updateGradInput ***********************************************')
-print('******************************************************************')
-
-gradInput = model:updateGradInput(input, output)
-
-printTensorTable(gradInput)
+model:setOutput(e)
 
-print('******************************************************************')
-print('** checkGrad *****************************************************')
-print('******************************************************************')
+local input = torch.Tensor(30, 50):uniform()
+local output = model:updateOutput(input):clone()
 
 output:uniform()