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

- refactored

Browse Source 
- create training one th e fly from file name

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@860 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-01-21 16:41:11 +00:00
parent 97c9dcce7c
commit e58593973d
4 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/poet.cpp
+17 -22
View File
@@ -42,21 +42,18 @@ class RbmListener : public Rbm::IListener
std::cout << "L1 = " << status.L1 << std::endl;
std::cout << "L2 = " << status.L2 << std::endl;
m_last_progress = status.progress;
forward(DEFAULT_START_WORD);
forward(DEFAULT_START_WORD, 100);
}
return true;
}
void forward(std::string const &start)
void forward(std::string const &start, size_t len)
{
RnnStack *stack = reinterpret_cast<RnnStack*>(&m_stack);
arma::mat state;
arma::mat curr;
arma::mat next;
std::string curr_str;
std::string next_str;
arma::mat t_vc = stack->trainingBatch();
for (int i=0; i < start.size(); i++)
{
@@ -68,7 +65,7 @@ class RbmListener : public Rbm::IListener
}
cout << "Start: " << curr_str << std::endl;
for (int i=stack->getSeqLen(); i < t_vc.n_rows; i++)
for (int i=stack->getSeqLen(); i < len; i++)
{
curr = next;
curr_str.append(1, Matutils::vec2char(curr));
@@ -110,23 +107,12 @@ int main(int argc, char *argv[])
}
}
if (command == Command::Create)
{
arma::mat batch = RnnTextHelper::createTraining("moby_ch1.txt", RnnTextHelper::SEQ_LENGTH);
batch.save("poet2.training.dat", arma::arma_ascii);
return 0;
}
// Load project
RnnStack *stack = reinterpret_cast<RnnStack*>(StackCreator::fromFile(".", "poet_2v_5s"));
// Load weights
stack->loadWeights(".");
// Load training
stack->loadTrainingBatch(".");
arma::mat t_vc = stack->trainingBatch();
RbmListener listener(*stack);
if (command == Command::Reset)
@@ -137,22 +123,31 @@ int main(int argc, char *argv[])
if (command == Command::Train)
{
arma::mat batch;
if (argv[2] != nullptr)
{
batch = RnnTextHelper::createTraining(argv[2], RnnTextHelper::SEQ_LENGTH);
}
else
{
batch = RnnTextHelper::createTraining("batch1.txt", RnnTextHelper::SEQ_LENGTH);
}
// Phase 10
stack->train(t_vc, &listener);
stack->train(batch, &listener);
stack->saveWeights(".");
#if DO_SAVE_PROJECT_AFTER_TRAINING
stack->save(".");
#endif
printf("Curr\n");
for (int i=0; i < t_vc.n_rows; i++)
for (int i=0; i < batch.n_rows; i++)
{
arma::mat curr = stack->to_curr(t_vc.row(i));
arma::mat curr = stack->to_curr(batch.row(i));
char c = Matutils::vec2char(curr);
putchar(c);
}
printf("\n");
command = Command::Forward;
}
if (command == Command::Forward)
@@ -163,7 +158,7 @@ int main(int argc, char *argv[])
{
start = std::string(argv[2]);
}
listener.forward(start);
listener.forward(start, 100);
}
printf("\nEnd of program\n");
return 0;