diff --git a/.github/workflows/macos_bazel.yml b/.github/workflows/macos_bazel.yml index 034e4752..94f711c5 100644 --- a/.github/workflows/macos_bazel.yml +++ b/.github/workflows/macos_bazel.yml @@ -28,6 +28,12 @@ jobs: - name: Test run: bazel test \:all --config=macos --test_output=errors + - name: Build with MLIR + run: bazel build \:all --config=macos --define codegen=mlir + + - name: Test with MLIR + run: bazel test \:all --config=macos --define codegen=mlir --test_output=errors + - name: Build ios App # build with c++20 # workaround from https://github.com/bazelbuild/bazel/issues/12716#issuecomment-1113754835 diff --git a/3rd/patch/BUILD.bazel b/3rd/patch/BUILD.bazel new file mode 100644 index 00000000..e69de29b diff --git a/3rd/patch/llvm/fix_build_on_macos_13.patch b/3rd/patch/llvm/fix_build_on_macos_13.patch new file mode 100644 index 00000000..9f8641ad --- /dev/null +++ b/3rd/patch/llvm/fix_build_on_macos_13.patch @@ -0,0 +1,13 @@ +diff mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorRewriting.cpp mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorRewriting.cpp +index ebbe88ee9029..21e128d61cc6 100644 +--- mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorRewriting.cpp ++++ mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorRewriting.cpp +@@ -1094,7 +1094,7 @@ private: + }); + rewriter.setInsertionPointAfter(op); + src = rewriter.create(loc, foreachOp.getResult(0), true); +- if (bufferTp != dstTp) { ++ if (bufferTp != dstTp.getRankedTensorType()) { + rewriter.replaceOpWithNewOp(op, dstTp.getRankedTensorType(), + src); + rewriter.create(loc, src); diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 069bf4d0..dff47814 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -243,6 +243,9 @@ new_git_repository( name = "llvm-raw", build_file_content = "# empty", commit = "6009708b4367171ccdbf4b5905cb6a803753fe18", + patches = [ + "@dev_pscm//3rd/patch:llvm/fix_build_on_macos_13.patch", + ], remote = "https://github.com/llvm/llvm-project.git" ) @@ -319,6 +322,6 @@ maybe( sha256 = "7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0", strip_prefix = "zstd-1.5.2", urls = [ - "https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz" + "https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz", ], -) \ No newline at end of file +)