X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dagnn.git;a=blobdiff_plain;f=test-dagnn.lua;h=38019565baf775c90bf40b47256c09b1caacaa5b;hp=53302fd810b1dcad950a74400ab2f678c04745e1;hb=2de7b6da5330f15b0aef73cdff7cae472c25b037;hpb=0a630b54355382dfa68c0f3d51729bad0b4c58e6

diff --git a/test-dagnn.lua b/test-dagnn.lua
index 53302fd..3801956 100755
--- a/test-dagnn.lua
+++ b/test-dagnn.lua
@@ -23,9 +23,8 @@ require 'torch'
 require 'nn'
 require 'dagnn'
 
--- torch.setnumthreads(params.nbThreads)
 torch.setdefaulttensortype('torch.DoubleTensor')
-torch.manualSeed(2)
+torch.manualSeed(1)
 
 function checkGrad(model, criterion, input, target)
    local params, gradParams = model:getParameters()
@@ -76,13 +75,13 @@ function printTensorTable(t)
    end
 end
 
---               +- Linear(10, 10) -> ReLU ---> d --+
---              /                              /     \
---             /                              /       \
---  --> a --> b -----------> c --------------+         e -->
---                            \                       /
---                             \                     /
---                              +-- Mul(-1) --------+
+--               +-- Linear(10, 10) --> ReLU --> d --+
+--              /                              /      \
+--             /                              /        \
+--  --> a --> b -----------> c --------------+          e -->
+--                            \                        /
+--                             \                      /
+--                              +----- Mul(-1) ------+
 
 model = nn.DAG()
 
@@ -92,12 +91,11 @@ c = nn.Linear(10, 15)
 d = nn.CMulTable()
 e = nn.CAddTable()
 
-model:addEdge(a, b)
-model:addEdge(b, nn.Linear(10, 15), nn.ReLU(), d)
-model:addEdge(d, e)
-model:addEdge(b, c)
-model:addEdge(c, d)
-model:addEdge(c, nn.Mul(-1), e)
+model:connect(a, b, c)
+model:connect(b, nn.Linear(10, 15), nn.ReLU(), d)
+model:connect(d, e)
+model:connect(c, d)
+model:connect(c, nn.Mul(-1), e)
 
 model:setInput(a)
 model:setOutput(e)
@@ -109,4 +107,5 @@ output:uniform()
 
 print('Error = ' .. checkGrad(model, nn.MSECriterion(), input, output))
 
-model:dot('/tmp/graph.dot')
+print('Writing /tmp/graph.dot')
+model:saveDot('/tmp/graph.dot')