accidentally removed SequenceWithSoftmaxNode, now back;

sorting of stuff in ComputationNodeBase, no code change
leepengyuv587 · Jan 23, 2016 · b29b352 · b29b352
1 parent b0bbc0c
commit b29b352
Show file tree

Hide file tree

Showing 4 changed files with 311 additions and 317 deletions.
diff --git a/Source/CNTK/BrainScript/ExperimentalNetworkBuilder.cpp b/Source/CNTK/BrainScript/ExperimentalNetworkBuilder.cpp
@@ -36,6 +36,7 @@ wstring computationNodes = // TODO: use actual TypeName() here? would first need
     L"LearnableParameter(rows, cols, needGradient = true, init = 'uniform'/*|fixedValue|gaussian|fromFile*/, initValueScale = 1, value = 0, initFromFilePath = '', initOnCPUOnly=true, randomSeed=-1, tag='') = new ComputationNode [ operation = 'LearnableParameter' ; shape = new TensorShape [ dims = (rows : cols) ] /*plus the function args*/ ]\n"
     L"Parameter = LearnableParameter // deprecated \n"
     L"ParameterTensor(dims, needGradient = true, init = 'uniform'/*|fixedValue|gaussian|fromFile*/, initValueScale = 1, value = 0, initFromFilePath = '', initOnCPUOnly=true, randomSeed=-1, tag='') = new ComputationNode [ operation = 'LearnableParameter' ; shape = new TensorShape [ /*dims*/ ] /*plus the function args*/ ]\n"
+    // TODO: ImageParameter?
     // ^^ already works; vv untested
     L"Input(dims, tag='feature') = new ComputationNode [ operation = 'InputValue' ; shape = new TensorShape [ /*dims*/ ] ; isImage = false /*plus the function args*/ ]\n" // note: naming a little inconsistent  // TODO: re-test after flag change
     L"SparseInput(dims, tag='feature') = new ComputationNode [ operation = 'SparseInputValue' ; shape = new TensorShape [ /*dims*/ ] ; isImage = false /*plus the function args*/ ]\n"

diff --git a/Source/ComputationNetworkLib/ComputationNetwork.cpp b/Source/ComputationNetworkLib/ComputationNetwork.cpp
@@ -860,6 +860,36 @@ void ComputationNetwork::PlotNetworkTopology(const wstring outputFile) //  [1/13
     DescribeNetworkUsingDot(arcs, outputFile);
 }
 
+// enumerate all arcs that can be reached starting from the current node's children
+// [in/out] visited record already visited nodes
+void ComputationNodeBase::EnumerateArcs(std::unordered_set<ComputationNodeBasePtr>& visited, std::list<ComputationArc>& arcs)
+{
+    std::list<ComputationNodeBasePtr> tovisit;
+
+    if (visited.find(shared_from_this()) == visited.end()) // only do when this node has not been visited before
+    {
+        tovisit.push_back(shared_from_this());
+
+        while (!tovisit.empty())
+        {
+            ComputationNodeBasePtr curNode = tovisit.front();
+            tovisit.pop_front();
+
+            if (visited.find(curNode) == visited.end())
+            {
+                for (size_t i = 0; i < curNode->m_inputs.size(); i++)
+                {
+                    arcs.push_back(ComputationArc(curNode, curNode->m_inputs[i]));
+
+                    if (visited.find(curNode->m_inputs[i]) == visited.end()) // this children has not been visited before
+                        tovisit.push_front(curNode->m_inputs[i]);            // going to visit each of the children
+                }
+                visited.insert(curNode);
+            }
+        }
+    }
+}
+
 // -----------------------------------------------------------------------
 // specialized operations
 // -----------------------------------------------------------------------

diff --git a/Source/ComputationNetworkLib/ComputationNetworkBuilder.cpp b/Source/ComputationNetworkLib/ComputationNetworkBuilder.cpp
@@ -76,6 +76,7 @@ static shared_ptr<ComputationNode<ElemType>> CreateStandardNode(const std::wstri
     else if (nodeType == OperationNameOf(RowRepeatNode))                        return New<RowRepeatNode<ElemType>>(forward<_Types>(_Args)...);
     else if (nodeType == OperationNameOf(RowSliceNode))                         return New<RowSliceNode<ElemType>>(forward<_Types>(_Args)...);
     else if (nodeType == OperationNameOf(RowStackNode))                         return New<RowStackNode<ElemType>>(forward<_Types>(_Args)...);
+    else if (nodeType == OperationNameOf(SequenceWithSoftmaxNode))              return New<SequenceWithSoftmaxNode<ElemType>>(forward<_Types>(_Args)...);
 #ifdef COMING_SOON
     else if (nodeType == OperationNameOf(SequenceDecoderNode))                  return New<SequenceDecoderNode<ElemType>>(forward<_Types>(_Args)...);
 #endif