Better error messages for blas ops with cuda.LongTensor (#4160)

zou3519 · ezyang · commit dac5e6568d7c · 2017-12-14T11:28:59.000-05:00
* Better error messages for blas ops with cuda.LongTensor Fixes #4157 Test plan Try matrix multiplying with cuda.LongTensors >>> import torch >>> x = torch.randn(4, 4).long().cuda() >>> y = torch.randn(4, 4).long().cuda() >>> x.mm(y) Traceback (most recent call last): File "<stdin>", line 1, in <module> RuntimeError: addmm for CUDA tensors only supports floating-point types. Try converting the tensors with .flo at() at /private/home/rzou/pytorch/pytorch/aten/src/THC/generic/THCTensorMathBlas.cu:381
diff --git a/aten/src/THC/generic/THCTensorMathBlas.cu b/aten/src/THC/generic/THCTensorMathBlas.cu
@@ -2,6 +2,9 @@
 #define THC_GENERIC_FILE "generic/THCTensorMathBlas.cu"
 #else
 
+#define ERROR_ONLY_FP_TYPES(func) \
+  THError("%s for CUDA tensors only supports floating-point types. Try converting the tensors with .float()", func);
+
 THC_API accreal
 THCTensor_(dot)(THCState *state, THCTensor *self, THCTensor *src)
 {
@@ -36,7 +39,7 @@ THCTensor_(dot)(THCState *state, THCTensor *self, THCTensor *src)
   return result;
 
 #else
-  THError("unimplemented data type");
+  ERROR_ONLY_FP_TYPES("dot");
   return ScalarConvert<int, accreal>::to(0);
 #endif
 }
@@ -128,7 +131,7 @@ THCTensor_(addmv)(THCState *state, THCTensor *r_, real beta, THCTensor *t, real
     THCTensor_(free)(state, tAsMatrix);
 #endif
 #else
-  THError("unimplemented data type");
+  ERROR_ONLY_FP_TYPES("addmv");
 #endif
 }
 
@@ -221,7 +224,7 @@ THCTensor_(addr)(THCState *state, THCTensor *r_, real beta, THCTensor *t, real a
   THCTensor_(free)(state, vec1M);
 #endif
 #else
-  THError("unimplemented data type");
+  ERROR_ONLY_FP_TYPES("addr");
 #endif
 }
 
@@ -375,7 +378,7 @@ THCTensor_(addmm)(THCState *state, THCTensor *r_, real beta, THCTensor *t, real
     THCTensor_(freeCopyTo)(state, r__, r_);
   }
 #else
-  THError("unimplemented data type");
+  ERROR_ONLY_FP_TYPES("addmm");
 #endif
 }
 
@@ -422,7 +425,7 @@ THCTensor_(addbmm)(THCState *state, THCTensor *result, real beta, THCTensor *t,
   THCTensor_(free)(state, slice1);
   THCTensor_(free)(state, slice2);
 #else
-  THError("unimplemented data type");
+  ERROR_ONLY_FP_TYPES("addbmm");
 #endif
 }
 
@@ -657,7 +660,7 @@ THCTensor_(baddbmm)(THCState *state, THCTensor *result, real beta, THCTensor *t,
   }
 
 #else
-  THError("unimplemented data type");
+  ERROR_ONLY_FP_TYPES("baddbmm");
 #endif
 }
 
@@ -758,7 +761,7 @@ THC_API void THCTensor_(btrifact)(THCState *state, THCTensor *ra_, THCudaIntTens
   }
 
 #else
-  THError("unimplemented data type");
+  THError("btrifact for CUDA tensors is only supported for floats and doubles");
 #endif
 }
 
@@ -877,7 +880,7 @@ THC_API void THCTensor_(btrisolve)(THCState *state, THCTensor *rb_, THCTensor *b
   }
 
 #else
-  THError("unimplemented data type");
+  THError("btrisolve for CUDA tensors is only supported for floats and doubles");
 #endif
 }
 
diff --git a/test/test_cuda.py b/test/test_cuda.py
@@ -402,7 +402,7 @@ def tmp(self):
             gpu_result = getattr(gpu_tensor, fn)(*gpu_args)
         except RuntimeError as e:
             reason = e.args[0]
-            if 'unimplemented data type' in reason:
+            if 'only supports floating-point types' in reason or 'unimplemented data type' in reason:
                 raise unittest.SkipTest('unimplemented data type')
             raise
         except AttributeError as e:

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`	`#define THC_GENERIC_FILE "generic/THCTensorMathBlas.cu"`
`3`	`3`	`#else`
`4`	`4`
	`5`	`+#define ERROR_ONLY_FP_TYPES(func) \`
	`6`	`+ THError("%s for CUDA tensors only supports floating-point types. Try converting the tensors with .float()", func);`
	`7`	`+`
`5`	`8`	`THC_API accreal`
`6`	`9`	`THCTensor_(dot)(THCState state, THCTensor self, THCTensor *src)`
`7`	`10`	`{`
`@@ -36,7 +39,7 @@ THCTensor_(dot)(THCState state, THCTensor self, THCTensor *src)`
`36`	`39`	`return result;`
`37`	`40`
`38`	`41`	`#else`
`39`		`- THError("unimplemented data type");`
	`42`	`+ ERROR_ONLY_FP_TYPES("dot");`
`40`	`43`	`return ScalarConvert<int, accreal>::to(0);`
`41`	`44`	`#endif`
`42`	`45`	`}`
`@@ -128,7 +131,7 @@ THCTensor_(addmv)(THCState state, THCTensor r_, real beta, THCTensor *t, real`
`128`	`131`	`THCTensor_(free)(state, tAsMatrix);`
`129`	`132`	`#endif`
`130`	`133`	`#else`
`131`		`- THError("unimplemented data type");`
	`134`	`+ ERROR_ONLY_FP_TYPES("addmv");`
`132`	`135`	`#endif`
`133`	`136`	`}`
`134`	`137`
`@@ -221,7 +224,7 @@ THCTensor_(addr)(THCState state, THCTensor r_, real beta, THCTensor *t, real a`
`221`	`224`	`THCTensor_(free)(state, vec1M);`
`222`	`225`	`#endif`
`223`	`226`	`#else`
`224`		`- THError("unimplemented data type");`
	`227`	`+ ERROR_ONLY_FP_TYPES("addr");`
`225`	`228`	`#endif`
`226`	`229`	`}`
`227`	`230`
`@@ -375,7 +378,7 @@ THCTensor_(addmm)(THCState state, THCTensor r_, real beta, THCTensor *t, real`
`375`	`378`	`THCTensor_(freeCopyTo)(state, r__, r_);`
`376`	`379`	`}`
`377`	`380`	`#else`
`378`		`- THError("unimplemented data type");`
	`381`	`+ ERROR_ONLY_FP_TYPES("addmm");`
`379`	`382`	`#endif`
`380`	`383`	`}`
`381`	`384`
`@@ -422,7 +425,7 @@ THCTensor_(addbmm)(THCState state, THCTensor result, real beta, THCTensor *t,`
`422`	`425`	`THCTensor_(free)(state, slice1);`
`423`	`426`	`THCTensor_(free)(state, slice2);`
`424`	`427`	`#else`
`425`		`- THError("unimplemented data type");`
	`428`	`+ ERROR_ONLY_FP_TYPES("addbmm");`
`426`	`429`	`#endif`
`427`	`430`	`}`
`428`	`431`
`@@ -657,7 +660,7 @@ THCTensor_(baddbmm)(THCState state, THCTensor result, real beta, THCTensor *t,`
`657`	`660`	`}`
`658`	`661`
`659`	`662`	`#else`
`660`		`- THError("unimplemented data type");`
	`663`	`+ ERROR_ONLY_FP_TYPES("baddbmm");`
`661`	`664`	`#endif`
`662`	`665`	`}`
`663`	`666`
`@@ -758,7 +761,7 @@ THC_API void THCTensor_(btrifact)(THCState state, THCTensor ra_, THCudaIntTens`
`758`	`761`	`}`
`759`	`762`
`760`	`763`	`#else`
`761`		`- THError("unimplemented data type");`
	`764`	`+ THError("btrifact for CUDA tensors is only supported for floats and doubles");`
`762`	`765`	`#endif`
`763`	`766`	`}`
`764`	`767`
`@@ -877,7 +880,7 @@ THC_API void THCTensor_(btrisolve)(THCState state, THCTensor rb_, THCTensor *b`
`877`	`880`	`}`
`878`	`881`
`879`	`882`	`#else`
`880`		`- THError("unimplemented data type");`
	`883`	`+ THError("btrisolve for CUDA tensors is only supported for floats and doubles");`
`881`	`884`	`#endif`
`882`	`885`	`}`
`883`	`886`