[MLIR] Clean up includes and fix Copyright

src/contrib/mlir/compiler.cpp

 //*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
+// Copyright 2019 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,15 +13,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //*****************************************************************************
+
 #include "compiler.hpp"
 
+#include "dialect/dialect.hpp"
+#include "dialect/ops.hpp"
+#include "dialect/type.hpp"
+#include "lowerer.hpp"
+#include "ngraph/descriptor/tensor.hpp"
+#include "ngraph/graph_util.hpp"
+#include "ngraph/node_vector.hpp"
+#include "ngraph/op/add.hpp"
+#include "ngraph/op/dot.hpp"
+#include "ngraph/op/experimental/compiled_kernel.hpp"
+#include "ngraph/runtime/cpu/op/matmul_bias.hpp"
+#include "ngraph/type/element_type.hpp"
+
 #include <llvm/ADT/STLExtras.h>
 #include <llvm/IR/Module.h>
 #include <llvm/Support/ErrorOr.h>
 #include <llvm/Support/MemoryBuffer.h>
 #include <llvm/Support/SourceMgr.h>
 #include <llvm/Support/TargetSelect.h>
-#include <memory>
 #include <mlir/ExecutionEngine/ExecutionEngine.h>
 #include <mlir/ExecutionEngine/MemRefUtils.h>
 #include <mlir/ExecutionEngine/OptUtils.h>
@@ -31,19 +44,9 @@
 #include <mlir/Target/LLVMIR.h>
 #include <mlir/Transforms/DialectConversion.h>
 #include <mlir/Transforms/Passes.h>
+
+#include <memory>
 #include <mutex>
-#include "dialect/dialect.hpp"
-#include "dialect/ops.hpp"
-#include "dialect/type.hpp"
-#include "lowerer.hpp"
-#include "ngraph/descriptor/tensor.hpp"
-#include "ngraph/graph_util.hpp"
-#include "ngraph/node_vector.hpp"
-#include "ngraph/op/add.hpp"
-#include "ngraph/op/dot.hpp"
-#include "ngraph/op/experimental/compiled_kernel.hpp"
-#include "ngraph/runtime/cpu/op/matmul_bias.hpp"
-#include "ngraph/type/element_type.hpp"
 
 using llvm::SmallVector;
 using llvm::StringRef;

src/contrib/mlir/compiler.hpp

 //*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
+// Copyright 2019 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,31 +13,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //*****************************************************************************
+
 #pragma once
 
-#include "lowerer.hpp"
 #include "memory_manager.hpp"
-#include "ngraph/descriptor/tensor.hpp"
 #include "ngraph/node.hpp"
 
-// TODO(dcab): Revisit and do fw decl when possible.
 #include <mlir/ExecutionEngine/ExecutionEngine.h>
-#include <mlir/IR/Attributes.h>
+#include <mlir/ExecutionEngine/MemRefUtils.h>
 #include <mlir/IR/Builders.h>
-#include <mlir/IR/Location.h>
-#include <mlir/IR/MLIRContext.h>
 #include <mlir/IR/Module.h>
-#include <mlir/IR/StandardTypes.h>
 #include <mlir/IR/Types.h>
-#include <mlir/StandardOps/Ops.h>
 
-namespace mlir
-{
-    struct StaticFloatMemRef;
-}
+#include <typeindex>
+#include <unordered_map>
+#include <vector>
 
 namespace ngraph
 {
+    namespace descriptor
+    {
+        class Tensor;
+    }
+    namespace element
+    {
+        class Type;
+    }
     namespace op
     {
         class CompiledKernel;

src/contrib/mlir/lowerer.cpp

 //*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
+// Copyright 2019 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,19 +15,22 @@
 //*****************************************************************************
 
 #include "lowerer.hpp"
-#include <map>
+
 #include "compiler.hpp"
 #include "dialect/ops.hpp"
 #include "dialect/type.hpp"
-#include "llvm/ADT/DenseSet.h"
-#include "mlir/EDSC/Builders.h"
-#include "mlir/EDSC/Helpers.h"
-#include "mlir/EDSC/Intrinsics.h"
-#include "mlir/IR/MLIRContext.h"
-#include "mlir/IR/StandardTypes.h"
-#include "mlir/Transforms/DialectConversion.h"
 #include "ngraph/assertion.hpp"
 
+#include <llvm/ADT/DenseSet.h>
+#include <mlir/EDSC/Builders.h>
+#include <mlir/EDSC/Helpers.h>
+#include <mlir/EDSC/Intrinsics.h>
+#include <mlir/IR/MLIRContext.h>
+#include <mlir/IR/StandardTypes.h>
+#include <mlir/Transforms/DialectConversion.h>
+
+#include <map>
+
 // anonymous namespace
 // no need to expose any of the following outside of this file
 namespace

src/contrib/mlir/lowerer.hpp

 //*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
+// Copyright 2019 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,8 +17,9 @@
 #pragma once
 
 #include "contrib/mlir/compiler.hpp"
-#include "mlir/Pass/Pass.h"
-#include "mlir/Support/LLVM.h"
+
+#include <mlir/Pass/Pass.h>
+
 namespace ngraph
 {
     namespace runtime
@@ -29,6 +30,7 @@ namespace ngraph
         }
     }
 }
+
 namespace mlir
 {
     mlir::Pass* createDialectLoweringPass(ngraph::runtime::ngmlir::MLIRCompiler* compiler);

src/contrib/mlir/memory_manager.cpp

 //*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
+// Copyright 2019 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,9 +15,12 @@
 //*****************************************************************************
 
 #include "memory_manager.hpp"
-#include <memory>
+
 #include "ngraph/ngraph_visibility.hpp"
 
+#include <memory>
+
+
 using namespace ngraph::runtime::ngmlir;
 
 /// Call back to allocate memory for temps from JIT'ed code

src/contrib/mlir/memory_manager.hpp

 //*****************************************************************************
-// Copyright 2017-2019 Intel Corporation
+// Copyright 2019 Intel Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 //*****************************************************************************
 
 #pragma once
+
 #include <stdint.h>
 #include <vector>