[MLIR] Move MLIR to src/contrib/mlir (#16)

* Move MLIR to src/contrib/mlir

CMakeLists.txt

@@ -384,6 +384,7 @@ endif()
 
 if (NGRAPH_MLIR_ENABLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNGRAPH_MLIR_ENABLE")
+    set(NGRAPH_MLIR_SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/contrib/mlir)
 endif()
 
 if (NGRAPH_PLAIDML_ENABLE)

CODEOWNERS

@@ -42,7 +42,7 @@
 /src/ngraph/pattern/                @jbobba @aprocter
 /src/ngraph/runtime/                @rkimballn1 @jbobba
 /src/ngraph/runtime/cpu/            @jbobba
-/src/ngraph/runtime/mlir/           @nmostafa @dcaballe @jbobba
+/src/contrib/mlir/                  @nmostafa @dcaballe
 /src/ngraph/runtime/cpu/builder/allreduce.*pp    @wenzhe-nrv @jbobba @avijit-nervana
 /src/ngraph/runtime/dynamic/        @aprocter
 /src/ngraph/runtime/gpu/            @rkimballn1

src/CMakeLists.txt

@@ -20,6 +20,11 @@ include_directories(ngraph)
 
 add_subdirectory(resource)
 
+# This must be added before any backend that uses MLIR
+if (NGRAPH_MLIR_ENABLE)
+    add_subdirectory(${NGRAPH_MLIR_SOURCE_DIR})
+endif()
+
 add_subdirectory(ngraph)
 
 if (NGRAPH_TOOLS_ENABLE)

src/ngraph/runtime/mlir/CMakeLists.txt → src/contrib/mlir/CMakeLists.txt

@@ -23,6 +23,7 @@ set(SRC
     memory_manager.cpp
 )
 if (NGRAPH_MLIR_ENABLE)
+
     add_library(mlir_backend SHARED ${SRC})
 
     message(STATUS "LLVM Directory: ${LLVM_DIR}")

src/ngraph/runtime/mlir/compiler.cpp → src/contrib/mlir/compiler.cpp

@@ -20,12 +20,13 @@
 #include "ngraph/node_vector.hpp"
 #include "ngraph/op/add.hpp"
 #include "ngraph/runtime/cpu/op/matmul_bias.hpp"
-#include "ngraph/runtime/mlir/dialect/dialect.hpp"
-#include "ngraph/runtime/mlir/dialect/ops.hpp"
-#include "ngraph/runtime/mlir/dialect/type.hpp"
-#include "ngraph/runtime/mlir/lowerer.hpp"
 #include "ngraph/type/element_type.hpp"
 
+#include "dialect/dialect.hpp"
+#include "dialect/ops.hpp"
+#include "dialect/type.hpp"
+#include "lowerer.hpp"
+
 #include <llvm/ADT/STLExtras.h>
 #include <llvm/IR/Module.h>
 #include <llvm/Support/ErrorOr.h>

src/ngraph/runtime/mlir/lowerer.cpp → src/contrib/mlir/lowerer.cpp

@@ -25,8 +25,8 @@
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "ngraph/assertion.hpp"
-#include "ngraph/runtime/mlir/dialect/ops.hpp"
-#include "ngraph/runtime/mlir/dialect/type.hpp"
+#include "dialect/ops.hpp"
+#include "dialect/type.hpp"
 
 using namespace ngraph::runtime::cpu;
 // anonymous namespace

src/ngraph/runtime/CMakeLists.txt

@@ -16,11 +16,6 @@
 
 add_subdirectory(interpreter)
 
-# This must be added before any backend that uses MLIR
-if (NGRAPH_MLIR_ENABLE)
-    add_subdirectory(mlir)
-endif()
-
 # With CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, when creating cpu_backend.dll, link reports error: library limit of 65535 objects exceeded
 if (NGRAPH_CPU_ENABLE)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS FALSE)

src/ngraph/runtime/cpu/CMakeLists.txt

@@ -209,7 +209,7 @@ if (NGRAPH_CPU_ENABLE)
         # TODO: can we get away without LLVM/MLIR include path. 
         # Currently mlir backend compiler.hpp include LLVM/MLIR files
         get_directory_property(MLIR_LLVM_INCLUDEPATH
-                               DIRECTORY ${CMAKE_SOURCE_DIR}/src/ngraph/runtime/mlir
+                               DIRECTORY ${NGRAPH_MLIR_SOURCE_DIR}
                                DEFINITION MLIR_LLVM_INCLUDEPATH)
         
         message(STATUS "Building CPU backend with MLIR")

src/ngraph/runtime/cpu/cpu_builder.cpp

@@ -110,7 +110,7 @@
 #include "ngraph/util.hpp"
 
 #ifdef NGRAPH_MLIR_ENABLE
-#include "ngraph/runtime/mlir/compiler.hpp"
+#include "contrib/mlir/compiler.hpp"
 #endif
 
 using namespace std;

src/ngraph/runtime/cpu/cpu_external_function.cpp

@@ -193,7 +193,7 @@
 #include "ngraph/runtime/cpu/pass/halide_subgraph_extraction.hpp"
 
 #ifdef NGRAPH_MLIR_ENABLE
-#include "ngraph/runtime/mlir/compiler.hpp"
+#include "contrib/mlir/compiler.hpp"
 #endif
 
 using namespace std;