jens/Rbm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- improved RnnStack

Browse Source 
- AStack: context doesn't belong o training data

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@827 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-01-18 14:27:39 +00:00
parent 17770f402c
commit 9a8ad70a0b
4 changed files with 99 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/RnnStack.cpp
+43 -16
View File
@@ -36,7 +36,7 @@ size_t RnnStack::numContext()
arma::mat RnnStack::v_to_vc(const arma::mat& v) const
{
arma::mat c = arma::zeros(v.n_rows, m_numContext);
return arma::join_rows(v, c);
return v_to_vc(v, c);
}
arma::mat RnnStack::v_to_vc(const arma::mat& v, const arma::mat& c) const
@@ -63,16 +63,18 @@ arma::mat RnnStack::vc_to_v(const arma::mat& vc) const
arma::mat RnnStack::trainingBatchFrom(size_t layerId, const arma::mat& batch)
{
arma::mat vc = batch;
Layer *pLayer = getLayer(0);
arma::mat c = arma::zeros(batch.n_rows, m_numContext);
arma::mat v = vc_to_v(batch);
arma::mat vc = v_to_vc(v, c);
while (pLayer)
{
if (layerId == pLayer->id())
{
break;
}
arma::mat c = pLayer->to_h_gibbs(vc);
arma::mat v = arma::shift(vc_to_v(vc), layerId, 1);
c = pLayer->to_h_gibbs(vc);
v = arma::shift(vc_to_v(vc), layerId, 1);
vc = v_to_vc(v, c);
pLayer = pLayer->next;
}
@@ -81,24 +83,49 @@ arma::mat RnnStack::trainingBatchFrom(size_t layerId, const arma::mat& batch)
void RnnStack::train(const arma::mat& batch, Rbm::IListener* pListener)
{
arma::mat thisBatch = batch;
Layer *pLayer = getLayer(0);
while (pLayer)
// thisBatch = {padding | batch}
int numTraining = batch.n_rows;
arma::mat padding = arma::zeros(getSeqLen()-1, batch.n_cols);
arma::mat batch_padded = arma::join_cols(padding, batch);
arma::mat c = arma::zeros(numTraining, m_numContext);
for (int i=0; i < getSeqLen(); i++)
{
thisBatch = trainingBatchFrom(pLayer->id(), thisBatch);
pLayer->train(thisBatch, pListener);
Layer *pLayer = getLayer(i);
int k = getSeqLen()-i-1;
arma::mat batch_shifted = batch_padded.rows(k, numTraining+k-1);
arma::mat vc = v_to_vc(batch_shifted, c);
pLayer->train(vc, pListener);
c = pLayer->to_h_gibbs(vc);
pLayer = pLayer->next;
}
}
void RnnStack::train(size_t layerId, const arma::mat& batch, Rbm::IListener* pListener)
{
arma::mat thisBatch = batch;
Layer *pLayer = getLayer(layerId);
if (pLayer)
{
thisBatch = trainingBatchFrom(pLayer->id(), batch);
pLayer->train(thisBatch, pListener);
}
}
arma::mat RnnStack::step_forward(arma::mat &state, const arma::mat& v_curr)
{
arma::mat c = arma::zeros(1, m_numContext);
arma::mat z = arma::zeros(arma::size(v_curr));
arma::mat r;
if (state.is_empty())
{
state = arma::zeros(getSeqLen(), v_curr.n_cols);
}
state = arma::shift(state, 1, 0);
state.row(0) = v_curr;
for (int j=0; j < getSeqLen(); j++)
{
Layer *pLayer = getLayer(j);
arma::mat v = arma::join_rows(state.row(j), z);
arma::mat vc = v_to_vc(v, c);
c = pLayer->to_h_gibbs(vc);
vc = pLayer->to_v_gibbs(c);
r = to_next(vc_to_v(vc));
}
return r;
}