[moco.tf] Introduce Optimizer (#4013)

This commit introduces Optimizer class and updates Frontend to invoke
this optimization after import.

This Optimizer will performs dedicated transforms on imported graphs,
but the current implementation serves just as a placeholder and has
no transforms yet.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/moco-tf/src/Frontend.cpp b/contrib/moco-tf/src/Frontend.cpp
index 6f38f65..66b1b20 100644 (file)
--- a/contrib/moco-tf/src/Frontend.cpp
+++ b/contrib/moco-tf/src/Frontend.cpp
@@ -17,6 +17,7 @@
 #include <moco/tf/Frontend.h>
 
 #include "Import.h"
+#include "Optimizer.h"
 
 #include "Transforms.h"
 
@@ -153,6 +154,11 @@ std::unique_ptr<loco::Graph> Frontend::import(const ModelSignature &signature,
 
   auto graph = import.load(signature, tf_graph_def);
 
+  // Optimize imported loco::Graph
+  Optimizer optimizer;
+
+  optimizer.optimize(graph.get());
+
   return std::move(graph);
 }
 

diff --git a/contrib/moco-tf/src/Optimizer.cpp b/contrib/moco-tf/src/Optimizer.cpp
new file mode 100644 (file)
index 0000000..62e5880
--- /dev/null
+++ b/contrib/moco-tf/src/Optimizer.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Optimizer.h"
+
+#include "Phase.h"
+
+namespace moco
+{
+namespace tf
+{
+
+void Optimizer::optimize(loco::Graph *g) const
+{
+  moco::tf::Phase phase;
+
+  /* TRANSFORM DECLARATION BEGIN */
+
+  /* TRANSFORM DECLARATION END */
+
+  moco::tf::PhaseRunner<moco::tf::PhaseStrategy::Saturate> phase_runner{g};
+  phase_runner.run(phase);
+}
+
+} // namespace tf
+} // namespace moco

diff --git a/contrib/moco-tf/src/Optimizer.h b/contrib/moco-tf/src/Optimizer.h
new file mode 100644 (file)
index 0000000..8584df8
--- /dev/null
+++ b/contrib/moco-tf/src/Optimizer.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __OPTIMIZER_H__
+#define __OPTIMIZER_H__
+
+#include <loco.h>
+
+namespace moco
+{
+namespace tf
+{
+
+class Optimizer final
+{
+public:
+  void optimize(loco::Graph *) const;
+};
+
+} // namespace tf
+} // namespace moco
+
+#endif // __OPTIMIZER_H__

diff --git a/contrib/moco-tf/src/Optimizer.test.cpp b/contrib/moco-tf/src/Optimizer.test.cpp
new file mode 100644 (file)
index 0000000..5879af4
--- /dev/null
+++ b/contrib/moco-tf/src/Optimizer.test.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Optimizer.h"
+
+#include <loco.h>
+
+#include <gtest/gtest.h>
+
+// Optimizer SHOULD NOT crash even though a given graph is empty
+TEST(Optimizer, empty_graph)
+{
+  moco::tf::Optimizer o;
+
+  loco::Graph g;
+
+  o.optimize(&g);
+
+  SUCCEED();
+}