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
poet_2v_5s.prj
+12 -13
View File
@@ -6,8 +6,8 @@
{ {
"id" : 0, "id" : 0,
"name" : "Layer", "name" : "Layer",
"numContext" : 256, "numContext" : 8,
"numHidden" : 256, "numHidden" : 64,
"numVisibleX" : 37, "numVisibleX" : 37,
"numVisibleY" : 2, "numVisibleY" : 2,
"rbm" : "rbm" :
@@ -21,7 +21,7 @@
"learningRate" : 0.10000000000000001, "learningRate" : 0.10000000000000001,
"miniBatchSize" : 1000, "miniBatchSize" : 1000,
"momentum" : 0.5, "momentum" : 0.5,
"numEpochs" : 1000, "numEpochs" : 10000,
"numGibbs" : 1, "numGibbs" : 1,
"weightDecay" : 0.0 "weightDecay" : 0.0
} }
@@ -30,8 +30,8 @@
{ {
"id" : 1, "id" : 1,
"name" : "Layer", "name" : "Layer",
"numContext" : 256, "numContext" : 64,
"numHidden" : 256, "numHidden" : 128,
"numVisibleX" : 37, "numVisibleX" : 37,
"numVisibleY" : 2, "numVisibleY" : 2,
"rbm" : "rbm" :
@@ -45,7 +45,7 @@
"learningRate" : 0.10000000000000001, "learningRate" : 0.10000000000000001,
"miniBatchSize" : 1000, "miniBatchSize" : 1000,
"momentum" : 0.5, "momentum" : 0.5,
"numEpochs" : 1000, "numEpochs" : 5000,
"numGibbs" : 1, "numGibbs" : 1,
"weightDecay" : 0.0 "weightDecay" : 0.0
} }
@@ -54,7 +54,7 @@
{ {
"id" : 2, "id" : 2,
"name" : "Layer", "name" : "Layer",
"numContext" : 256, "numContext" : 128,
"numHidden" : 256, "numHidden" : 256,
"numVisibleX" : 37, "numVisibleX" : 37,
"numVisibleY" : 2, "numVisibleY" : 2,
@@ -69,7 +69,7 @@
"learningRate" : 0.10000000000000001, "learningRate" : 0.10000000000000001,
"miniBatchSize" : 1000, "miniBatchSize" : 1000,
"momentum" : 0.5, "momentum" : 0.5,
"numEpochs" : 1000, "numEpochs" : 2500,
"numGibbs" : 1, "numGibbs" : 1,
"weightDecay" : 0.0 "weightDecay" : 0.0
} }
@@ -79,7 +79,7 @@
"id" : 3, "id" : 3,
"name" : "Layer", "name" : "Layer",
"numContext" : 256, "numContext" : 256,
"numHidden" : 256, "numHidden" : 512,
"numVisibleX" : 37, "numVisibleX" : 37,
"numVisibleY" : 2, "numVisibleY" : 2,
"rbm" : "rbm" :
@@ -93,7 +93,7 @@
"learningRate" : 0.10000000000000001, "learningRate" : 0.10000000000000001,
"miniBatchSize" : 1000, "miniBatchSize" : 1000,
"momentum" : 0.5, "momentum" : 0.5,
"numEpochs" : 1000, "numEpochs" : 2500,
"numGibbs" : 1, "numGibbs" : 1,
"weightDecay" : 0.0 "weightDecay" : 0.0
} }
@@ -102,8 +102,8 @@
{ {
"id" : 4, "id" : 4,
"name" : "Layer", "name" : "Layer",
"numContext" : 256, "numContext" : 512,
"numHidden" : 256, "numHidden" : 1024,
"numVisibleX" : 37, "numVisibleX" : 37,
"numVisibleY" : 2, "numVisibleY" : 2,
"rbm" : "rbm" :
@@ -125,7 +125,6 @@
} }
], ],
"name" : "poet_2v_5s", "name" : "poet_2v_5s",
"numContext" : 256,
"type" : 2, "type" : 2,
"type_string" : "Rnn" "type_string" : "Rnn"
} }
source/Layer.cpp
+5
View File
@@ -74,6 +74,11 @@ int Layer::numVisibleY()
return m_numVisibleY; return m_numVisibleY;
} }
int Layer::numContext()
{
return m_numContext;
}
Layer* Layer::root() Layer* Layer::root()
{ {
Layer *pLayer = this; Layer *pLayer = this;
source/Layer.hpp
+1 -1
View File
@@ -39,7 +39,7 @@ public:
std::string& name(); std::string& name();
int numVisibleX(); int numVisibleX();
int numVisibleY(); int numVisibleY();
const arma::mat& context() const; int numContext();
Layer *root(); Layer *root();
arma::mat vc_to_v(const arma::mat &vc) const; arma::mat vc_to_v(const arma::mat &vc) const;
source/RnnStack.cpp
+6 -29
View File
@@ -14,9 +14,8 @@
#include "RnnStack.hpp" #include "RnnStack.hpp"
#include "RnnTextHelper.hpp" #include "RnnTextHelper.hpp"
RnnStack::RnnStack(const std::string &name, size_t numContext) RnnStack::RnnStack(const std::string &name)
: AStack(StackType::Rnn, name) : AStack(StackType::Rnn, name)
, m_numContext(numContext)
{ {
} }
@@ -29,37 +28,15 @@ size_t RnnStack::getSeqLen()
return numLayers(); 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 arma::mat RnnStack::v_to_vc(const arma::mat& v, const arma::mat& c) const
{ {
return arma::join_rows(v, c); 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; size_t numVisible = vc.n_cols;
return vc.submat(0, 0, vc.n_rows - 1, numVisible - numContext - 1);
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);
} }
void RnnStack::train(const arma::mat& batch, Rbm::IListener* pListener) 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; int numTraining = batch.n_rows;
arma::mat padding = arma::zeros(getSeqLen()-1, batch.n_cols); arma::mat padding = arma::zeros(getSeqLen()-1, batch.n_cols);
arma::mat batch_padded = arma::join_cols(batch, padding); 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++) 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 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 z = arma::zeros(arma::size(v_curr));
arma::mat r; 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); arma::mat vc = v_to_vc(v, c);
pLayer->gibbs_vh(vc, c); pLayer->gibbs_vh(vc, c);
r = vc_to_v(vc); r = vc_to_v(vc, pLayer->numContext());
} }
return r; return r;
} }
source/RnnStack.hpp
+2 -6
View File
@@ -21,18 +21,15 @@ class RnnStack : public AStack
const size_t NUM_CODES = 37; const size_t NUM_CODES = 37;
public: public:
RnnStack(const std::string &name, size_t numContext); RnnStack(const std::string &name);
RnnStack(const RnnStack& orig) = delete; RnnStack(const RnnStack& orig) = delete;
virtual ~RnnStack(); virtual ~RnnStack();
void train(const arma::mat& batch, Rbm::IListener* pListener) override; void train(const arma::mat& batch, Rbm::IListener* pListener) override;
size_t getSeqLen(); size_t getSeqLen();
size_t numContext();
arma::mat v_to_vc(const arma::mat &v) const;
arma::mat v_to_vc(const arma::mat &v, const arma::mat &c) const; arma::mat v_to_vc(const arma::mat &v, const arma::mat &c) const;
arma::mat vc_to_v(const arma::mat &vc) const; arma::mat vc_to_v(const arma::mat &vc, size_t numContext) const;
arma::mat vc_to_c(const arma::mat &vc) const;
arma::mat step_forward(arma::mat &state, const arma::mat &v); arma::mat step_forward(arma::mat &state, const arma::mat &v);
@@ -76,7 +73,6 @@ public:
private: private:
size_t m_numContext;
}; };
#endif /* RNNSTACK_HPP */ #endif /* RNNSTACK_HPP */
source/StackCreator.cpp
+1 -3
View File
@@ -34,12 +34,11 @@ AStack* StackCreator::fromJson(Json::Value& project, LayerConstructor *pLayerCon
Json::Value &stack = project["stack"]; Json::Value &stack = project["stack"];
Json::Value &layers = project["stack"]["layers"]; Json::Value &layers = project["stack"]["layers"];
int type = stack["type"].asInt(); int type = stack["type"].asInt();
int numContext = stack["numContext"].asInt();
AStack *pStack = nullptr; AStack *pStack = nullptr;
if (type == AStack::StackType::Rnn) if (type == AStack::StackType::Rnn)
{ {
pStack = new RnnStack(name, numContext); pStack = new RnnStack(name);
} }
else else
{ {
@@ -95,7 +94,6 @@ bool StackCreator::toFile(AStack* pStack, const std::string& dir, const std::str
project["stack"]["name"] = name; project["stack"]["name"] = name;
project["stack"]["type_string"] = AStack::stackTypeStrings[pStack->type()]; project["stack"]["type_string"] = AStack::stackTypeStrings[pStack->type()];
project["stack"]["type"] = pStack->type(); project["stack"]["type"] = pStack->type();
project["stack"]["numContext"] = pStack->numContext();
Json::Value layers(Json::arrayValue); Json::Value layers(Json::arrayValue);
Layer *pLayer = pStack->getLayer(0); Layer *pLayer = pStack->getLayer(0);
source/poet.cpp
+9 -4
View File
@@ -36,7 +36,7 @@ class RbmListener : public Rbm::IListener
#define CREATE_TRAINING 0 #define CREATE_TRAINING 0
#define DO_TRAINING 0 #define DO_TRAINING 1
#define DO_FORWARD 1 #define DO_FORWARD 1
int main() int main()
@@ -51,13 +51,19 @@ int main()
RnnStack *stack = reinterpret_cast<RnnStack*>(StackCreator::fromFile(".", "poet_2v_5s")); RnnStack *stack = reinterpret_cast<RnnStack*>(StackCreator::fromFile(".", "poet_2v_5s"));
// Load weights // Load weights
stack->loadWeights("."); bool weight_loaded = stack->loadWeights(".");
// Load training // Load training
stack->loadTrainingBatch("."); stack->loadTrainingBatch(".");
arma::mat t_vc = stack->trainingBatch(); arma::mat t_vc = stack->trainingBatch();
bool do_training = not weight_loaded;
#if DO_TRAINING #if DO_TRAINING
do_training = true;
#endif
if (do_training)
{
RbmListener listener; RbmListener listener;
// Phase 10 // Phase 10
@@ -82,8 +88,7 @@ int main()
putchar(c); putchar(c);
} }
printf("\n"); printf("\n");
}
#endif
#if DO_FORWARD #if DO_FORWARD
arma::mat state; arma::mat state;