Refactor backends

include/glow/ExecutionEngine/ExecutionEngine.h

@@ -19,6 +19,11 @@ class Variable;
 class Tensor;
 class Value;
 
+enum class ExecutorKind {
+  Interpreter, // Execute the network with the built-in interpreter.
+  None,
+};
+
 /// This is the ExecutionEngine. It owns the Graph, the IR, and the backends.
 /// The Graph, Module, etc in this class are defined as pointers, in order to
 /// erase the type and prevent the internal types from leaking out to the
@@ -34,7 +39,7 @@ class ExecutionEngine final {
   Trainer trainer_{};
 
 public:
-  ExecutionEngine();
+  ExecutionEngine(ExecutorKind execKind = ExecutorKind::Interpreter);
 
   ~ExecutionEngine();
 

src/glow/Backends/CMakeLists.txt

@@ -0,0 +1,3 @@
+
+add_subdirectory(Interpreter)
+

src/glow/Interpreter/Interpreter.cpp → src/glow/Backends/Interpreter/Interpreter.cpp

@@ -1,6 +1,6 @@
 // Copyright 2017 Facebook Inc.  All Rights Reserved.
 
-#include "glow/Interpreter/Interpreter.h"
+#include "glow/Backends/Interpreter/Interpreter.h"
 #include "glow/Graph/Graph.h"
 #include "glow/Graph/Nodes.h"
 #include "glow/IR/Instrs.h"

src/glow/Interpreter/InterpreterNodes.cpp → src/glow/Backends/Interpreter/InterpreterNodes.cpp

@@ -1,7 +1,7 @@
 // Copyright 2017 Facebook Inc.  All Rights Reserved.
 
+#include "glow/Backends/Interpreter/Interpreter.h"
 #include "glow/IR/Instrs.h"
-#include "glow/Interpreter/Interpreter.h"
 
 #include "llvm/Support/Casting.h"
 

src/glow/CMakeLists.txt

@@ -1,10 +1,10 @@
 
+add_subdirectory(Backends)
 add_subdirectory(Base)
 add_subdirectory(ExecutionEngine)
 add_subdirectory(Graph)
 add_subdirectory(IR)
 add_subdirectory(Importer)
-add_subdirectory(Interpreter)
 add_subdirectory(Optimizer)
 add_subdirectory(Support)
 

src/glow/ExecutionEngine/ExecutionEngine.cpp

@@ -2,19 +2,29 @@
 
 #include "glow/ExecutionEngine/ExecutionEngine.h"
 
+#include "glow/Backends/Interpreter/Interpreter.h"
 #include "glow/Graph/Graph.h"
 #include "glow/IR/IR.h"
 #include "glow/IR/IRBuilder.h"
 #include "glow/IR/Instrs.h"
-#include "glow/Interpreter/Interpreter.h"
 #include "glow/Optimizer/Optimizer.h"
 
 using namespace glow;
 
-ExecutionEngine::ExecutionEngine() {
+ExecutionEngine::ExecutionEngine(ExecutorKind execKind) {
   G_ = std::unique_ptr<Graph>(new Graph());
   M_ = std::unique_ptr<Module>(new Module(&*G_));
-  IP_ = std::unique_ptr<Interpreter>(new Interpreter(&*M_));
+
+  switch (execKind) {
+  case ExecutorKind::Interpreter:
+    IP_ = std::unique_ptr<Interpreter>(new Interpreter(&*M_));
+    break;
+
+  default:
+    // Unknown execution backend.
+    glow_unreachable();
+    break;
+  }
 }
 
 ExecutionEngine::~ExecutionEngine() = default;