add program optimize node

src/framework/paddle_mobile_object.h

@@ -25,7 +25,7 @@ namespace paddle_mobile {
 
     class PaddleMobileObject {
       public:
-        virtual inline const std::string &ToString() {
+        virtual std::string ToString() {
             char address[128] = {0};
             sprintf(address, "%p", this);
             return std::string(address);

src/framework/program-optimize/node.cpp

+/* Copyright (c) 2016 Baidu, Inc. All Rights Reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+==============================================================================*/
+
+#include <sstream>
+
+#include "node.h"
+
+namespace paddle_mobile {
+    namespace framework {
+        Node &Node::operator>(const Node &out) {
+            std::shared_ptr<Node> node = std::make_shared<Node>(Node(out));
+            outputs_.push_back(node);
+            return *node;
+        }
+
+        bool Node::operator==(const Node &in) {
+            if (in.type_ == this->type_) {
+                if (this->outputs_.size() == in.outputs_.size()) {
+                    for (int i = 0; i < outputs_.size(); ++i) {
+                        if (!(*outputs_[i] == *in.outputs_[i])) {
+                            return false;
+                        }
+                    }
+                } else {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+            return true;
+        }
+
+        std::string Node::ToString(std::string blank) const {
+            std::stringstream ss;
+            ss << type_ << ": \n";
+            for (int i = 0; i < outputs_.size(); ++i) {
+                ss << blank << outputs_[i]->ToString(blank + "    ") << "";
+            }
+            return ss.str();
+        }
+
+        std::string Node::ToString() const { return this->ToString("    "); }
+
+        Print &operator<<(Print &printer, const Node &node) {
+            printer << node.ToString();
+            return printer;
+        }
+    }
+}

src/framework/program-optimize/node.h

+/* Copyright (c) 2016 Baidu, Inc. All Rights Reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+==============================================================================*/
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "common/log.h"
+#include "framework/paddle_mobile_object.h"
+
+namespace paddle_mobile {
+    namespace framework {
+
+        class Node : PaddleMobileObject {
+          public:
+            Node(const std::string &type) : type_(type) {}
+
+            Node &operator>(const Node &out);
+            bool operator==(const Node &in);
+            std::string ToString() const;
+
+          private:
+            std::string ToString(std::string blank) const;
+            std::vector<std::shared_ptr<Node>> outputs_;
+            std::string type_;
+        };
+
+        Print &operator<<(Print &printer, const Node &node);
+    }
+}

src/framework/program-optimize/program_optimize.cpp

+/* Copyright (c) 2016 Baidu, Inc. All Rights Reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+==============================================================================*/
+
+#include "program_optimize.h"
+
+namespace paddle_mobile {
+    namespace framework {
+        std::shared_ptr<ProgramDesc> ProgramOptimize::Optimize() {}
+    }
+}

src/framework/program-optimize/program_optimize.h

+/* Copyright (c) 2016 Baidu, Inc. All Rights Reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+==============================================================================*/
+
+#pragma once
+
+#include "framework/program_desc.h"
+
+namespace paddle_mobile {
+    namespace framework {
+        class ProgramOptimize {
+          public:
+            ProgramOptimize(std::shared_ptr<ProgramDesc> ori_desc)
+                : ori_desc_(ori_desc) {}
+            std::shared_ptr<ProgramDesc> Optimize();
+
+          private:
+            std::shared_ptr<ProgramDesc> ori_desc_;
+        };
+    }
+} // namespace paddle_mobile

test/CMakeLists.txt

@@ -13,4 +13,9 @@ target_link_libraries(test-log paddle-mobile)
 
 # gen test log
 ADD_EXECUTABLE(test-load framework/test_load.cpp)
-target_link_libraries(test-load paddle-mobile)
\ No newline at end of file
+target_link_libraries(test-load paddle-mobile)
+
+
+# gen test log
+ADD_EXECUTABLE(test-optimize framework/test_optimize.cpp)
+target_link_libraries(test-optimize paddle-mobile)
\ No newline at end of file

test/framework/test_load.cpp

@@ -23,6 +23,6 @@ int main() {
 
     //../../../test/models/googlenet
     //../../../test/models/mobilenet
-    auto program = loader.Load(std::string("../../../test/models/mobilenet"));
+    auto program = loader.Load(std::string("../../../test/models/googlenet"));
     return 0;
 }
\ No newline at end of file

test/framework/test_optimize.cpp

+/* Copyright (c) 2016 Baidu, Inc. All Rights Reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+==============================================================================*/
+
+
+#include <iostream>
+#include "framework/program-optimize/node.h"
+
+using namespace paddle_mobile::framework;
+
+int main(){
+    Node node("conv");
+    node > Node("add") > Node("relu");
+
+
+    Node node1("conv");
+    node1 > Node("add") > Node("relu");
+
+    if (node == node1){
+        DLOG << "equal";
+    }
+
+    DLOG << "\n" << node1;
+//    DLOG << node;
+}

test/main.cpp

@@ -53,7 +53,7 @@ int main() {
 
     paddle_mobile::Loader<paddle_mobile::CPU> loader;
     auto program = loader.Load(std::string(
-        "../../test/models/image_classification_resnet.inference.model"));
+        "../../../test/models/image_classification_resnet.inference.model"));
 
     paddle_mobile::framework::Executor<paddle_mobile::CPU> executor(program);