Fix shape inference when auto_pad is notset again (#1830)

liwchang · linkerzhang · commit 96c58ceeacf0 · 2019-02-28T16:24:58.000-08:00
Treat auto_pad notset as no auto_pad,
since our newest Modelzoo onnx models still make auto_pad notset instead of removing it.
diff --git a/onnx/defs/nn/defs.cc b/onnx/defs/nn/defs.cc
@@ -52,7 +52,8 @@ void convPoolTypeAndShapeInference(
   }
 
   // don't bother with legacy auto_pad for now
-  if (ctx.getAttribute("auto_pad")) {
+  const auto* auto_pad_attr = ctx.getAttribute("auto_pad");
+  if ((nullptr != auto_pad_attr) && (auto_pad_attr->s() != "NOTSET")) {
     return;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ void convPoolTypeAndShapeInference(`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// don't bother with legacy auto_pad for now`
`55`		`- if (ctx.getAttribute("auto_pad")) {`
	`55`	`+ const auto* auto_pad_attr = ctx.getAttribute("auto_pad");`
	`56`	`+ if ((nullptr != auto_pad_attr) && (auto_pad_attr->s() != "NOTSET")) {`
`56`	`57`	`return;`
`57`	`58`	`}`
`58`	`59`