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

- numcontext is property of Layer

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@844 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-01-19 16:05:23 +00:00
parent 2f3c10095a
commit 6a05a88d15
7 changed files with 60 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/RnnStack.cpp
+6 -29
View File
@@ -14,9 +14,8 @@
#include "RnnStack.hpp"
#include "RnnTextHelper.hpp"
RnnStack::RnnStack(const std::string &name, size_t numContext)
RnnStack::RnnStack(const std::string &name)
: AStack(StackType::Rnn, name)
, m_numContext(numContext)
{
}
@@ -29,37 +28,15 @@ size_t RnnStack::getSeqLen()
return numLayers();
}
size_t RnnStack::numContext()
{
return m_numContext;
}
arma::mat RnnStack::v_to_vc(const arma::mat& v) const
{
arma::mat c = arma::zeros(v.n_rows, m_numContext);
return v_to_vc(v, c);
}
arma::mat RnnStack::v_to_vc(const arma::mat& v, const arma::mat& c) const
{
return arma::join_rows(v, c);
}
arma::mat RnnStack::vc_to_c(const arma::mat& vc) const
arma::mat RnnStack::vc_to_v(const arma::mat& vc, size_t numContext) const
{
size_t numVisible = vc.n_cols;
if (m_numContext == 0)
{
return arma::mat(1, 0);
}
return vc.submat(0, numVisible - m_numContext, 0, numVisible - 1);
}
arma::mat RnnStack::vc_to_v(const arma::mat& vc) const
{
size_t numVisible = vc.n_cols;
return vc.submat(0, 0, vc.n_rows - 1, numVisible - m_numContext - 1);
return vc.submat(0, 0, vc.n_rows - 1, numVisible - numContext - 1);
}
void RnnStack::train(const arma::mat& batch, Rbm::IListener* pListener)
@@ -68,7 +45,7 @@ void RnnStack::train(const arma::mat& batch, Rbm::IListener* pListener)
int numTraining = batch.n_rows;
arma::mat padding = arma::zeros(getSeqLen()-1, batch.n_cols);
arma::mat batch_padded = arma::join_cols(batch, padding);
arma::mat c = arma::zeros(numTraining, m_numContext);
arma::mat c = arma::zeros(numTraining, getLayer(0)->numContext());
for (int i=0; i < getSeqLen(); i++)
{
@@ -84,7 +61,7 @@ void RnnStack::train(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);
arma::mat c = arma::zeros(1, getLayer(0)->numContext());
arma::mat z = arma::zeros(arma::size(v_curr));
arma::mat r;
@@ -103,7 +80,7 @@ arma::mat RnnStack::step_forward(arma::mat &state, const arma::mat& v_curr)
arma::mat vc = v_to_vc(v, c);
pLayer->gibbs_vh(vc, c);
r = vc_to_v(vc);
r = vc_to_v(vc, pLayer->numContext());
}
return r;
}