added RowElementTimes and ColumnElementTimes nodes.

Revoke back ElementTimes node to do element-wise multiplication since the implementation there for column element-wise multiplication is incorrect.
thanaphatp · Aug 5, 2015 · d62e5db · d62e5db
1 parent a0567f6
commit d62e5db
Show file tree

Hide file tree

Showing 55 changed files with 724 additions and 969 deletions.
diff --git a/CheckInSuites/SLU/Expected.log b/CheckInSuites/SLU/Expected.log
diff --git a/...InSuites/ASR/CPU/EvalSimpleNetwork.output → ...InSuites/ASR/CPU/EvalSimpleNetwork.output b/...InSuites/ASR/CPU/EvalSimpleNetwork.output → ...InSuites/ASR/CPU/EvalSimpleNetwork.output
diff --git a/...kInSuites/ASR/CPU/TrainAutoEncoder.output → ...kInSuites/ASR/CPU/TrainAutoEncoder.output b/...kInSuites/ASR/CPU/TrainAutoEncoder.output → ...kInSuites/ASR/CPU/TrainAutoEncoder.output
diff --git a/CheckInSuites/ASR/CPU/TrainMultiInput.output → ...ckInSuites/ASR/CPU/TrainMultiInput.output b/CheckInSuites/ASR/CPU/TrainMultiInput.output → ...ckInSuites/ASR/CPU/TrainMultiInput.output
diff --git a/CheckInSuites/ASR/CPU/TrainMultiTask.output → ...eckInSuites/ASR/CPU/TrainMultiTask.output b/CheckInSuites/ASR/CPU/TrainMultiTask.output → ...eckInSuites/ASR/CPU/TrainMultiTask.output
diff --git a/CheckInSuites/ASR/CPU/TrainNDLNetwork.output → ...ckInSuites/ASR/CPU/TrainNDLNetwork.output b/CheckInSuites/ASR/CPU/TrainNDLNetwork.output → ...ckInSuites/ASR/CPU/TrainNDLNetwork.output
diff --git a/...nSuites/ASR/CPU/TrainSimpleNetwork.output → ...nSuites/ASR/CPU/TrainSimpleNetwork.output b/...nSuites/ASR/CPU/TrainSimpleNetwork.output → ...nSuites/ASR/CPU/TrainSimpleNetwork.output
diff --git a/...InSuites/ASR/GPU/EvalSimpleNetwork.output → ...InSuites/ASR/GPU/EvalSimpleNetwork.output b/...InSuites/ASR/GPU/EvalSimpleNetwork.output → ...InSuites/ASR/GPU/EvalSimpleNetwork.output
diff --git a/...kInSuites/ASR/GPU/TrainAutoEncoder.output → ...kInSuites/ASR/GPU/TrainAutoEncoder.output b/...kInSuites/ASR/GPU/TrainAutoEncoder.output → ...kInSuites/ASR/GPU/TrainAutoEncoder.output
diff --git a/CheckInSuites/ASR/GPU/TrainMultiInput.output → ...ckInSuites/ASR/GPU/TrainMultiInput.output b/CheckInSuites/ASR/GPU/TrainMultiInput.output → ...ckInSuites/ASR/GPU/TrainMultiInput.output
diff --git a/CheckInSuites/ASR/GPU/TrainMultiTask.output → ...eckInSuites/ASR/GPU/TrainMultiTask.output b/CheckInSuites/ASR/GPU/TrainMultiTask.output → ...eckInSuites/ASR/GPU/TrainMultiTask.output
diff --git a/CheckInSuites/ASR/GPU/TrainNDLNetwork.output → ...ckInSuites/ASR/GPU/TrainNDLNetwork.output b/CheckInSuites/ASR/GPU/TrainNDLNetwork.output → ...ckInSuites/ASR/GPU/TrainNDLNetwork.output
diff --git a/...nSuites/ASR/GPU/TrainSimpleNetwork.output → ...nSuites/ASR/GPU/TrainSimpleNetwork.output b/...nSuites/ASR/GPU/TrainSimpleNetwork.output → ...nSuites/ASR/GPU/TrainSimpleNetwork.output
diff --git a/CheckInSuites/ASR/config/README.txt → Common/CheckInSuites/ASR/config/README.txt b/CheckInSuites/ASR/config/README.txt → Common/CheckInSuites/ASR/config/README.txt
diff --git a/...ASR/config/TIMIT_EvalSimpleNetwork.config → ...ASR/config/TIMIT_EvalSimpleNetwork.config b/...ASR/config/TIMIT_EvalSimpleNetwork.config → ...ASR/config/TIMIT_EvalSimpleNetwork.config
diff --git a/.../ASR/config/TIMIT_TrainAutoEncoder.config → .../ASR/config/TIMIT_TrainAutoEncoder.config b/.../ASR/config/TIMIT_TrainAutoEncoder.config → .../ASR/config/TIMIT_TrainAutoEncoder.config
diff --git a/...s/ASR/config/TIMIT_TrainMultiInput.config → ...s/ASR/config/TIMIT_TrainMultiInput.config b/...s/ASR/config/TIMIT_TrainMultiInput.config → ...s/ASR/config/TIMIT_TrainMultiInput.config
diff --git a/...es/ASR/config/TIMIT_TrainMultiTask.config → ...es/ASR/config/TIMIT_TrainMultiTask.config b/...es/ASR/config/TIMIT_TrainMultiTask.config → ...es/ASR/config/TIMIT_TrainMultiTask.config
diff --git a/...s/ASR/config/TIMIT_TrainNDLNetwork.config → ...s/ASR/config/TIMIT_TrainNDLNetwork.config b/...s/ASR/config/TIMIT_TrainNDLNetwork.config → ...s/ASR/config/TIMIT_TrainNDLNetwork.config
diff --git a/...SR/config/TIMIT_TrainSimpleNetwork.config → ...SR/config/TIMIT_TrainSimpleNetwork.config b/...SR/config/TIMIT_TrainSimpleNetwork.config → ...SR/config/TIMIT_TrainSimpleNetwork.config
diff --git a/...s/ASR/config/TIMIT_WriteBottleneck.config → ...s/ASR/config/TIMIT_WriteBottleneck.config b/...s/ASR/config/TIMIT_WriteBottleneck.config → ...s/ASR/config/TIMIT_WriteBottleneck.config
diff --git a/...SR/config/TIMIT_WriteScaledLogLike.config → ...SR/config/TIMIT_WriteScaledLogLike.config b/...SR/config/TIMIT_WriteScaledLogLike.config → ...SR/config/TIMIT_WriteScaledLogLike.config
diff --git a/CheckInSuites/ASR/config/globals.config → ...n/CheckInSuites/ASR/config/globals.config b/CheckInSuites/ASR/config/globals.config → ...n/CheckInSuites/ASR/config/globals.config
diff --git a/CheckInSuites/ASR/config/runall.bat → Common/CheckInSuites/ASR/config/runall.bat b/CheckInSuites/ASR/config/runall.bat → Common/CheckInSuites/ASR/config/runall.bat
diff --git a/CheckInSuites/ASR/config/select_cpu.config → ...heckInSuites/ASR/config/select_cpu.config b/CheckInSuites/ASR/config/select_cpu.config → ...heckInSuites/ASR/config/select_cpu.config
diff --git a/CheckInSuites/ASR/config/select_gpu.config → ...heckInSuites/ASR/config/select_gpu.config b/CheckInSuites/ASR/config/select_gpu.config → ...heckInSuites/ASR/config/select_gpu.config
diff --git a/CheckInSuites/CheckInSuites.vcxproj → Common/CheckInSuites/CheckInSuites.vcxproj b/CheckInSuites/CheckInSuites.vcxproj → Common/CheckInSuites/CheckInSuites.vcxproj
diff --git a/CheckInSuites/CheckInSuites.vcxproj.filters → ...eckInSuites/CheckInSuites.vcxproj.filters b/CheckInSuites/CheckInSuites.vcxproj.filters → ...eckInSuites/CheckInSuites.vcxproj.filters
diff --git a/...InSuites/LM/RNNLM/CPU/ExpectedOutputs.txt → ...InSuites/LM/RNNLM/CPU/ExpectedOutputs.txt b/...InSuites/LM/RNNLM/CPU/ExpectedOutputs.txt → ...InSuites/LM/RNNLM/CPU/ExpectedOutputs.txt
diff --git a/CheckInSuites/LM/RNNLM/CPU/global.config → .../CheckInSuites/LM/RNNLM/CPU/global.config b/CheckInSuites/LM/RNNLM/CPU/global.config → .../CheckInSuites/LM/RNNLM/CPU/global.config
diff --git a/CheckInSuites/LM/RNNLM/CPU/rnnlm.config → ...n/CheckInSuites/LM/RNNLM/CPU/rnnlm.config b/CheckInSuites/LM/RNNLM/CPU/rnnlm.config → ...n/CheckInSuites/LM/RNNLM/CPU/rnnlm.config
diff --git a/...InSuites/LM/RNNLM/GPU/ExpectedOutputs.txt → ...InSuites/LM/RNNLM/GPU/ExpectedOutputs.txt b/...InSuites/LM/RNNLM/GPU/ExpectedOutputs.txt → ...InSuites/LM/RNNLM/GPU/ExpectedOutputs.txt
diff --git a/CheckInSuites/LM/RNNLM/GPU/rnnlm.config → ...n/CheckInSuites/LM/RNNLM/GPU/rnnlm.config b/CheckInSuites/LM/RNNLM/GPU/rnnlm.config → ...n/CheckInSuites/LM/RNNLM/GPU/rnnlm.config
diff --git a/CheckInSuites/MNIST/CPU/expectedresults.txt → ...eckInSuites/MNIST/CPU/expectedresults.txt b/CheckInSuites/MNIST/CPU/expectedresults.txt → ...eckInSuites/MNIST/CPU/expectedresults.txt
diff --git a/CheckInSuites/MNIST/DefaultMacros.ndl → Common/CheckInSuites/MNIST/DefaultMacros.ndl b/CheckInSuites/MNIST/DefaultMacros.ndl → Common/CheckInSuites/MNIST/DefaultMacros.ndl
diff --git a/CheckInSuites/MNIST/Example.ndl → Common/CheckInSuites/MNIST/Example.ndl b/CheckInSuites/MNIST/Example.ndl → Common/CheckInSuites/MNIST/Example.ndl
diff --git a/CheckInSuites/MNIST/GPU/expectedresults.txt → ...eckInSuites/MNIST/GPU/expectedresults.txt b/CheckInSuites/MNIST/GPU/expectedresults.txt → ...eckInSuites/MNIST/GPU/expectedresults.txt
diff --git a/CheckInSuites/MNIST/mnistCheckIn.config → ...n/CheckInSuites/MNIST/mnistCheckIn.config b/CheckInSuites/MNIST/mnistCheckIn.config → ...n/CheckInSuites/MNIST/mnistCheckIn.config
diff --git a/CheckInSuites/MNIST/mnistlabels.txt → Common/CheckInSuites/MNIST/mnistlabels.txt b/CheckInSuites/MNIST/mnistlabels.txt → Common/CheckInSuites/MNIST/mnistlabels.txt
diff --git a/CheckInSuites/SLU/README.txt → Common/CheckInSuites/SLU/README.txt b/CheckInSuites/SLU/README.txt → Common/CheckInSuites/SLU/README.txt
diff --git a/CheckInSuites/SLU/atis.dev.IOB.simple → Common/CheckInSuites/SLU/atis.dev.IOB.simple b/CheckInSuites/SLU/atis.dev.IOB.simple → Common/CheckInSuites/SLU/atis.dev.IOB.simple
diff --git a/...U/atis.test.apos.pred.pos.head.IOB.simple → ...U/atis.test.apos.pred.pos.head.IOB.simple b/...U/atis.test.apos.pred.pos.head.IOB.simple → ...U/atis.test.apos.pred.pos.head.IOB.simple
diff --git a/.../atis.train.apos.pred.pos.head.IOB.simple → .../atis.train.apos.pred.pos.head.IOB.simple b/.../atis.train.apos.pred.pos.head.IOB.simple → .../atis.train.apos.pred.pos.head.IOB.simple
diff --git a/CheckInSuites/SLU/globals.config → Common/CheckInSuites/SLU/globals.config b/CheckInSuites/SLU/globals.config → Common/CheckInSuites/SLU/globals.config
diff --git a/CheckInSuites/SLU/input.txt → Common/CheckInSuites/SLU/input.txt b/CheckInSuites/SLU/input.txt → Common/CheckInSuites/SLU/input.txt
diff --git a/CheckInSuites/SLU/inputmap.txt → Common/CheckInSuites/SLU/inputmap.txt b/CheckInSuites/SLU/inputmap.txt → Common/CheckInSuites/SLU/inputmap.txt
diff --git a/CheckInSuites/SLU/lstmNDL.txt → Common/CheckInSuites/SLU/lstmNDL.txt b/CheckInSuites/SLU/lstmNDL.txt → Common/CheckInSuites/SLU/lstmNDL.txt
diff --git a/CheckInSuites/SLU/output.txt → Common/CheckInSuites/SLU/output.txt b/CheckInSuites/SLU/output.txt → Common/CheckInSuites/SLU/output.txt
diff --git a/CheckInSuites/SLU/rnnlu.config → Common/CheckInSuites/SLU/rnnlu.config b/CheckInSuites/SLU/rnnlu.config → Common/CheckInSuites/SLU/rnnlu.config
diff --git a/CheckInSuites/SLU/rnnlu.ndl.config → Common/CheckInSuites/SLU/rnnlu.ndl.config b/CheckInSuites/SLU/rnnlu.ndl.config → Common/CheckInSuites/SLU/rnnlu.ndl.config
diff --git a/CheckInSuites/runall.bat → Common/CheckInSuites/runall.bat b/CheckInSuites/runall.bat → Common/CheckInSuites/runall.bat
diff --git a/MachineLearning/CNTK/ComputationNetwork.h b/MachineLearning/CNTK/ComputationNetwork.h
@@ -1268,14 +1268,22 @@ class ComputationNetwork
         {
             newNode = new TransposeTimesNode<ElemType>(fstream, modelVersion, m_deviceId, nodeName);
         }
-                    else if (nodeType == StrideTimesNode<ElemType>::TypeName())
-                    {
-                        newNode = new StrideTimesNode<ElemType>(fstream, modelVersion, m_deviceId, nodeName);
-                    }
+        else if (nodeType == StrideTimesNode<ElemType>::TypeName())
+        {
+            newNode = new StrideTimesNode<ElemType>(fstream, modelVersion, m_deviceId, nodeName);
+        }
         else if (nodeType == ElementTimesNode<ElemType>::TypeName())
         {
             newNode = new ElementTimesNode<ElemType>(fstream, modelVersion, m_deviceId, nodeName);
         }
+        else if (nodeType == RowElementTimesNode<ElemType>::TypeName())
+        {
+            newNode = new RowElementTimesNode<ElemType>(fstream, modelVersion, m_deviceId, nodeName);
+        }
+        else if (nodeType == ColumnElementTimesNode<ElemType>::TypeName())
+        {
+            newNode = new ColumnElementTimesNode<ElemType>(fstream, modelVersion, m_deviceId, nodeName);
+        }
         else if (nodeType == DiagTimesNode<ElemType>::TypeName())
         {
             newNode = new DiagTimesNode<ElemType>(fstream, modelVersion, m_deviceId, nodeName);
@@ -1606,14 +1614,22 @@ class ComputationNetwork
         {
             newNode = new TransposeTimesNode<ElemType>(m_deviceId, nodeName);
         }
-                    else if (nodeType == StrideTimesNode<ElemType>::TypeName())
-                    {
-                        newNode = new StrideTimesNode<ElemType>(m_deviceId, nodeName);
-                    }
+        else if (nodeType == StrideTimesNode<ElemType>::TypeName())
+        {
+            newNode = new StrideTimesNode<ElemType>(m_deviceId, nodeName);
+        }
         else if (nodeType == ElementTimesNode<ElemType>::TypeName())
         {
             newNode = new ElementTimesNode<ElemType>(m_deviceId, nodeName);
         }
+        else if (nodeType == RowElementTimesNode<ElemType>::TypeName())
+        {
+            newNode = new RowElementTimesNode<ElemType>(m_deviceId, nodeName);
+        }
+        else if (nodeType == ColumnElementTimesNode<ElemType>::TypeName())
+        {
+            newNode = new ColumnElementTimesNode<ElemType>(m_deviceId, nodeName);
+        }
         else if (nodeType == DiagTimesNode<ElemType>::TypeName())
         {
             newNode = new DiagTimesNode<ElemType>(m_deviceId, nodeName);
@@ -2110,7 +2126,26 @@ class ComputationNetwork
         return newNode;
     }
 
-                ComputationNodePtr StrideTimes(const ComputationNodePtr a, const ComputationNodePtr b, const ComputationNodePtr c, const std::wstring nodeName = L"")
+    ComputationNodePtr RowElementTimes(const ComputationNodePtr a,
+        const ComputationNodePtr b,
+        const std::wstring nodeName = L"")
+    {
+        ComputationNodePtr newNode(new RowElementTimesNode<ElemType>(m_deviceId, nodeName));
+        newNode->AttachInputs(a, b);
+        AddNodeToNet(newNode);
+        return newNode;
+    }
+
+    ComputationNodePtr ColumnElementTimes(const ComputationNodePtr a,
+        const ComputationNodePtr b,
+        const std::wstring nodeName = L"")
+    {
+        ComputationNodePtr newNode(new ColumnElementTimesNode<ElemType>(m_deviceId, nodeName));
+        newNode->AttachInputs(a, b);
+        AddNodeToNet(newNode);
+        return newNode;
+    }
+    ComputationNodePtr StrideTimes(const ComputationNodePtr a, const ComputationNodePtr b, const ComputationNodePtr c, const std::wstring nodeName = L"")
                 {
                     ComputationNodePtr newNode(new StrideTimesNode<ElemType>(m_deviceId, nodeName));
                     newNode->AttachInputs(a, b, c);