fix pnnx crash on dynamic pads, do not eliminate upsample for dynamic…

… shape
Tencent · Jul 21, 2022 · e33c85c · e33c85c
1 parent 30ab31c
commit e33c85c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/tools/pnnx/src/pass_level5/eliminate_noop_pad.cpp b/tools/pnnx/src/pass_level5/eliminate_noop_pad.cpp
@@ -32,6 +32,9 @@ void eliminate_noop_pad(Graph& graph)
             if (op->type != "F.pad")
                 continue;
 
+            if (op->params.find("pad") == op->params.end())
+                continue;
+
             const std::vector<int>& pad = op->params.at("pad").ai;
 
             bool noop_pad = true;

diff --git a/tools/pnnx/src/pass_level5/eliminate_noop_upsample.cpp b/tools/pnnx/src/pass_level5/eliminate_noop_upsample.cpp
@@ -66,6 +66,16 @@ void eliminate_noop_upsample(Graph& graph)
             if (!op->inputs[0]->shape.empty() && op->inputs[0]->shape == op->outputs[0]->shape)
             {
                 matched = true;
+
+                // dynamic shape comparison always fail
+                for (auto s : op->inputs[0]->shape)
+                {
+                    if (s == -1)
+                    {
+                        matched = false;
+                        break;
+                    }
+                }
             }
 
             // delete noop-like upsample