X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dagnn.git;a=blobdiff_plain;f=dagnn.lua;h=5921c05da410a041186e8cd8806046b4673fd027;hp=14cd5821c2064ac74b50dde101449d10d8f2274e;hb=84b07c45eb8a2785a81cad7bcf6fadbac0d63f8f;hpb=fe54a7c5c8425ee9783d82e16a42924e23add457

diff --git a/dagnn.lua b/dagnn.lua
index 14cd582..5921c05 100755
--- a/dagnn.lua
+++ b/dagnn.lua
@@ -26,10 +26,10 @@ local DAG, parent = torch.class('nn.DAG', 'nn.Container')
 function DAG:__init()
    parent.__init(self)
    -- Nodes are indexed by the module they contain
-   self.node = { }
+   self.node = {}
 end
 
--- Apply f on t recursively; use the corresponding element from args
+-- Apply f on t recursively; use the corresponding elements from args
 -- (i.e. same keys) as second parameter to f when available; return
 -- the results from f, organized in a similarly nested table.
 function DAG:nestedApply(f, t, args)
@@ -76,7 +76,7 @@ function DAG:putInOrder()
       end
    until nc == 0
 
-   self.sorted = { }
+   self.sorted = {}
    for m, d in pairs(distance) do
       table.insert(self.sorted, { distance = d, nnm = m })
    end
@@ -86,20 +86,39 @@ function DAG:putInOrder()
    for i, a in ipairs(self.sorted) do self.sorted[i] = a.nnm end
 end
 
-function DAG:computeGradOutput(gradInputSucc)
-   local gi
+-- 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.
+function DAG:nestedAccTensor(a, x, first)
+   if torch.type(x) == 'table' then
+      local b = {}
+      for i in pairs(x) do
+         b[i] = self:nestedAccTensor(a[i], x[i], first)
+      end
+      a = b
+   else
+      if first then
+         if a then
+            a:resizeAs(x):copy(x)
+         else
+            a = x:clone()
+         end
+      else
+         a:add(x)
+      end
+   end
+   return a
+end
+
+function DAG:updateGradOutput(node)
+   local gradInputSucc = node.gradInputSucc
    if #gradInputSucc == 1 then
-      gi = gradInputSucc[1] -- we avoid a clone()
+      node.gradOutput = gradInputSucc[1]
    elseif #gradInputSucc > 1 then
       for k = 1, #gradInputSucc do
-         if gi then
-            gi:add(gradInputSucc[k])
-         else
-            gi = gradInputSucc[k]:clone()
-         end
+         node.gradOutput = self:nestedAccTensor(node.gradOutput, gradInputSucc[k], k == 1)
       end
    end
-   return gi
 end
 
 ----------------------------------------------------------------------
@@ -127,7 +146,7 @@ function DAG:setInput(i)
             error('Input modules must have outgoing  edges.')
          end
          if #self.node[nnm].pred > 0 then
-            error('Input modules cannog have incoming edges.')
+            error('Input modules cannot have incoming edges.')
          end
       end,
       self.inputModules
@@ -167,20 +186,26 @@ function DAG:saveDot(filename)
 
    file:write('\n')
 
-   for nnma, node in pairs(self.node) do
+   for nnmb, node in pairs(self.node) do
       file:write(
          '  '
             .. node.index
-            .. ' [shape=box,label=\"' .. torch.type(nnma) .. '\"]'
+            .. ' [shape=box,label=\"' .. torch.type(nnmb) .. '\"]'
             .. '\n'
       )
 
-      for _, nnmb in pairs(node.succ) do
+      for i, nnma in pairs(node.pred) do
+         local decoration = ''
+         if #node.pred > 1 then
+            -- decoration = ' [headlabel=\"' .. i .. '\"]'
+            decoration = ' [label=\"' .. i .. '\"]'
+         end
          file:write(
             '  '
-               .. node.index
+               .. self.node[nnma].index
                .. ' -> '
                .. self.node[nnmb].index
+               .. decoration
                .. '\n'
          )
       end
@@ -199,9 +224,9 @@ function DAG:updateOutput(input)
 
    self:nestedApply(
       function(nnm, i)
-         self.node[nnm].input = i
-         -- nnm:updateOutput(i)
-         self:rethrowErrors(nnm, self.node[nnm].index, 'updateOutput', i)
+         local node = self.node[nnm]
+         node.input = i
+         self:rethrowErrors(nnm, node.index, 'updateOutput', i)
       end,
       self.inputModules,
       input
@@ -220,8 +245,7 @@ function DAG:updateOutput(input)
             end
          end
          node.input = i
-         -- nnm:updateOutput(i)
-         self:rethrowErrors(nnm, self.node[nnm].index, 'updateOutput', i)
+         self:rethrowErrors(nnm, node.index, 'updateOutput', i)
       end
    end
 
@@ -234,12 +258,13 @@ 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 DAG structure change before a DAG:updateGradInput')
 
    self:nestedApply(
       function(nnm, go)
-         -- nnm:updateGradInput(self.node[nnm].input, go)
-         self:rethrowErrors(nnm, self.node[nnm].index, 'updateGradInput', self.node[nnm].input, go)
+         local node = self.node[nnm]
+         node.gradOutput = go
+         self:rethrowErrors(nnm, node.index, 'updateGradInput', node.input, go)
       end,
       self.outputModules, gradOutput
    )
@@ -256,12 +281,11 @@ function DAG:updateGradInput(input, gradOutput)
    for k = #self.sorted, 1, -1 do
       local nnm = self.sorted[k]
       local node = self.node[nnm]
-      local pred, gradInputSucc = node.pred, node.gradInputSucc
+      local pred = node.pred
 
-      if #gradInputSucc > 0 then
-         node.gradOutput = self:computeGradOutput(gradInputSucc)
-         -- nnm:updateGradInput(node.input, node.gradOutput)
-         self:rethrowErrors(nnm, self.node[nnm].index, 'updateGradInput', node.input, node.gradOutput)
+      if #node.gradInputSucc > 0 then
+         self:updateGradOutput(node)
+         self:rethrowErrors(nnm, node.index, 'updateGradInput', node.input, node.gradOutput)
       end
 
       -- We fill the gradInputSucc of our predecessors
@@ -283,14 +307,31 @@ function DAG:updateGradInput(input, gradOutput)
 end
 
 function DAG:accGradParameters(input, gradOutput, scale)
-   scale = scale or 1
+   assert(self.sorted, 'There has been a DAG structure change before a DAG:accGradParameters')
 
-   assert(self.sorted, 'there has been a DAG structure change before a DAG:accGradParameters')
+   self:nestedApply(
+      function(nnm, go) self.node[nnm].gradOutput = go end,
+      self.outputModules, gradOutput
+   )
+
+   self:nestedApply(
+      function(nnm, i) self.node[nnm].input = i end,
+      self.inputModules, input
+   )
 
    for k = 1, #self.modules do
       local nnm = self.modules[k]
       local node = self.node[nnm]
-      -- nnm:accGradParameters(node.input, node.gradOutput, scale)
-      self:rethrowErrors(nnm, k, 'accGradParameters', node.input, self:computeGradOutput(node.gradInputSucc), scale)
+      self:rethrowErrors(nnm, k, 'accGradParameters', node.input, node.gradOutput, scale)
+   end
+end
+
+function DAG:clearState()
+   self.sorted = nil
+   for _, node in pairs(self.node) do
+      node.gradInputSucc = nil
+      node.input = nil
+      node.gradOutput = nil
    end
+   return parent.clearState(self)
 end