Skip to content

Commit

Permalink
Split off two separately-built libs from main CNTK project: CNTKCompu…
Browse files Browse the repository at this point in the history
…tationNetworkLib and CNTKSGDLib. These have their own directories now, and their include paths only include libs below (but not the CNTK project, for example), enforcing some modularization.

Changed some scalar numerical values from ElemType to double, where this distinction did not add value, for example for objective values, frame-error rates, and learning rates.

Lots of minor cleanup such as reducing header dependencies (e.g. Matrix.h), consistency of template<typename/class ElemType>, and moved some misplaced code to more appropriate places (e.g. LearnableParameter initializations).

Merge branch 'master' into fseide/netlib

Conflicts:
	MachineLearning/CNTK/CNTK.cpp
  • Loading branch information
frankseide committed Sep 8, 2015
2 parents c62c813 + 806e184 commit ab303a9
Show file tree
Hide file tree
Showing 6 changed files with 3,224 additions and 1,486 deletions.
10 changes: 4 additions & 6 deletions MachineLearning/CNTK/CNTK.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -732,15 +732,13 @@ void DoTrain(const ConfigParameters& config)

if (config.Exists("NDLNetworkBuilder"))
{
ConfigParameters config(config("NDLNetworkBuilder"));
//netBuilder = unique_ptr<IComputationNetBuilder<ElemType>>(static_cast<IComputationNetBuilder<ElemType>*>(new NDLBuilder<ElemType>(config)));
netBuilder = unique_ptr<IComputationNetBuilder<ElemType>>(new NDLBuilder<ElemType>(config));
ConfigParameters ndlNetworkBuilderConfig(config("NDLNetworkBuilder"));
netBuilder = unique_ptr<IComputationNetBuilder<ElemType>>(new NDLBuilder<ElemType>(ndlNetworkBuilderConfig));
}
else if (config.Exists("SimpleNetworkBuilder"))
{
ConfigParameters config(config("SimpleNetworkBuilder"));
//netBuilder = unique_ptr<IComputationNetBuilder<ElemType>>(static_cast<IComputationNetBuilder<ElemType>*>(new SimpleNetworkBuilder<ElemType>(config)));
netBuilder = unique_ptr<IComputationNetBuilder<ElemType>>(new SimpleNetworkBuilder<ElemType>(config));
ConfigParameters simpleNetworkBuilderConfig(config("SimpleNetworkBuilder"));
netBuilder = unique_ptr<IComputationNetBuilder<ElemType>>(new SimpleNetworkBuilder<ElemType>(simpleNetworkBuilderConfig));
}
else if (config.Exists("ExperimentalNetworkBuilder")) // for testing/early access to NDL extensions
{
Expand Down
Loading

0 comments on commit ab303a9

Please sign in to comment.