initialize the member tensors of the first state in search

source/sample/transformer/T2TPredictor.h

@@ -134,7 +134,7 @@ public:
     ~T2TPredictor();
     ~T2TPredictor();
 
 
     /* create an initial state */
     /* create an initial state */
-    void Create(T2TModel * model, XTensor * top, T2TStateBundle * state);
+    void Create(T2TModel * model, XTensor * top, const XTensor * input, int beamSize, T2TStateBundle * state);
 
 
     /* read a state */
     /* read a state */
     void Read(T2TModel * model, T2TStateBundle * state);
     void Read(T2TModel * model, T2TStateBundle * state);

source/sample/transformer/T2TSearch.cpp

@@ -83,7 +83,7 @@ void T2TSearch::Search(T2TModel * model, XTensor * input, XTensor * padding, XTe
     T2TStateBundle * first = states;
     T2TStateBundle * first = states;
     
     
     /* create the first state */
     /* create the first state */
-    predictor.Create(model, &encoding, first);
+    predictor.Create(model, &encoding, input, beamSize, first);
 
 
     /* generate the sequence from left to right */
     /* generate the sequence from left to right */
     for(int i = 0 ; i < maxLength; i++){
     for(int i = 0 ; i < maxLength; i++){
@@ -136,7 +136,7 @@ void T2TSearch::Score(T2TStateBundle * prev, T2TStateBundle * beam)
 {
 {
     XTensor &score = beam->modelScore;
     XTensor &score = beam->modelScore;
     XTensor &prob = beam->prob;
     XTensor &prob = beam->prob;
-    XTensor &probPath = beam->probPath;
+    XTensor &probPathPrev = prev->probPath;
     XTensor &lenPrev = prev->nstep;
     XTensor &lenPrev = prev->nstep;
     XTensor &len = beam->nstep;
     XTensor &len = beam->nstep;
     XTensor lp;
     XTensor lp;
@@ -145,7 +145,7 @@ void T2TSearch::Score(T2TStateBundle * prev, T2TStateBundle * beam)
     InitTensor(&score, &prob);
     InitTensor(&score, &prob);
 
 
     /* the log-scale probability of the entire sequence */
     /* the log-scale probability of the entire sequence */
-    _Sum(&prob, &probPath, &score);
+    _Sum(&prob, &probPathPrev, &score);
 
 
     InitTensor(&len, &lenPrev);
     InitTensor(&len, &lenPrev);
     InitTensor(&lp, &lenPrev);
     InitTensor(&lp, &lenPrev);
@@ -181,6 +181,7 @@ void T2TSearch::Generate(T2TStateBundle * beam)
     XTensor &score = beam->modelScore;
     XTensor &score = beam->modelScore;
     XTensor &index = beam->prediction;
     XTensor &index = beam->prediction;
     XTensor &preID = beam->preID;
     XTensor &preID = beam->preID;
+    XTensor &probPath = beam->probPath;
     int order = score.order;
     int order = score.order;
 
 
     CheckNTErrors(order >= 2, "The tensor must be of order 2 or larger.");
     CheckNTErrors(order >= 2, "The tensor must be of order 2 or larger.");
@@ -230,6 +231,10 @@ void T2TSearch::Generate(T2TStateBundle * beam)
     /* we keep the top-k scores */
     /* we keep the top-k scores */
     InitTensor(&score, &scoreTopK);
     InitTensor(&score, &scoreTopK);
     CopyValues(scoreTopK, score);
     CopyValues(scoreTopK, score);
+
+    /* sequence probability of top-k candidates */
+    InitTensor(&probPath, &scoreTopK);
+    _Gather(&beam->prob, &probPath, probPath.order - 1, (int*)index.data, index.unitNum);
 }
 }
 
 
 /* 
 /* 

source/tensor/core/movement/Gather.cpp

@@ -34,8 +34,8 @@ gather indexed sub-tensors
 >> s - the source tensor
 >> s - the source tensor
 >> t - the target tensor
 >> t - the target tensor
 >> dim - the leading dimension to define "sub-tensors"
 >> dim - the leading dimension to define "sub-tensors"
-         e.g., for a tensor of size (3, 2, 4) and dim = 2, 
-         we have 4 sub-tensors of size (3, 2)
+         e.g., for a tensor of size (3, 2, 4) and dim = 0, 
+         we have 3 sub-tensors of size (2, 4)
 >> srcIndex - index of the source sub-tensors
 >> srcIndex - index of the source sub-tensors
 >> indexSize - length of srcIndex (and tgtIndex)
 >> indexSize - length of srcIndex (and tgtIndex)
 */
 */