Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into linux-gcc
Browse files Browse the repository at this point in the history
  • Loading branch information
chenguoguo committed Aug 4, 2015
2 parents 21d35a0 + 472bae7 commit ba103d5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions MachineLearning/CNTK/RecurrentNodes.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {

public:
PastValueNode(const DEVICEID_TYPE deviceId=AUTOPLACEMATRIX, const std::wstring name = L"")
: ComputationNode<ElemType>(deviceId), m_pastActivity(deviceId)
: ComputationNode<ElemType>(deviceId), m_pastActivity(deviceId), m_boundaryInfo(CPUDEVICE)
{
m_nodeName = (name == L""? CreateUniqNodeName() : name);
m_deviceId = deviceId;
Expand All @@ -47,7 +47,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
}

PastValueNode(File& fstream, const size_t modelVersion, const DEVICEID_TYPE deviceId=AUTOPLACEMATRIX, const std::wstring name = L"")
: ComputationNode<ElemType>(deviceId), m_pastActivity(deviceId)
: ComputationNode<ElemType>(deviceId), m_pastActivity(deviceId), m_boundaryInfo(CPUDEVICE)
{
m_nodeName = (name == L""? CreateUniqNodeName() : name);

Expand Down Expand Up @@ -439,7 +439,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {

public:
FutureValueNode(const DEVICEID_TYPE deviceId = AUTOPLACEMATRIX, const std::wstring name = L"")
: ComputationNode<ElemType>(deviceId), m_futureActivity(deviceId)
: ComputationNode<ElemType>(deviceId), m_futureActivity(deviceId),m_boundaryInfo(CPUDEVICE)
{
m_nodeName = (name == L"" ? CreateUniqNodeName() : name);
m_deviceId = deviceId;
Expand All @@ -453,7 +453,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
}

FutureValueNode(File& fstream, const size_t modelVersion, const DEVICEID_TYPE deviceId = AUTOPLACEMATRIX, const std::wstring name = L"")
: ComputationNode<ElemType>(deviceId), m_futureActivity(deviceId)
: ComputationNode<ElemType>(deviceId), m_futureActivity(deviceId), m_boundaryInfo(CPUDEVICE)
{
m_nodeName = (name == L"" ? CreateUniqNodeName() : name);

Expand Down

0 comments on commit ba103d5

Please sign in to comment.