Initial commit for Jenkins

putraxor · Mar 21, 2016 · b4a8411 · b4a8411
1 parent 7c11384
commit b4a8411
Show file tree

Hide file tree

Showing 25 changed files with 1,561 additions and 911 deletions.
diff --git a/Source/CNTK/CNTK.cpp b/Source/CNTK/CNTK.cpp
@@ -728,6 +728,7 @@ int wmain(int argc, wchar_t* argv[]) // wmain wrapper that reports Win32 excepti
         else if (code == EXCEPTION_STACK_OVERFLOW)     msg = ": Stack overflow";
         else if (code == EXCEPTION_DLL_NOT_FOUND)      msg = ": Module not found";
         fprintf(stderr, "CNTK: Caught Win32 exception 0x%08x%s.\n", (unsigned int)code, msg);
+		Microsoft::MSR::CNTK::DebugUtil::PrintCallStack();
         fflush(stderr);
         exit(EXIT_FAILURE);
     }

diff --git a/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj b/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj
@@ -174,4 +174,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>
diff --git a/Source/ComputationNetworkLib/ComputationNode.h b/Source/ComputationNetworkLib/ComputationNode.h
@@ -1403,7 +1403,7 @@ class ComputationNode : public ComputationNodeBase // abstract class that cannot
     virtual void RequestMatricesBeforeForwardProp(MatrixPool& matrixPool) override
     {
         if (IsValueSharable())
-        RequestMatrixFromPool(m_value, matrixPool);
+			RequestMatrixFromPool(m_value, matrixPool);
         else
             CreateMatrixIfNull(m_value);
     }

diff --git a/Source/ComputationNetworkLib/InputAndParamNodes.h b/Source/ComputationNetworkLib/InputAndParamNodes.h
@@ -560,8 +560,13 @@ class LookupTableNode : public ComputationNode<ElemType>, public NumInputs<2>
         inputFunctionValues.Reshape(rows1 / wordsInEachSample, cols1 * wordsInEachSample);
         gradientValues.Reshape(rowsp / wordsInEachSample, colsp * wordsInEachSample);
 
+        gradientValues.HasNan("lookuptable node - backprop left - gradientValues");
+        inputFunctionValues.HasNan("lookuptable node - backprop left - inputFunctionValues");
+
         Matrix<ElemType>::MultiplyAndAdd(gradientValues, false, inputFunctionValues, true, inputGradientValues);
 
+        inputGradientValues.HasNan("lookuptable node - backprop left - inputGradientValues");
+
         inputFunctionValues.Reshape(rows1, cols1);
         gradientValues.Reshape(rowsp, colsp);
     }
@@ -575,8 +580,13 @@ class LookupTableNode : public ComputationNode<ElemType>, public NumInputs<2>
         inputGradientValues.Reshape(rows1 / wordsInEachSample, cols1 * wordsInEachSample);
         gradientValues.Reshape(rowsp / wordsInEachSample, colsp * wordsInEachSample);
 
+        gradientValues.HasNan("lookuptable node - backprop right - gradientValues");
+        inputFunctionValues.HasNan("lookuptable node - backprop right - inputFunctionValues");
+
         Matrix<ElemType>::MultiplyAndAdd(inputFunctionValues, true, gradientValues, false, inputGradientValues);
 
+        inputGradientValues.HasNan("lookuptable node - backprop right - inputGradientValues");
+
         inputGradientValues.Reshape(rows1, cols1);
         gradientValues.Reshape(rowsp, colsp);
     }

diff --git a/Source/ComputationNetworkLib/LinearAlgebraNodes.h b/Source/ComputationNetworkLib/LinearAlgebraNodes.h
@@ -1119,7 +1119,7 @@ class CosDistanceWithNegativeSamplesNode : public ComputationNode<ElemType>, pub
                     Matrix<ElemType>::ConductRowElementMultiplyWithShift(temp, in1, leftTerm, currshift, true);
                 }
 
-                leftTerm = leftTerm - rightTerm;
+                leftTerm -= rightTerm;
 
                 temp.GetARowByIndex(thisGradientValues, m);
 

diff --git a/Source/ComputationNetworkLib/TrainingNodes.h b/Source/ComputationNetworkLib/TrainingNodes.h
@@ -139,7 +139,8 @@ class CrossEntropyWithSoftmaxNode : public ComputationNodeNonLooping /*Computati
         if (inputIndex == 0) // left derivative
         {
 #if DUMPOUTPUT
-            *m_logSoftmaxOfRight.Print("CrossEntropyWithSoftmax Partial-logSoftmaxOfRight");
+            //(*m_logSoftmaxOfRight).Print("CrossEntropyWithSoftmax Partial-logSoftmaxOfRight");
+            (*(m_logSoftmaxOfRight.get())).Print("CrossEntropyWithSoftmax Partial-logSoftmaxOfRight");
             Gradient().Print("CrossEntropyWithSoftmax Partial-gradientValues");
             Input(0)->GradientFor(fr).Print("CrossEntropyWithSoftmaxNode Partial-Left-in");
 #endif
@@ -154,7 +155,8 @@ class CrossEntropyWithSoftmaxNode : public ComputationNodeNonLooping /*Computati
         else if (inputIndex == 1) // right derivative
         {
 #if DUMPOUTPUT
-            *m_softmaxOfRight.Print("CrossEntropyWithSoftmax Partial-softmaxOfRight");
+            //*m_softmaxOfRight.Print("CrossEntropyWithSoftmax Partial-softmaxOfRight");
+            (*(m_softmaxOfRight.get())).Print("CrossEntropyWithSoftmax Partial-softmaxOfRight");
             Input(0)->ValueFor(fr).Print("CrossEntropyWithSoftmax Partial-inputFunctionValues");
             Gradient().Print("CrossEntropyWithSoftmax Partial-gradientValues");
             Input(1)->GradientFor(fr).Print("CrossEntropyWithSoftmaxNode Partial-Right-in");
@@ -310,7 +312,7 @@ class CrossEntropyNode : public ComputationNodeNonLooping /*ComputationNode*/<El
         Value().AssignInnerProductOfMatrices(Input(0)->MaskedValueFor(fr), *m_logOfRight);
         Value() *= -1;
 #if NANCHECK
-        functionValues.HasNan("CrossEntropy");
+        Value().HasNan("CrossEntropy");
 #endif
     }