fix nits

Roy Li · Roy Li · commit b78ffe75f21a · 2018-03-06T17:29:25.000-08:00
diff --git a/aten/src/THNN/generic/VolumetricMaxUnpooling.c b/aten/src/THNN/generic/VolumetricMaxUnpooling.c
@@ -75,15 +75,16 @@ static void THNN_(VolumetricMaxUnpooling_updateOutput_frame)(
     real *input_p_k = input_p + k * iT * iH * iW;
     THIndex_t *ind_p_k = ind_p + k * iT * iH * iW;
 
-    int ti, i, j;
+    int t, i, j, index;
     THIndex_t maxp;
-    for (ti = 0; ti < iT; ti++)
+    for (t = 0; t < iT; t++)
     {
       for (i = 0; i < iH; i++)
       {
         for (j = 0; j < iW; j++)
         {
-          maxp = ind_p_k[ti * iH * iW + i * iW + j] - TH_INDEX_BASE;  /* retrieve position of max */
+          index = t * iH * iW + i * iW + j;
+          maxp = ind_p_k[index] - TH_INDEX_BASE;  /* retrieve position of max */
           if (maxp < 0 || maxp >= oT * oW * oH)
           {
 #pragma omp critical
@@ -92,7 +93,7 @@ static void THNN_(VolumetricMaxUnpooling_updateOutput_frame)(
               error_index = maxp;
             }
           } else {
-            output_p_k[maxp] = input_p_k[ti * iH * iW + i * iW + j]; /* update output */
+            output_p_k[maxp] = input_p_k[index]; /* update output */
           }
         }
       }
@@ -222,20 +223,21 @@ static void THNN_(VolumetricMaxUnpooling_updateGradInput_frame)(
     real *gradOutput_p_k = gradOutput_p + k * oT * oH * oW;
     THIndex_t *ind_p_k = ind_p + k * iT * iH * iW;
 
-    int ti, i, j;
+    int t, i, j, index;
     THIndex_t maxp;
-    for (ti = 0; ti < iT; ti++)
+    for (t = 0; t < iT; t++)
     {
       for (i = 0; i < iH; i++)
       {
         for (j = 0; j < iW; j++)
         {
-          maxp = ind_p_k[ti * iH * iW + i * iW  + j] - TH_INDEX_BASE;  /* retrieve position of max */
+          index = t * iH * iW + i * iW  + j;
+          maxp = ind_p_k[index] - TH_INDEX_BASE;  /* retrieve position of max */
           if (maxp < 0 || maxp >= oT * oH * oW)
           {
             THError("invalid max index %ld, oT= %d, oW= %d, oH= %d", maxp, oT, oW, oH);
           }
-          gradInput_p_k[ti * iH * iW + i * iW  + j] = gradOutput_p_k[maxp];  /* update gradient */
+          gradInput_p_k[index] = gradOutput_p_k[maxp];  /* update gradient */
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -75,15 +75,16 @@ static void THNN_(VolumetricMaxUnpooling_updateOutput_frame)(`
`75`	`75`	`real input_p_k = input_p + k iT * iH * iW;`
`76`	`76`	`THIndex_t ind_p_k = ind_p + k iT * iH * iW;`
`77`	`77`
`78`		`- int ti, i, j;`
	`78`	`+ int t, i, j, index;`
`79`	`79`	`THIndex_t maxp;`
`80`		`- for (ti = 0; ti < iT; ti++)`
	`80`	`+ for (t = 0; t < iT; t++)`
`81`	`81`	`{`
`82`	`82`	`for (i = 0; i < iH; i++)`
`83`	`83`	`{`
`84`	`84`	`for (j = 0; j < iW; j++)`
`85`	`85`	`{`
`86`		`- maxp = ind_p_k[ti * iH * iW + i * iW + j] - TH_INDEX_BASE; /* retrieve position of max */`
	`86`	`+ index = t * iH * iW + i * iW + j;`
	`87`	`+ maxp = ind_p_k[index] - TH_INDEX_BASE; /* retrieve position of max */`
`87`	`88`	`if (maxp < 0 \|\| maxp >= oT * oW * oH)`
`88`	`89`	`{`
`89`	`90`	`#pragma omp critical`
`@@ -92,7 +93,7 @@ static void THNN_(VolumetricMaxUnpooling_updateOutput_frame)(`
`92`	`93`	`error_index = maxp;`
`93`	`94`	`}`
`94`	`95`	`} else {`
`95`		`- output_p_k[maxp] = input_p_k[ti * iH * iW + i * iW + j]; /* update output */`
	`96`	`+ output_p_k[maxp] = input_p_k[index]; /* update output */`
`96`	`97`	`}`
`97`	`98`	`}`
`98`	`99`	`}`
`@@ -222,20 +223,21 @@ static void THNN_(VolumetricMaxUnpooling_updateGradInput_frame)(`
`222`	`223`	`real gradOutput_p_k = gradOutput_p + k oT * oH * oW;`
`223`	`224`	`THIndex_t ind_p_k = ind_p + k iT * iH * iW;`
`224`	`225`
`225`		`- int ti, i, j;`
	`226`	`+ int t, i, j, index;`
`226`	`227`	`THIndex_t maxp;`
`227`		`- for (ti = 0; ti < iT; ti++)`
	`228`	`+ for (t = 0; t < iT; t++)`
`228`	`229`	`{`
`229`	`230`	`for (i = 0; i < iH; i++)`
`230`	`231`	`{`
`231`	`232`	`for (j = 0; j < iW; j++)`
`232`	`233`	`{`
`233`		`- maxp = ind_p_k[ti * iH * iW + i * iW + j] - TH_INDEX_BASE; /* retrieve position of max */`
	`234`	`+ index = t * iH * iW + i * iW + j;`
	`235`	`+ maxp = ind_p_k[index] - TH_INDEX_BASE; /* retrieve position of max */`
`234`	`236`	`if (maxp < 0 \|\| maxp >= oT * oH * oW)`
`235`	`237`	`{`
`236`	`238`	`THError("invalid max index %ld, oT= %d, oW= %d, oH= %d", maxp, oT, oW, oH);`
`237`	`239`	`}`
`238`		`- gradInput_p_k[ti * iH * iW + i * iW + j] = gradOutput_p_k[maxp]; /* update gradient */`
	`240`	`+ gradInput_p_k[index] = gradOutput_p_k[maxp]; /* update gradient */`
`239`	`241`	`}`
`240`	`242`	`}`
`241`	`243`	`}`