debugging

source/sample/transformer/T2TPredictor.cpp

@@ -177,7 +177,7 @@ void T2TPredictor::Predict(T2TStateBundle * next, XTensor * encoding, XTensor *
     else{
         inputDec = GeneratePaths(s);
         inputDec.SetDevice(inputEnc->devID, inputEnc->mem);
-        inputDec = Concatenate(inputDec, first, inputDec.order - 1);
+        inputDec = Concatenate(first, inputDec, inputDec.order - 1);
     }
 
     /* prediction probabilities */
@@ -219,7 +219,6 @@ void T2TPredictor::Predict(T2TStateBundle * next, XTensor * encoding, XTensor *
     InitTensor1D(&selectTgt, 1, X_INT);
 
     selectSrc.SetInt(stride - 1, 0);
-
     selectTgt.SetInt(0, 0);
 
     selectSrc.SetDevice(decoding.devID, decoding.mem);

source/sample/transformer/T2TSearch.cpp

@@ -372,45 +372,47 @@ void T2TSearch::Expand(T2TStateBundle * prev, T2TStateBundle * beam)
     CheckNTErrors(beam->stateNum == id.unitNum, "Errors occur in counting!");
     
     /* Related variables are kept on the states of the graph. All these are 
-       maintained on CPUs to ease the implementation of requent access and 
+       maintained on CPUs to ease the implementation of frequent access and 
        modification of the states. An alternative is to do this on GPUs but 
        it needs much more coding work and the speed-up is not obvious. */
-    for(int i = 0; i < beam->stateNum; i++){
-        T2TState & state = states[i];
+    for(int i = 0; i < beam->stateNum; i += beamSize){
+        for(int j = 0; j < beamSize; j++){
+            T2TState & state = states[i + j];
 
-        int offset = id.GetInt(i);
-        T2TState * last = prev->states + offset;
+            int offset = id.GetInt(i + j);
+            T2TState * last = prev->states + i * beamSize + offset;
 
-        CheckNTErrors(offset >= 0, "Wrong state index!");
+            CheckNTErrors(offset >= 0, "Wrong state index!");
         
-        /* pointer to the previous state */
-        if (prev->isStart) {
-            state.last = NULL;
-            state.pid = i;
-            state.nstep = 0;
-        }
-        else{
-            state.last = last;
-            state.pid = state.last->pid;
-            state.nstep = last->nstep + 1;
-            CheckNTErrors(offset < prev->stateNum, "Wrong state index!");
-        }
+            /* pointer to the previous state */
+            if (prev->isStart) {
+                state.last = NULL;
+                state.pid = i;
+                state.nstep = 0;
+            }
+            else{
+                state.last = last;
+                state.pid = state.last->pid;
+                state.nstep = last->nstep + 1;
+                CheckNTErrors(offset < prev->stateNum, "Wrong state index!");
+            }
         
-        /* scores */
-        state.modelScore = modelScore.Get(i);
-        state.prob = prob.Get(i);
-        state.probPath = probPath.Get(i);
+            /* scores */
+            state.modelScore = modelScore.Get(i);
+            state.prob = prob.Get(i);
+            state.probPath = probPath.Get(i);
 
-        /* prediction */
-        state.prediction = prediction.GetInt(i);
+            /* prediction */
+            state.prediction = prediction.GetInt(i);
 
-        CheckNTErrors(state.prediction >= 0, "Illegal prediction!");
+            CheckNTErrors(state.prediction >= 0, "Illegal prediction!");
 
-        /* check if it is the end of the sequence */
-        state.isEnd = IsEnd(state.prediction);
+            /* check if it is the end of the sequence */
+            state.isEnd = IsEnd(state.prediction);
 
-        /* set the ending mark */
-        endMarkCPU.SetInt(state.isEnd, i);
+            /* set the ending mark */
+            endMarkCPU.SetInt(state.isEnd, i);
+        }
     }
 
     /* copy the ending mark from CPU to the target device */