Fix convolution type mismatch error message (#5815)

zou3519 · soumith · commit ecffe53ef002 · 2018-03-15T15:44:06.000-04:00
diff --git a/aten/src/ATen/native/Convolution.cpp b/aten/src/ATen/native/Convolution.cpp
@@ -352,12 +352,12 @@ at::Tensor _convolution(
 #if AT_CUDNN_ENABLED()
     if (input.type() != weight.type()){
       std::stringstream ss;
-      ss << "Input type (" << input.toString() << ") and weight type (" << weight.toString() << ") should be the same";
+      ss << "Input type (" << input.type().toString() << ") and weight type (" << weight.type().toString() << ") should be the same";
       throw std::runtime_error(ss.str());
     }
     if (bias.defined() && input.type() != bias.type()){
       std::stringstream ss;
-      ss << "Input type (" << input.toString() << ") and bias type (" << bias.toString() << ") should be the same";
+      ss << "Input type (" << input.type().toString() << ") and bias type (" << bias.type().toString() << ") should be the same";
       throw std::runtime_error(ss.str());
     }
 
diff --git a/torch/csrc/Exceptions.cpp b/torch/csrc/Exceptions.cpp
@@ -32,6 +32,38 @@ std::string processErrorMsg(std::string str) {
 
   // Translate Aten types to their respective pytorch ones
   std::vector<std::pair<std::string, std::string>> changes {
+    {"Variable[SparseCUDAByteType]", "torch.cuda.sparse.ByteTensor"},
+    {"Variable[SparseCUDACharType]", "torch.cuda.sparse.CharTensor"},
+    {"Variable[SparseCUDADoubleType]", "torch.cuda.sparse.DoubleTensor"},
+    {"Variable[SparseCUDAFloatType]", "torch.cuda.sparse.FloatTensor"},
+    {"Variable[SparseCUDAIntType]", "torch.cuda.sparse.IntTensor"},
+    {"Variable[SparseCUDALongType]", "torch.cuda.sparse.LongTensor"},
+    {"Variable[SparseCUDAShortType]", "torch.cuda.sparse.ShortTensor"},
+    {"Variable[SparseCUDAHalfType]", "torch.cuda.sparse.HalfTensor"},
+    {"Variable[SparseCPUByteType]", "torch.sparse.ByteTensor"},
+    {"Variable[SparseCPUCharType]", "torch.sparse.CharTensor"},
+    {"Variable[SparseCPUDoubleType]", "torch.sparse.DoubleTensor"},
+    {"Variable[SparseCPUFloatType]", "torch.sparse.FloatTensor"},
+    {"Variable[SparseCPUIntType]", "torch.sparse.IntTensor"},
+    {"Variable[SparseCPULongType]", "torch.sparse.LongTensor"},
+    {"Variable[SparseCPUShortType]", "torch.sparse.ShortTensor"},
+    {"Variable[SparseCPUHalfType]", "torch.sparse.HalfTensor"},
+    {"Variable[CUDAByteType]", "torch.cuda.ByteTensor"},
+    {"Variable[CUDACharType]", "torch.cuda.CharTensor"},
+    {"Variable[CUDADoubleType]", "torch.cuda.DoubleTensor"},
+    {"Variable[CUDAFloatType]", "torch.cuda.FloatTensor"},
+    {"Variable[CUDAIntType]", "torch.cuda.IntTensor"},
+    {"Variable[CUDALongType]", "torch.cuda.LongTensor"},
+    {"Variable[CUDAShortType]", "torch.cuda.ShortTensor"},
+    {"Variable[CUDAHalfType]", "torch.cuda.HalfTensor"},
+    {"Variable[CPUByteType]", "torch.ByteTensor"},
+    {"Variable[CPUCharType]", "torch.CharTensor"},
+    {"Variable[CPUDoubleType]", "torch.DoubleTensor"},
+    {"Variable[CPUFloatType]", "torch.FloatTensor"},
+    {"Variable[CPUIntType]", "torch.IntTensor"},
+    {"Variable[CPULongType]", "torch.LongTensor"},
+    {"Variable[CPUShortType]", "torch.ShortTensor"},
+    {"Variable[CPUHalfType]", "torch.HalfTensor"},
     {"SparseCUDAByteType", "torch.cuda.sparse.ByteTensor"},
     {"SparseCUDACharType", "torch.cuda.sparse.CharTensor"},
     {"SparseCUDADoubleType", "torch.cuda.sparse.DoubleTensor"},

Original file line number	Diff line number	Diff line change
`@@ -352,12 +352,12 @@ at::Tensor _convolution(`
`352`	`352`	`#if AT_CUDNN_ENABLED()`
`353`	`353`	`if (input.type() != weight.type()){`
`354`	`354`	`std::stringstream ss;`
`355`		`- ss << "Input type (" << input.toString() << ") and weight type (" << weight.toString() << ") should be the same";`
	`355`	`+ ss << "Input type (" << input.type().toString() << ") and weight type (" << weight.type().toString() << ") should be the same";`
`356`	`356`	`throw std::runtime_error(ss.str());`
`357`	`357`	`}`
`358`	`358`	`if (bias.defined() && input.type() != bias.type()){`
`359`	`359`	`std::stringstream ss;`
`360`		`- ss << "Input type (" << input.toString() << ") and bias type (" << bias.toString() << ") should be the same";`
	`360`	`+ ss << "Input type (" << input.type().toString() << ") and bias type (" << bias.type().toString() << ") should be the same";`
`361`	`361`	`throw std::runtime_error(ss.str());`
`362`	`362`	`}`
`363`	`363`