X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dagnn.git;a=blobdiff_plain;f=dagnn.lua;h=b82398c0de429bd19875776fa465222a84504bbe;hp=cf452338f3749dded66500717117464ee6c82e70;hb=HEAD;hpb=3aaa833355075f2d27671761490214edfbe48255

diff --git a/dagnn.lua b/dagnn.lua
index cf45233..b82398c 100755
--- a/dagnn.lua
+++ b/dagnn.lua
@@ -61,10 +61,15 @@ function DAG:putInOrder()
    end
 
    local distance = {}
-   self:nestedApply(function(m) distance[m] = 1 end, self.inputModules)
+   self:nestedApply(
+      function(m) distance[m] = 1 end,
+      self.inputModules
+   )
 
    local nc
+   local nl = 0
    repeat
+      assert(nl < #self.modules, 'Cycle detected in the graph.')
       nc = 0
       for nnma, node in pairs(self.node) do
          for _, nnmb in pairs(node.succ) do
@@ -74,10 +79,11 @@ function DAG:putInOrder()
             end
          end
       end
+      nl = nl + 1
    until nc == 0
 
    for _, nnm in pairs(self.modules) do
-      assert(distance[nnm], 'Some modules are not connected to inputs')
+      assert(distance[nnm], 'Some modules are not connected to inputs.')
    end
 
    self.sorted = {}
@@ -90,9 +96,10 @@ function DAG:putInOrder()
    for i, a in ipairs(self.sorted) do self.sorted[i] = a.nnm end
 end
 
--- This accumulates x in a where they are both nested tables of
--- tensors. If first is true, set a = x. Behavior is undefined if a
--- and x do not have the exact same structure.
+-- This accumulates x in a, where they are both nested tables of
+-- tensors with same structures / keys. If first is true, set a = x
+-- (in which case a can be nil) otherwise a = a + x. The behavior is
+-- undefined if a and x do not have the exact same structure.
 function DAG:nestedAccTensor(a, x, first)
    if torch.type(x) == 'table' then
       local b = {}
@@ -141,6 +148,10 @@ function DAG:connect(...)
    end
 end
 
+function DAG:setLabel(nnm, label)
+   self.node[nnm].label = label
+end
+
 function DAG:setInput(i)
    self.sorted = nil
    self.inputModules = i
@@ -169,7 +180,11 @@ function DAG:print()
    self:putInOrder()
 
    for i, d in ipairs(self.sorted) do
-      print('#' .. i .. ' -> ' .. torch.type(d))
+      local decoration = ''
+      if self.node[d].label then
+         decoration = ' [' .. self.node[d].label .. ']'
+      end
+      print('#' .. i .. ' -> ' .. torch.type(d) .. decoration)
    end
 end
 
@@ -178,15 +193,33 @@ end
 function DAG:saveDot(filename)
    local file = (filename and io.open(filename, 'w')) or io.stdout
 
+   local function writeNestedCluster(prefix, list, indent)
+      local indent = indent or ''
+      if torch.type(list) == 'table' then
+         file:write(indent .. '  subgraph cluster_' .. prefix .. ' {\n');
+         for k, x in pairs(list) do
+            writeNestedCluster(prefix .. '_' .. k, x, '  ' .. indent)
+         end
+         file:write(indent .. '  }\n');
+      else
+         file:write(indent .. '  ' .. self.node[list].index .. ' [color=red]\n')
+      end
+   end
+
    file:write('digraph {\n')
 
    file:write('\n')
 
+   writeNestedCluster('input', self.inputModules)
+   writeNestedCluster('output', self.outputModules)
+
+   file:write('\n')
+
    for nnmb, node in pairs(self.node) do
       file:write(
          '  '
             .. node.index
-            .. ' [shape=box,label=\"' .. torch.type(nnmb) .. '\"]'
+            .. ' [shape=box,label=\"' .. (self.node[nnmb].label or torch.type(nnmb)) .. '\"]'
             .. '\n'
       )
 
@@ -230,14 +263,15 @@ function DAG:updateOutput(input)
 
    for _, nnm in ipairs(self.sorted) do
       local node = self.node[nnm]
-      if #node.pred > 0 then
+      local pred = node.pred
+      if #pred > 0 then
          local i
-         if #node.pred == 1 then
-            i = node.pred[1].output
-         elseif #node.pred > 1 then
+         if #pred == 1 then
+            i = pred[1].output
+         elseif #pred > 1 then
             i = {}
-            for k = 1, #node.pred do
-               i[k] = node.pred[k].output
+            for k = 1, #pred do
+               i[k] = pred[k].output
             end
          end
          node.input = i
@@ -254,7 +288,7 @@ function DAG:updateOutput(input)
 end
 
 function DAG:updateGradInput(input, gradOutput)
-   assert(self.sorted, 'There has been a DAG structure change before a DAG:updateGradInput')
+   assert(self.sorted, 'There has been a structure change before a DAG:updateGradInput.')
 
    self:nestedApply(
       function(nnm, go)
@@ -289,20 +323,23 @@ function DAG:updateGradInput(input, gradOutput)
          table.insert(self.node[pred[1]].gradInputSucc, nnm.gradInput)
       elseif #pred > 1 then
          assert(torch.type(nnm.gradInput) == 'table',
-                'Should have a table gradInput since it has multiple predecessors')
+                'Should have a table gradInput since it has multiple predecessors.')
          for n = 1, #pred do
-            table.insert(self.node[node.pred[n]].gradInputSucc, nnm.gradInput[n])
+            table.insert(self.node[pred[n]].gradInputSucc, nnm.gradInput[n])
          end
       end
    end
 
-   self.gradInput = self:nestedApply(function(m) return m.gradInput end, self.inputModules)
+   self.gradInput = self:nestedApply(
+      function(m) return m.gradInput end,
+      self.inputModules
+   )
 
    return self.gradInput
 end
 
 function DAG:accGradParameters(input, gradOutput, scale)
-   assert(self.sorted, 'There has been a DAG structure change before a DAG:accGradParameters')
+   assert(self.sorted, 'There has been a structure change before a DAG:accGradParameters.')
 
    self:nestedApply(
       function(nnm, go) self.node[nnm].gradOutput = go end,
@@ -324,8 +361,8 @@ end
 function DAG:clearState()
    self.sorted = nil
    for _, node in pairs(self.node) do
-      node.gradInputSucc = nil
       node.input = nil
+      node.gradInputSucc = nil
       node.gradOutput = nil
    end
    return parent.clearState(self)