From f834ffd3ee81bed9f527bcb5afd5ac8b468712ce Mon Sep 17 00:00:00 2001
From: nihuini <nihuini@tencent.com>
Date: Tue, 26 Sep 2017 16:45:43 +0800
Subject: [PATCH] Max and Maximum can be Reduction

---
 tools/tensorflow/tensorflow2ncnn.cpp | 39 ++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/tools/tensorflow/tensorflow2ncnn.cpp b/tools/tensorflow/tensorflow2ncnn.cpp
index 669316d7e..4cf5ed583 100644
--- a/tools/tensorflow/tensorflow2ncnn.cpp
+++ b/tools/tensorflow/tensorflow2ncnn.cpp
@@ -169,21 +169,38 @@ int main(int argc, char** argv)
             weights[output_name] = tensorflow::TensorProto();
             continue;
         }
-        else if (node.op() == "Add" || node.op() == "BiasAdd"
-            || node.op() == "Max" || node.op() == "Maximum" || node.op() == "Mul"
-            || node.op() == "RealDiv" || node.op() == "Sub")
+        else
         {
-            // check weights
-            for (int j=0; j<node.input_size(); j++)
+            bool isBinaryOp = false;
+            if (node.op() == "Add" || node.op() == "BiasAdd"
+                || node.op() == "Mul" || node.op() == "RealDiv" || node.op() == "Sub")
+            {
+                isBinaryOp = true;
+            }
+            if (node.op() == "Max" || node.op() == "Maximum")
             {
-                const std::string& input_name = node.input(j);
+                // check weights
+                tensorflow::TensorProto tensor;
+                if (!find_tensor_proto(weights, node, tensor))
+                {
+                    isBinaryOp = true;
+                }
+            }
 
-                std::map<std::string, tensorflow::TensorProto>::iterator it = weights.find(input_name);
-                if (it != weights.end())
+            if (isBinaryOp)
+            {
+                // check weights
+                for (int j=0; j<node.input_size(); j++)
                 {
-                    // binary op with const, insert MemoryData layer and const blob
-                    binaryop_consts[input_name] = it->second;
-                    weights.erase(it);
+                    const std::string& input_name = node.input(j);
+
+                    std::map<std::string, tensorflow::TensorProto>::iterator it = weights.find(input_name);
+                    if (it != weights.end())
+                    {
+                        // binary op with const, insert MemoryData layer and const blob
+                        binaryop_consts[input_name] = it->second;
+                        weights.erase(it);
+                    }
                 }
             }
         }