- improved poet
- fixed time reversal in Rnn train and forward git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@834 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
+4
-3
@@ -66,13 +66,13 @@ void RnnStack::train(const arma::mat& batch, Rbm::IListener* pListener)
|
||||
// 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 batch_padded = arma::join_cols(batch, padding);
|
||||
arma::mat c = arma::zeros(numTraining, m_numContext);
|
||||
|
||||
for (int i=0; i < getSeqLen(); i++)
|
||||
{
|
||||
Layer *pLayer = getLayer(i);
|
||||
int k = getSeqLen()-i-1;
|
||||
int k = i;
|
||||
arma::mat batch_shifted = batch_padded.rows(k, numTraining+k-1);
|
||||
arma::mat vc = v_to_vc(batch_shifted, c);
|
||||
pLayer->train(vc, pListener);
|
||||
@@ -96,8 +96,9 @@ arma::mat RnnStack::step_forward(arma::mat &state, const arma::mat& v_curr)
|
||||
|
||||
for (int j=0; j < getSeqLen(); j++)
|
||||
{
|
||||
int k = getSeqLen()- j - 1;
|
||||
Layer *pLayer = getLayer(j);
|
||||
arma::mat v = arma::join_rows(z, state.row(j));
|
||||
arma::mat v = arma::join_rows(state.row(k), z);
|
||||
arma::mat vc = v_to_vc(v, c);
|
||||
pLayer->gibbs_vh(vc, c);
|
||||
|
||||
|
||||
@@ -159,31 +159,12 @@ int main()
|
||||
stack->loadTrainingBatch(".");
|
||||
arma::mat t_vc = stack->trainingBatch();
|
||||
|
||||
Rbm::Params params = stack->getLayer(0)->params();
|
||||
|
||||
#if DO_TRAINING
|
||||
int numGibbs = params.numGibbs;
|
||||
params.numGibbs = 1;
|
||||
stack->setParams(params);
|
||||
RbmListener listener;
|
||||
|
||||
// Phase 10
|
||||
params.numEpochs = 2000;
|
||||
stack->setParams(params);
|
||||
stack->train(t_vc, &listener);
|
||||
|
||||
#if 0
|
||||
// Phase 11
|
||||
params.numEpochs = 10000;
|
||||
stack->setParams(params);
|
||||
stack->train(t_vc, &listener);
|
||||
|
||||
// Phase 20
|
||||
params.numGibbs = numGibbs;
|
||||
stack->setParams(params);
|
||||
stack->train(t_vc, &listener);
|
||||
#endif
|
||||
|
||||
stack->saveWeights(".");
|
||||
stack->save(".");
|
||||
|
||||
@@ -207,9 +188,6 @@ int main()
|
||||
#endif
|
||||
|
||||
#if DO_FORWARD
|
||||
params.gibbsDoSampleHidden = false;
|
||||
params.gibbsDoSampleVisible = false;
|
||||
stack->setParams(params);
|
||||
arma::mat state;
|
||||
arma::mat curr;
|
||||
for (int i=0; i < t_vc.n_rows; i++)
|
||||
|
||||
Reference in New Issue
Block a user