Skip to content

Commit 2d9e817

Browse files
jumerckxjumerckx
authored
Add formatting hints to CI (#76)
* copied from JuliaFormatter documentation * running formatting for the last time (?) * try removing version in config * now's the last time!
1 parent 67d3a33 commit 2d9e817

File tree

6 files changed

+178
-107
lines changed

6 files changed

+178
-107
lines changed

‎.github/workflows/Format.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Format suggestions
2+
on:
3+
pull_request:
4+
# this argument is not required if you don't use the `suggestion-label` input
5+
types: [ opened, reopened, synchronize, labeled, unlabeled ]
6+
jobs:
7+
code-style:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: julia-actions/julia-format@v3

‎bindings/make.jl‎

Lines changed: 90 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Pkg
2-
import BinaryBuilderBase: PkgSpec, Prefix, temp_prefix, setup_dependencies, cleanup_dependencies, destdir
2+
import BinaryBuilderBase:
3+
PkgSpec, Prefix, temp_prefix, setup_dependencies, cleanup_dependencies, destdir
34
using Clang.Generators
45

56
function mlir_dialects(version::VersionNumber)
@@ -23,7 +24,11 @@ function mlir_dialects(version::VersionNumber)
2324
# ("dlti", "DLTI.jl", ["DLTI/DLTI.td"]), # TODO crashes
2425
("emitc", "EmitC.jl", ["EmitC/IR/EmitC.td"]),
2526
("gpu", "GPU.jl", ["GPU/GPUOps.td"]), # moved to IR subfolder in v15
26-
("linalg", "Linalg.jl", ["Linalg/IR/LinalgOps.td", "Linalg/IR/LinalgStructuredOps.td"]),
27+
(
28+
"linalg",
29+
"Linalg.jl",
30+
["Linalg/IR/LinalgOps.td", "Linalg/IR/LinalgStructuredOps.td"],
31+
),
2732
("llvm", "LLVMIR.jl", ["LLVMIR/LLVMOps.td"]),
2833
("math", "Math.jl", ["Math/IR/MathOps.td"]),
2934
("memref", "MemRef.jl", ["MemRef/IR/MemRefOps.td"]),
@@ -59,7 +64,11 @@ function mlir_dialects(version::VersionNumber)
5964
("emitc", "EmitC.jl", ["EmitC/IR/EmitC.td"]),
6065
("func", "Func.jl", ["Func/IR/FuncOps.td"]),
6166
("gpu", "GPU.jl", ["GPU/IR/GPUOps.td"]),
62-
("linalg", "Linalg.jl", ["Linalg/IR/LinalgOps.td", "Linalg/IR/LinalgStructuredOps.td"]),
67+
(
68+
"linalg",
69+
"Linalg.jl",
70+
["Linalg/IR/LinalgOps.td", "Linalg/IR/LinalgStructuredOps.td"],
71+
),
6372
("llvm", "LLVMIR.jl", ["LLVMIR/LLVMOps.td"]),
6473
("math", "Math.jl", ["Math/IR/MathOps.td"]),
6574
("memref", "MemRef.jl", ["MemRef/IR/MemRefOps.td"]),
@@ -75,12 +84,16 @@ function mlir_dialects(version::VersionNumber)
7584
("spv", "SPIRV.jl", ["SPIRV/IR/SPIRVOps.td"]), # dialect name renamed to 'spirv' in v16
7685
("tensor", "Tensor.jl", ["Tensor/IR/TensorOps.td"]),
7786
("tosa", "Tosa.jl", ["Tosa/IR/TosaOps.td"]),
78-
("transform", "Transform.jl", [
79-
"Bufferization/TransformOps/BufferizationTransformOps.td",
80-
"Linalg/TransformOps/LinalgTransformOps.td",
81-
"SCF/TransformOps/SCFTransformOps.td",
82-
"Transform/IR/TransformOps.td",
83-
]), # more ops files in v16
87+
(
88+
"transform",
89+
"Transform.jl",
90+
[
91+
"Bufferization/TransformOps/BufferizationTransformOps.td",
92+
"Linalg/TransformOps/LinalgTransformOps.td",
93+
"SCF/TransformOps/SCFTransformOps.td",
94+
"Transform/IR/TransformOps.td",
95+
],
96+
), # more ops files in v16
8497
("vector", "Vector.jl", ["Vector/IR/VectorOps.td"]),
8598
("x86vector", "X86Vector.jl", ["X86Vector/X86Vector.td"]),
8699
]
@@ -103,7 +116,11 @@ function mlir_dialects(version::VersionNumber)
103116
("func", "Func.jl", ["Func/IR/FuncOps.td"]),
104117
("gpu", "GPU.jl", ["GPU/IR/GPUOps.td"]),
105118
("index", "Index.jl", ["Index/IR/IndexOps.td"]),
106-
("linalg", "Linalg.jl", ["Linalg/IR/LinalgOps.td", "Linalg/IR/LinalgStructuredOps.td"]),
119+
(
120+
"linalg",
121+
"Linalg.jl",
122+
["Linalg/IR/LinalgOps.td", "Linalg/IR/LinalgStructuredOps.td"],
123+
),
107124
("llvm", "LLVMIR.jl", ["LLVMIR/LLVMOps.td"]),
108125
("math", "Math.jl", ["Math/IR/MathOps.td"]),
109126
("memref", "MemRef.jl", ["MemRef/IR/MemRefOps.td"]),
@@ -119,16 +136,20 @@ function mlir_dialects(version::VersionNumber)
119136
("spirv", "SPIRV.jl", ["SPIRV/IR/SPIRVOps.td"]),
120137
("tensor", "Tensor.jl", ["Tensor/IR/TensorOps.td"]),
121138
("tosa", "Tosa.jl", ["Tosa/IR/TosaOps.td"]),
122-
("transform", "Transform.jl", [
123-
"Affine/TransformOps/AffineTransformOps.td",
124-
"Bufferization/TransformOps/BufferizationTransformOps.td",
125-
"GPU/TransformOps/GPUTransformOps.td",
126-
"Linalg/TransformOps/LinalgTransformOps.td",
127-
"MemRef/TransformOps/MemRefTransformOps.td",
128-
"SCF/TransformOps/SCFTransformOps.td",
129-
"Transform/IR/TransformOps.td",
130-
"Vector/TransformOps/VectorTransformOps.td",
131-
]), # more ops files in v17
139+
(
140+
"transform",
141+
"Transform.jl",
142+
[
143+
"Affine/TransformOps/AffineTransformOps.td",
144+
"Bufferization/TransformOps/BufferizationTransformOps.td",
145+
"GPU/TransformOps/GPUTransformOps.td",
146+
"Linalg/TransformOps/LinalgTransformOps.td",
147+
"MemRef/TransformOps/MemRefTransformOps.td",
148+
"SCF/TransformOps/SCFTransformOps.td",
149+
"Transform/IR/TransformOps.td",
150+
"Vector/TransformOps/VectorTransformOps.td",
151+
],
152+
), # more ops files in v17
132153
("vector", "Vector.jl", ["Vector/IR/VectorOps.td"]),
133154
("x86vector", "X86Vector.jl", ["X86Vector/X86Vector.td"]),
134155
]
@@ -153,7 +174,11 @@ function mlir_dialects(version::VersionNumber)
153174
("gpu", "GPU.jl", ["GPU/IR/GPUOps.td"]),
154175
("index", "Index.jl", ["Index/IR/IndexOps.td"]),
155176
("irdl", "IRDL.jl", ["IRDL/IR/IRDLOps.td"]),
156-
("linalg", "Linalg.jl", ["Linalg/IR/LinalgOps.td", "Linalg/IR/LinalgStructuredOps.td"]),
177+
(
178+
"linalg",
179+
"Linalg.jl",
180+
["Linalg/IR/LinalgOps.td", "Linalg/IR/LinalgStructuredOps.td"],
181+
),
157182
("llvm", "LLVMIR.jl", ["LLVMIR/LLVMOps.td"]),
158183
("math", "Math.jl", ["Math/IR/MathOps.td"]),
159184
("memref", "MemRef.jl", ["MemRef/IR/MemRefOps.td"]),
@@ -169,19 +194,23 @@ function mlir_dialects(version::VersionNumber)
169194
("spirv", "SPIRV.jl", ["SPIRV/IR/SPIRVOps.td"]),
170195
("tensor", "Tensor.jl", ["Tensor/IR/TensorOps.td"]),
171196
("tosa", "Tosa.jl", ["Tosa/IR/TosaOps.td"]),
172-
("transform", "Transform.jl", [
173-
"Affine/TransformOps/AffineTransformOps.td",
174-
"Bufferization/TransformOps/BufferizationTransformOps.td",
175-
"GPU/TransformOps/GPUTransformOps.td",
176-
"Linalg/TransformOps/LinalgMatchOps.td",
177-
"Linalg/TransformOps/LinalgTransformOps.td",
178-
"MemRef/TransformOps/MemRefTransformOps.td",
179-
"NVGPU/TransformOps/NVGPUTransformOps.td",
180-
"SCF/TransformOps/SCFTransformOps.td",
181-
"Tensor/TransformOps/TensorTransformOps.td",
182-
"Transform/IR/TransformOps.td",
183-
"Vector/TransformOps/VectorTransformOps.td",
184-
]),
197+
(
198+
"transform",
199+
"Transform.jl",
200+
[
201+
"Affine/TransformOps/AffineTransformOps.td",
202+
"Bufferization/TransformOps/BufferizationTransformOps.td",
203+
"GPU/TransformOps/GPUTransformOps.td",
204+
"Linalg/TransformOps/LinalgMatchOps.td",
205+
"Linalg/TransformOps/LinalgTransformOps.td",
206+
"MemRef/TransformOps/MemRefTransformOps.td",
207+
"NVGPU/TransformOps/NVGPUTransformOps.td",
208+
"SCF/TransformOps/SCFTransformOps.td",
209+
"Tensor/TransformOps/TensorTransformOps.td",
210+
"Transform/IR/TransformOps.td",
211+
"Vector/TransformOps/VectorTransformOps.td",
212+
],
213+
),
185214
("ub", "UB.jl", ["UB/IR/UBOps.td"]),
186215
("vector", "Vector.jl", ["Vector/IR/VectorOps.td"]),
187216
("x86vector", "X86Vector.jl", ["X86Vector/X86Vector.td"]),
@@ -195,7 +224,12 @@ end
195224

196225
function rewrite!(dag::ExprDAG) end
197226

198-
julia_llvm = Dict([v"1.9" => v"14.0.5+3", v"1.10" => v"15.0.7+10", v"1.11" => v"16.0.6+2", v"1.12" => v"17.0.6+3"])
227+
julia_llvm = Dict([
228+
v"1.9" => v"14.0.5+3",
229+
v"1.10" => v"15.0.7+10",
230+
v"1.11" => v"16.0.6+2",
231+
v"1.12" => v"17.0.6+3",
232+
])
199233
options = load_options(joinpath(@__DIR__, "wrap.toml"))
200234

201235
@add_def off_t
@@ -212,7 +246,7 @@ for (julia_version, llvm_version) in julia_llvm
212246
# Note: 1.10
213247
dependencies = PkgSpec[
214248
PkgSpec(; name="LLVM_full_jll", version=llvm_version),
215-
PkgSpec(; name="mlir_jl_tblgen_jll")
249+
PkgSpec(; name="mlir_jl_tblgen_jll"),
216250
]
217251

218252
artifact_paths = setup_dependencies(prefix, dependencies, platform; verbose=true)
@@ -224,7 +258,14 @@ for (julia_version, llvm_version) in julia_llvm
224258
mkpath(joinpath(@__DIR__, "..", "src", "API", string(llvm_version.major)))
225259

226260
let options = deepcopy(options)
227-
output_file_path = joinpath(@__DIR__, "..", "src", "API", string(llvm_version.major), options["general"]["output_file_path"])
261+
output_file_path = joinpath(
262+
@__DIR__,
263+
"..",
264+
"src",
265+
"API",
266+
string(llvm_version.major),
267+
options["general"]["output_file_path"],
268+
)
228269
isdir(dirname(output_file_path)) || mkpath(dirname(output_file_path))
229270
options["general"]["output_file_path"] = output_file_path
230271

@@ -233,7 +274,9 @@ for (julia_version, llvm_version) in julia_llvm
233274
push!(args, "-I$include_dir")
234275
push!(args, "-xc++")
235276

236-
headers = detect_headers(libmlir_header_dir, args, Dict(), endswith("Python/Interop.h"))
277+
headers = detect_headers(
278+
libmlir_header_dir, args, Dict(), endswith("Python/Interop.h")
279+
)
237280
ctx = create_context(headers, args, options)
238281

239282
# build without printing so we can do custom rewriting
@@ -256,15 +299,20 @@ for (julia_version, llvm_version) in julia_llvm
256299
"--generator=jl-op-defs",
257300
"--disable-module-wrap",
258301
tdpath,
259-
"-I", dirname(tdpath),
260-
"-I", include_dir,
261-
"-o", tempfile,
302+
"-I",
303+
dirname(tdpath),
304+
"-I",
305+
include_dir,
306+
"-o",
307+
tempfile,
262308
]
263309
run(`$mlir_jl_tblgen $flags`)
264310
return tempfile
265311
end
266312

267-
output = joinpath(@__DIR__, "..", "src", "Dialects", string(llvm_version.major), binding)
313+
output = joinpath(
314+
@__DIR__, "..", "src", "Dialects", string(llvm_version.major), binding
315+
)
268316
open(output, "w") do io
269317
println(io, "module $dialect_name\n")
270318
for tempfile in tempfiles

‎deps/build_local.jl‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ Pkg.activate(@__DIR__)
55
Pkg.instantiate()
66

77
if haskey(ENV, "GITHUB_ACTIONS")
8-
println("::warning ::Using a locally-built mlir-jl-tblgen; A bump of mlir_jl_tblgen_jll will be required before releasing MLIR.jl.")
8+
println(
9+
"::warning ::Using a locally-built mlir-jl-tblgen; A bump of mlir_jl_tblgen_jll will be required before releasing MLIR.jl.",
10+
)
911
end
1012

1113
using Pkg, Scratch, Preferences, Libdl, CMake_jll
@@ -35,11 +37,11 @@ catch
3537
end
3638
llvm_pkg_version = "$(Base.libllvm_version.major).$(Base.libllvm_version.minor)"
3739
LLVM = if llvm_assertions
38-
Pkg.add(name="LLVM_full_assert_jll", version=llvm_pkg_version)
40+
Pkg.add(; name="LLVM_full_assert_jll", version=llvm_pkg_version)
3941
using LLVM_full_assert_jll
4042
LLVM_full_assert_jll
4143
else
42-
Pkg.add(name="LLVM_full_jll", version=llvm_pkg_version)
44+
Pkg.add(; name="LLVM_full_jll", version=llvm_pkg_version)
4345
using LLVM_full_jll
4446
LLVM_full_jll
4547
end

‎docs/make.jl‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ using Literate
1212
const EXAMPLES_DIR = joinpath(@__DIR__, "..", "examples")
1313
const OUTPUT_DIR = joinpath(@__DIR__, "src/generated")
1414

15-
examples = Pair{String,String}[
16-
]
15+
examples = Pair{String,String}[]
1716

1817
for (_, name) in examples
1918
example_filepath = joinpath(EXAMPLES_DIR, string(name, ".jl"))
20-
Literate.markdown(example_filepath, OUTPUT_DIR, documenter = true)
19+
Literate.markdown(example_filepath, OUTPUT_DIR; documenter=true)
2120
end
2221

23-
examples = [title => joinpath("generated", string(name, ".md")) for (title, name) in examples]
22+
examples = [
23+
title => joinpath("generated", string(name, ".md")) for (title, name) in examples
24+
]
2425

2526
makedocs(;
2627
modules=[MLIR],
@@ -30,14 +31,15 @@ makedocs(;
3031
format=Documenter.HTML(;
3132
prettyurls=get(ENV, "CI", "false") == "true",
3233
canonical="https://julia.mit.edu/MLIR.jl/",
33-
assets = [
34-
asset("https://plausible.io/js/plausible.js",
35-
class=:js,
36-
attributes=Dict(Symbol("data-domain") => "julia.mit.edu", :defer => "")
37-
)
38-
],
34+
assets=[
35+
asset(
36+
"https://plausible.io/js/plausible.js";
37+
class=:js,
38+
attributes=Dict(Symbol("data-domain") => "julia.mit.edu", :defer => ""),
39+
),
40+
],
3941
),
40-
pages = [
42+
pages=[
4143
"Home" => "index.md",
4244
"Examples" => examples,
4345
"IR" => [
@@ -102,12 +104,8 @@ makedocs(;
102104
],
103105
"API" => "api.md",
104106
],
105-
doctest = true,
106-
strict = false, # due to autogenerated bindings
107+
doctest=true,
108+
strict=false, # due to autogenerated bindings
107109
)
108110

109-
deploydocs(;
110-
repo="github.com/JuliaLabs/MLIR.jl",
111-
devbranch = "main",
112-
push_preview = true,
113-
)
111+
deploydocs(; repo="github.com/JuliaLabs/MLIR.jl", devbranch="main", push_preview=true)

0 commit comments

Comments
 (0)