fix #5047 (#5048)

ssnl · soumith · commit 29f897ea2f46 · 2018-02-07T09:18:47.000-08:00
diff --git a/torch/lib/TH/generic/THTensorMath.c b/torch/lib/TH/generic/THTensorMath.c
@@ -1489,15 +1489,15 @@ void THTensor_(addmm)(THTensor *r_, real beta, THTensor *t, real alpha, THTensor
   int64_t ldr__ = r__->stride[(transpose_r == 'n' ? 1 : 0)];
 
   /* m1 */
-  /* Need ldm1_ >= max(1, (transpose_m1 == 't' ? m : k)) */
+  /* Need ldm1_ >= max(1, (transpose_m1 == 'n' ? m : k)) */
   if(m1->stride[(transpose_r == 'n' ? 0 : 1)] == 1 &&
-     m1->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, k))
+     m1->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, m))
   {
     transpose_m1 = 'n';
     m1_ = m1;
   }
   else if(m1->stride[(transpose_r == 'n' ? 1 : 0)] == 1 &&
-          m1->stride[(transpose_r == 'n' ? 0 : 1)] >= THMax(1, m))
+          m1->stride[(transpose_r == 'n' ? 0 : 1)] >= THMax(1, k))
   {
     transpose_m1 = 't';
     m1_ = m1;
@@ -1510,7 +1510,7 @@ void THTensor_(addmm)(THTensor *r_, real beta, THTensor *t, real alpha, THTensor
   }
 
   /* m2 */
-  /* Need ldm2_ >= max(1, (transpose_m2 == 't' ? n : k)) */
+  /* Need ldm2_ >= max(1, (transpose_m2 == 'n' ? k : n)) */
   if(m2->stride[(transpose_r == 'n' ? 0 : 1)] == 1 &&
      m2->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, k))
   {

Original file line number	Diff line number	Diff line change
`@@ -1489,15 +1489,15 @@ void THTensor_(addmm)(THTensor r_, real beta, THTensor t, real alpha, THTensor`
`1489`	`1489`	`int64_t ldr__ = r__->stride[(transpose_r == 'n' ? 1 : 0)];`
`1490`	`1490`
`1491`	`1491`	`/* m1 */`
`1492`		`- /* Need ldm1_ >= max(1, (transpose_m1 == 't' ? m : k)) */`
	`1492`	`+ /* Need ldm1_ >= max(1, (transpose_m1 == 'n' ? m : k)) */`
`1493`	`1493`	`if(m1->stride[(transpose_r == 'n' ? 0 : 1)] == 1 &&`
`1494`		`- m1->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, k))`
	`1494`	`+ m1->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, m))`
`1495`	`1495`	`{`
`1496`	`1496`	`transpose_m1 = 'n';`
`1497`	`1497`	`m1_ = m1;`
`1498`	`1498`	`}`
`1499`	`1499`	`else if(m1->stride[(transpose_r == 'n' ? 1 : 0)] == 1 &&`
`1500`		`- m1->stride[(transpose_r == 'n' ? 0 : 1)] >= THMax(1, m))`
	`1500`	`+ m1->stride[(transpose_r == 'n' ? 0 : 1)] >= THMax(1, k))`
`1501`	`1501`	`{`
`1502`	`1502`	`transpose_m1 = 't';`
`1503`	`1503`	`m1_ = m1;`
`@@ -1510,7 +1510,7 @@ void THTensor_(addmm)(THTensor r_, real beta, THTensor t, real alpha, THTensor`
`1510`	`1510`	`}`
`1511`	`1511`
`1512`	`1512`	`/* m2 */`
`1513`		`- /* Need ldm2_ >= max(1, (transpose_m2 == 't' ? n : k)) */`
	`1513`	`+ /* Need ldm2_ >= max(1, (transpose_m2 == 'n' ? k : n)) */`
`1514`	`1514`	`if(m2->stride[(transpose_r == 'n' ? 0 : 1)] == 1 &&`
`1515`	`1515`	`m2->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, k))`
`1516`	`1516`	`{`