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

- cleaned up

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@828 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-01-18 15:22:28 +00:00
parent 9a8ad70a0b
commit d6ea343d4a
6 changed files with 44 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/RnnStack.cpp
+4 -28
View File
@@ -61,26 +61,6 @@ arma::mat RnnStack::vc_to_v(const arma::mat& vc) const
return vc.submat(0, 0, vc.n_rows - 1, numVisible - m_numContext - 1);
}
arma::mat RnnStack::trainingBatchFrom(size_t layerId, const arma::mat& 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;
}
c = pLayer->to_h_gibbs(vc);
v = arma::shift(vc_to_v(vc), layerId, 1);
vc = v_to_vc(v, c);
pLayer = pLayer->next;
}
return vc;
}
void RnnStack::train(const arma::mat& batch, Rbm::IListener* pListener)
{
// thisBatch = {padding | batch}
@@ -101,10 +81,6 @@ void RnnStack::train(const arma::mat& batch, Rbm::IListener* pListener)
}
}
void RnnStack::train(size_t layerId, const arma::mat& batch, Rbm::IListener* pListener)
{
}
arma::mat RnnStack::step_forward(arma::mat &state, const arma::mat& v_curr)
{
arma::mat c = arma::zeros(1, m_numContext);
@@ -121,11 +97,11 @@ arma::mat RnnStack::step_forward(arma::mat &state, const arma::mat& 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 v = arma::join_rows(z, state.row(j));
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));
pLayer->gibbs_vh(vc, c);
r = vc_to_v(vc);
}
return r;
}