Skip to content

Commit

Permalink
made gcc happy
Browse files Browse the repository at this point in the history
  • Loading branch information
frankseide committed Nov 21, 2015
1 parent a01d4ec commit 38ca2aa
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions MachineLearning/CNTK/CNTK.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,11 @@ class BrainScriptNetworkBuilder : public IComputationNetBuilder<ElemType>
}
};

// TODO: decide where these should go. Also, do we need three variables?
extern wstring standardFunctions;
extern wstring commonMacros;
extern wstring computationNodes;

// helper that returns 'float' or 'double' depending on ElemType
template<class ElemType> static const wchar_t * ElemTypeName();
template<> /*static*/ const wchar_t * ElemTypeName<float>() { return L"float"; }
Expand Down Expand Up @@ -877,7 +882,7 @@ void DoTrain(const ConfigRecordType & config)
return shared_ptr<ComputationNetwork>(netBuilder->BuildNetworkFromDescription());
};
}
// legacy versions
// legacy NDL
else if (config.Exists(L"NDLNetworkBuilder"))
{
const ConfigRecordType & ndlNetworkBuilderConfig(config(L"NDLNetworkBuilder", ConfigRecordType::Record()));
Expand All @@ -887,7 +892,8 @@ void DoTrain(const ConfigRecordType & config)
return shared_ptr<ComputationNetwork>(netBuilder->BuildNetworkFromDescription());
};
}
else if (config.Exists(L"ExperimentalNetworkBuilder")) // for testing/early access to NDL extensions. Will go away once we fully integrate with BS.
// legacy test mode for BrainScript. Will go away once we fully integrate with BS.
else if (config.Exists(L"ExperimentalNetworkBuilder"))
{
// We interface with outer old CNTK config by taking the inner part, which we get as a string, as BrainScript.
// We prepend a few standard definitions, and also definition of deviceId and precision, which all objects will pull out again when they are being constructed.
Expand Down Expand Up @@ -1685,11 +1691,6 @@ static wstring PathToBSStringLiteral(const wstring & path) // quote a pathname
return L'"' + path + L'"';
}

// TODO: decide where these should go. Also, do we need three variables?
extern wstring standardFunctions;
extern wstring commonMacros;
extern wstring computationNodes;

int wmainWithBS(int argc, wchar_t* argv[]) // called from wmain which is a wrapper that catches & reports Win32 exceptions
{
vector<wstring> args(argv, argv+argc);
Expand Down

0 comments on commit 38ca2aa

Please sign in to comment.