Commit 3287ca6f authored by Nagy Mostafa's avatar Nagy Mostafa Committed by Scott Cyphers

[MLIR] Bump commits (#3584)

* Bump MLIR version and minor fixes in nGraph

* advance commit ids

* fix commit id
parent a383b22b
...@@ -20,8 +20,8 @@ set(MLIR_LLVM_REPO_URL https://github.com/llvm/llvm-project.git) ...@@ -20,8 +20,8 @@ set(MLIR_LLVM_REPO_URL https://github.com/llvm/llvm-project.git)
set(MLIR_REPO_URL https://github.com/tensorflow/mlir.git) set(MLIR_REPO_URL https://github.com/tensorflow/mlir.git)
# Change these commit IDs to move to latest stable versions # Change these commit IDs to move to latest stable versions
set(MLIR_LLVM_COMMIT_ID 3b9a27b) set(MLIR_LLVM_COMMIT_ID f707dac742f)
set(MLIR_COMMIT_ID 0cdb20a) set(MLIR_COMMIT_ID 40fe0fe7)
# MLIR environment variables. Some of them are used by LIT tool. # MLIR environment variables. Some of them are used by LIT tool.
set(MLIR_PROJECT_ROOT ${CMAKE_CURRENT_BINARY_DIR}/mlir_project) set(MLIR_PROJECT_ROOT ${CMAKE_CURRENT_BINARY_DIR}/mlir_project)
......
...@@ -340,7 +340,7 @@ MLIRCompiler::TensorInfo MLIRCompiler::get_tensor_value(descriptor::Tensor* tens ...@@ -340,7 +340,7 @@ MLIRCompiler::TensorInfo MLIRCompiler::get_tensor_value(descriptor::Tensor* tens
void MLIRCompiler::lower_ng_dialect() void MLIRCompiler::lower_ng_dialect()
{ {
// Lower NG dialect to Affine // Lower NG dialect to Affine
mlir::PassManager pm; mlir::PassManager pm(&m_context);
pm.addPass(mlir::createDialectLoweringPass(this)); pm.addPass(mlir::createDialectLoweringPass(this));
pm.addPass(mlir::createCanonicalizerPass()); pm.addPass(mlir::createCanonicalizerPass());
...@@ -431,7 +431,7 @@ void MLIRCompiler::optimize() ...@@ -431,7 +431,7 @@ void MLIRCompiler::optimize()
auto targetInfo = target_machine->getTargetTransformInfo(*ttiSetupFunc); auto targetInfo = target_machine->getTargetTransformInfo(*ttiSetupFunc);
// Populate pass manager with affine dialect optimizations. // Populate pass manager with affine dialect optimizations.
mlir::PassManager pm; mlir::PassManager pm(&m_context);
if (clEnableAffineLoopFusion) if (clEnableAffineLoopFusion)
{ {
pm.addPass(mlir::createLoopFusionPass()); pm.addPass(mlir::createLoopFusionPass());
......
...@@ -207,7 +207,7 @@ namespace ...@@ -207,7 +207,7 @@ namespace
// we find out output values by looking at returned values // we find out output values by looking at returned values
// any return should return all outputs of the subgraph // any return should return all outputs of the subgraph
f.walk<NGReturnOp>([this, &outputCount](NGReturnOp ret) { f.walk([this, &outputCount](NGReturnOp ret) {
for (unsigned i = 0; i < ret.getNumOperands(); i++) for (unsigned i = 0; i < ret.getNumOperands(); i++)
{ {
auto outputValue = ret.getOperand(i); auto outputValue = ret.getOperand(i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment