From f856f84c556e1df5625c56ac7d1d8784c183a59b Mon Sep 17 00:00:00 2001 From: Tian Jin Date: Mon, 2 Mar 2020 14:28:36 +0800 Subject: [PATCH 1/7] Use llvm-project we know that works. --- .circleci/config.yml | 4 ++-- utils/install-mlir.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3863f72..f7bedfd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: git submodule update --init --recursive # Use cached mlir installation if possible. - restore_cache: - key: V6-LLVM-PROJECT-{{ arch }} + key: V7-LLVM-PROJECT-{{ arch }} - run: name: Install MLIR command: | @@ -29,7 +29,7 @@ jobs: source ONNF/utils/install-mlir.sh fi - save_cache: - key: V6-LLVM-PROJECT-{{ arch }} + key: V7-LLVM-PROJECT-{{ arch }} paths: - llvm-project - run: diff --git a/utils/install-mlir.sh b/utils/install-mlir.sh index 39f06ea..960cd19 100644 --- a/utils/install-mlir.sh +++ b/utils/install-mlir.sh @@ -1,4 +1,6 @@ git clone https://github.com/llvm/llvm-project.git +# Check out a specific branch that is known to work with ONNF. +cd llvm-project && git checkout 391cc4dd41db934081c37ee523cb2149bf0e3a41 && cd .. mkdir llvm-project/build cd llvm-project/build cmake -G Ninja ../llvm \ From d8b5e195d292588c04721f910a44554b412c0518 Mon Sep 17 00:00:00 2001 From: Tian Jin Date: Mon, 2 Mar 2020 16:20:58 +0800 Subject: [PATCH 3/7] Upgrade MLIR commit id. --- utils/install-mlir.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/install-mlir.sh b/utils/install-mlir.sh index 960cd19..9070bf5 100644 --- a/utils/install-mlir.sh +++ b/utils/install-mlir.sh @@ -1,6 +1,6 @@ git clone https://github.com/llvm/llvm-project.git # Check out a specific branch that is known to work with ONNF. -cd llvm-project && git checkout 391cc4dd41db934081c37ee523cb2149bf0e3a41 && cd .. +cd llvm-project && git checkout 476ca094c846a0b6d4d9f37710aba21a6b0b265a && cd .. mkdir llvm-project/build cd llvm-project/build cmake -G Ninja ../llvm \ From 2f5d65f2e4fb7657e1daace453f41a627f9024f0 Mon Sep 17 00:00:00 2001 From: Tian Jin Date: Mon, 2 Mar 2020 16:24:15 +0800 Subject: [PATCH 4/7] Invalidate cache. --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f7bedfd..d52faf9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: git submodule update --init --recursive # Use cached mlir installation if possible. - restore_cache: - key: V7-LLVM-PROJECT-{{ arch }} + key: V8-LLVM-PROJECT-{{ arch }} - run: name: Install MLIR command: | @@ -29,7 +29,7 @@ jobs: source ONNF/utils/install-mlir.sh fi - save_cache: - key: V7-LLVM-PROJECT-{{ arch }} + key: V8-LLVM-PROJECT-{{ arch }} paths: - llvm-project - run: From 473fdd726df5a309796d29fa832eaa5c241d15f7 Mon Sep 17 00:00:00 2001 From: Tian Jin Date: Mon, 2 Mar 2020 17:06:40 +0800 Subject: [PATCH 5/7] Fix DocCheck error. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 62c2f25..e48bcb5 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ Firstly, install MLIR (as a part of LLVM-Project): [same-as-file]: <> (utils/install-mlir.sh) ``` bash git clone https://github.com/llvm/llvm-project.git +# Check out a specific branch that is known to work with ONNF. +cd llvm-project && git checkout 476ca094c846a0b6d4d9f37710aba21a6b0b265a && cd .. mkdir llvm-project/build cd llvm-project/build cmake -G Ninja ../llvm \ From 04dd904ca74525143a8803c2c74089efd4a53365 Mon Sep 17 00:00:00 2001 From: Tian Jin Date: Mon, 2 Mar 2020 20:37:33 +0800 Subject: [PATCH 6/7] Switch to new status badge. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e48bcb5..e4c2547 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ONNF Open Neural Network Frontend : an ONNX frontend for MLIR. -[![CircleCI](https://circleci.com/gh/clang-ykt/ONNF.svg?style=svg)](https://circleci.com/gh/clang-ykt/ONNF) +[![CircleCI](https://circleci.com/gh/onnx/onnx-mlir/tree/master.svg?style=svg)](https://circleci.com/gh/onnx/onnx-mlir/tree/master) ## Prerequisites From 47831749ce6520416bdf69a0691e45c594e187a4 Mon Sep 17 00:00:00 2001 From: Tian Jin Date: Tue, 3 Mar 2020 00:18:59 +0800 Subject: [PATCH 7/7] Use the exact commit id specified in clang-ykt/llvm-project. --- .circleci/config.yml | 4 ++-- README.md | 2 +- utils/install-mlir.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d52faf9..e459df1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: git submodule update --init --recursive # Use cached mlir installation if possible. - restore_cache: - key: V8-LLVM-PROJECT-{{ arch }} + key: V9-LLVM-PROJECT-{{ arch }} - run: name: Install MLIR command: | @@ -29,7 +29,7 @@ jobs: source ONNF/utils/install-mlir.sh fi - save_cache: - key: V8-LLVM-PROJECT-{{ arch }} + key: V9-LLVM-PROJECT-{{ arch }} paths: - llvm-project - run: diff --git a/README.md b/README.md index e4c2547..b1266b9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Firstly, install MLIR (as a part of LLVM-Project): ``` bash git clone https://github.com/llvm/llvm-project.git # Check out a specific branch that is known to work with ONNF. -cd llvm-project && git checkout 476ca094c846a0b6d4d9f37710aba21a6b0b265a && cd .. +cd llvm-project && git checkout 076475713c236081a3247a53e9dbab9043c3eac2 && cd .. mkdir llvm-project/build cd llvm-project/build cmake -G Ninja ../llvm \ diff --git a/utils/install-mlir.sh b/utils/install-mlir.sh index 9070bf5..b995b06 100644 --- a/utils/install-mlir.sh +++ b/utils/install-mlir.sh @@ -1,6 +1,6 @@ git clone https://github.com/llvm/llvm-project.git # Check out a specific branch that is known to work with ONNF. -cd llvm-project && git checkout 476ca094c846a0b6d4d9f37710aba21a6b0b265a && cd .. +cd llvm-project && git checkout 076475713c236081a3247a53e9dbab9043c3eac2 && cd .. mkdir llvm-project/build cd llvm-project/build cmake -G Ninja ../llvm \