Merge commit 'e5bac2dd2d69772938482c1431db1fc1efb64c6f'

soumith · soumith · commit a7f6b0ab4fa4 · 2017-07-03T20:41:28.000-04:00
diff --git a/torch/lib/TH/generic/THTensorMath.c b/torch/lib/TH/generic/THTensorMath.c
@@ -1346,6 +1346,7 @@ void THTensor_(addmm)(THTensor *r_, real beta, THTensor *t, real alpha, THTensor
     m2_ = THTensor_(newContiguous)(m2);
   }
 
+#pragma omp critical(blasgemm)
   /* do the operation */
   THBlas_(gemm)(transpose_m1,
                 transpose_m2,

Original file line number	Diff line number	Diff line change
`@@ -1346,6 +1346,7 @@ void THTensor_(addmm)(THTensor r_, real beta, THTensor t, real alpha, THTensor`
`1346`	`1346`	`m2_ = THTensor_(newContiguous)(m2);`
`1347`	`1347`	`}`
`1348`	`1348`
	`1349`	`+#pragma omp critical(blasgemm)`
`1349`	`1350`	`/* do the operation */`
`1350`	`1351`	`THBlas_(gemm)(transpose_m1,`
`1351`	`1352`	`transpose_m2,`