Eliminated NetworkBuilderFromConfig.cpp. Instead, the few surviving lines--the lines registering ComputationNode as a scriptable object--are now in ComputationNode.cpp;

fixed Linux Makefile after change of GPUMatrixCUDAKernels.cu to GPUMatrixCUDAKernels.cuh. It used to explicitly compile this in the GCC build, although it was included

MachineLearning/CNTKComputationNetworkLib/ComputationNode.cpp

@@ -8,6 +8,7 @@
 
 #include "ComputationNode.h"
 #include "InputAndParamNodes.h"
+#include "ComputationNetworkBuilder.h"  // TODO: We should only pull in NewComputationNodeFromConfig(). Nodes should not know about network at large.
 
 namespace Microsoft { namespace MSR { namespace CNTK {
 
@@ -151,7 +152,6 @@ namespace Microsoft { namespace MSR { namespace CNTK {
     // others
     // -----------------------------------------------------------------------
 
-#if 0   // temporarily moved to NetworkBuilderFromConfig.cpp to make it emit something, for BrainScript reorg
     template<class ElemType>
     /*virtual*/ void ComputationNode<ElemType>::DumpNodeInfo(const bool /*printValues*/, File& fstream) const
     {
@@ -169,7 +169,6 @@ namespace Microsoft { namespace MSR { namespace CNTK {
             fstream << wstring(L")");
         }
     }
-#endif
 
     // -----------------------------------------------------------------------
     // instantiate the core class templates
@@ -186,3 +185,19 @@ namespace Microsoft { namespace MSR { namespace CNTK {
     template class LearnableParameter<float>;
     template class LearnableParameter<double>;
 }}}
+
+namespace Microsoft { namespace MSR { namespace ScriptableObjects {
+
+    using namespace Microsoft::MSR::CNTK;
+
+    // -----------------------------------------------------------------------
+    // register ComputationNode with the ScriptableObject system
+    // -----------------------------------------------------------------------
+
+    template<> shared_ptr<Object> MakeRuntimeObject<ComputationNodeBase>(const IConfigRecordPtr configp)
+    {
+        return NewComputationNodeFromConfig(configp);
+    }
+
+    ScriptableObjects::ConfigurableRuntimeTypeRegister::Add<ComputationNodeBase> registerComputationNode(L"ComputationNode");
+}}}

MachineLearning/CNTKComputationNetworkLib/NetworkBuilderFromConfig.cpp

@@ -1,3 +1,4 @@
+#if 0   // This is no longer needed. Keeping it around for reference, but should simply be deleted after a few weeks.
 // NetworkBuilderFromConfig.cpp -- interface to node and network creation from glue languages through config record parameters  --fseide
 
 #define _CRT_SECURE_NO_WARNINGS     // "secure" CRT not available on all platforms  --add this at the top of all CPP files that give "function or variable may be unsafe" warnings
@@ -320,3 +321,4 @@ namespace Microsoft { namespace MSR { namespace CNTK {
         }
     }
 }}}
+#endif

Makefile

@@ -208,7 +208,6 @@ MATH_SRC =\
 ifdef CUDA_PATH
 MATH_SRC +=\
 	Math/Math/GPUMatrix.cu \
-	Math/Math/GPUMatrixCUDAKernels.cu \
 	Math/Math/GPUSparseMatrix.cu \
 	Math/Math/GPUWatcher.cu \
 	Math/Math/MatrixQuantizerGPU.cu \