fix #5047 (#5048)

ssnl · soumith · commit 91efc30bfab5 · 2018-02-05T13:58:29.000-05:00
diff --git a/aten/src/TH/generic/THTensorMath.c b/aten/src/TH/generic/THTensorMath.c
@@ -2004,15 +2004,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;
@@ -2025,7 +2025,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
`@@ -2004,15 +2004,15 @@ void THTensor_(addmm)(THTensor r_, real beta, THTensor t, real alpha, THTensor`
`2004`	`2004`	`int64_t ldr__ = r__->stride[(transpose_r == 'n' ? 1 : 0)];`
`2005`	`2005`
`2006`	`2006`	`/* m1 */`
`2007`		`- /* Need ldm1_ >= max(1, (transpose_m1 == 't' ? m : k)) */`
	`2007`	`+ /* Need ldm1_ >= max(1, (transpose_m1 == 'n' ? m : k)) */`
`2008`	`2008`	`if(m1->stride[(transpose_r == 'n' ? 0 : 1)] == 1 &&`
`2009`		`- m1->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, k))`
	`2009`	`+ m1->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, m))`
`2010`	`2010`	`{`
`2011`	`2011`	`transpose_m1 = 'n';`
`2012`	`2012`	`m1_ = m1;`
`2013`	`2013`	`}`
`2014`	`2014`	`else if(m1->stride[(transpose_r == 'n' ? 1 : 0)] == 1 &&`
`2015`		`- m1->stride[(transpose_r == 'n' ? 0 : 1)] >= THMax(1, m))`
	`2015`	`+ m1->stride[(transpose_r == 'n' ? 0 : 1)] >= THMax(1, k))`
`2016`	`2016`	`{`
`2017`	`2017`	`transpose_m1 = 't';`
`2018`	`2018`	`m1_ = m1;`
`@@ -2025,7 +2025,7 @@ void THTensor_(addmm)(THTensor r_, real beta, THTensor t, real alpha, THTensor`
`2025`	`2025`	`}`
`2026`	`2026`
`2027`	`2027`	`/* m2 */`
`2028`		`- /* Need ldm2_ >= max(1, (transpose_m2 == 't' ? n : k)) */`
	`2028`	`+ /* Need ldm2_ >= max(1, (transpose_m2 == 'n' ? k : n)) */`
`2029`	`2029`	`if(m2->stride[(transpose_r == 'n' ? 0 : 1)] == 1 &&`
`2030`	`2030`	`m2->stride[(transpose_r == 'n' ? 1 : 0)] >= THMax(1, k))`
`2031`	`2031`	`{`