Skip to content

Commit ca622f1

Browse files
inducerinducer
committed
Enable ruff C408
1 parent 01b253a commit ca622f1

20 files changed

+261
-261
lines changed

‎proto-tests/test_fem_assembly.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_laplacian_stiffness(ctx_factory):
2525
knl = lp.make_kernel(ctx.devices[0],
2626
"[Nc] -> {[K,i,j,q, dx_axis, ax_b]: 0<=K<Nc and 0<=i,j<%(Nb)d and 0<=q<%(Nq)d " # noqa
2727
"and 0<= dx_axis, ax_b < %(dim)d}"
28-
% dict(Nb=Nb, Nq=Nq, dim=dim),
28+
% {"Nb": Nb, "Nq": Nq, "dim": dim},
2929
[
3030
"dPsi(ij, dxi) := sum_float32(@ax_b,"
3131
" jacInv[ax_b,dxi,K,q] * DPsi[ax_b,ij,q])",
@@ -42,7 +42,7 @@ def test_laplacian_stiffness(ctx_factory):
4242
],
4343
name="lapquad", assumptions="Nc>=1")
4444

45-
knl = lp.tag_inames(knl, dict(ax_b="unr"))
45+
knl = lp.tag_inames(knl, {"ax_b": "unr"})
4646
seq_knl = knl
4747

4848
def variant_fig31(knl):
@@ -123,7 +123,7 @@ def variant_simple_gpu_prefetch(knl):
123123
var_knl, loop_prio = variant(knl)
124124
kernel_gen = lp.generate_loop_schedules(var_knl,
125125
loop_priority=loop_prio)
126-
kernel_gen = lp.check_kernels(kernel_gen, dict(Nc=Nc))
126+
kernel_gen = lp.check_kernels(kernel_gen, {"Nc": Nc})
127127

128128
# print lp.preprocess_kernel(var_knl)
129129

‎proto-tests/test_sem.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ def test_laplacian(ctx_factory):
9696
# print lp.preprocess_kernel(knl)
9797
# 1/0
9898

99-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
99+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
100100

101101
kernel_gen = lp.generate_loop_schedules(knl,
102102
loop_priority=["m_fetch_G", "i_fetch_u"])
103-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
103+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
104104

105105
K = 1000 # noqa
106106
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,
@@ -173,10 +173,10 @@ def test_laplacian_lmem(ctx_factory):
173173
# print lp.preprocess_kernel(knl)
174174
# 1/0
175175

176-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
176+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
177177

178178
kernel_gen = lp.generate_loop_schedules(knl)
179-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
179+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
180180

181181
K = 1000 # noqa
182182
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,
@@ -246,10 +246,10 @@ def test_laplacian_lmem_ilp(ctx_factory):
246246
# print seq_knl
247247
# 1/0
248248

249-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
249+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
250250

251251
kernel_gen = lp.generate_loop_schedules(knl)
252-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
252+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
253253

254254
for knl in kernel_gen:
255255
print(lp.generate_code(knl))
@@ -333,10 +333,10 @@ def test_advect(ctx_factory):
333333

334334
knl = lp.split_iname(knl, "e", 16, outer_tag="g.0") # , slabs=(0, 1))
335335

336-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
336+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
337337

338338
kernel_gen = lp.generate_loop_schedules(knl)
339-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000), kill_level_min=5)
339+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000}, kill_level_min=5)
340340

341341
K = 1000 # noqa
342342
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,
@@ -446,13 +446,13 @@ def test_advect_dealias(ctx_factory):
446446

447447
knl = lp.split_iname(knl, "e", 16, outer_tag="g.0") # , slabs=(0, 1))
448448

449-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
449+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
450450

451451
print(knl)
452452
# 1/0
453453

454454
kernel_gen = lp.generate_loop_schedules(knl)
455-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000), kill_level_min=5)
455+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000}, kill_level_min=5)
456456

457457
K = 1000 # noqa
458458
lp.auto_test_vs_ref(knl, ctx, kernel_gen,
@@ -507,13 +507,13 @@ def test_interp_diff(ctx_factory):
507507

508508
knl = lp.split_iname(knl, "e", 16, outer_tag="g.0") # , slabs=(0, 1))
509509

510-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
510+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
511511

512512
print(knl)
513513
# 1/0
514514

515515
kernel_gen = lp.generate_loop_schedules(knl)
516-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000), kill_level_min=5)
516+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000}, kill_level_min=5)
517517

518518
K = 1000 # noqa
519519
lp.auto_test_vs_ref(knl, ctx, kernel_gen,

‎proto-tests/test_sem_tim.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ def test_laplacian(ctx_factory):
9898
# print(lp.preprocess_kernel(knl))
9999
# 1/0
100100

101-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
101+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
102102

103103
kernel_gen = lp.generate_loop_schedules(knl,
104104
loop_priority=["m_fetch_G", "i_fetch_u"])
105-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
105+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
106106

107107
K = 1000 # noqa
108108
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,
@@ -188,7 +188,7 @@ def test_laplacian_lmem(ctx_factory):
188188
# knl = lp.tag_inames(knl, dict(i_and_j="l.0", k="l.1"))
189189

190190
kernel_gen = lp.generate_loop_schedules(knl)
191-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
191+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
192192

193193
K = 1000 # noqa
194194
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,
@@ -254,10 +254,10 @@ def test_laplacian_lmem_ilp(ctx_factory):
254254
# print(seq_knl)
255255
# 1/0
256256

257-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
257+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
258258

259259
kernel_gen = lp.generate_loop_schedules(knl)
260-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
260+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
261261

262262
for knl in kernel_gen:
263263
print(lp.generate_code(knl))
@@ -341,10 +341,10 @@ def test_advect(ctx_factory):
341341

342342
knl = lp.split_iname(knl, "e", 16, outer_tag="g.0") # , slabs=(0, 1))
343343

344-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
344+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
345345

346346
kernel_gen = lp.generate_loop_schedules(knl)
347-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000), kill_level_min=5)
347+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000}, kill_level_min=5)
348348

349349
K = 1000 # noqa
350350
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,
@@ -454,13 +454,13 @@ def test_advect_dealias(ctx_factory):
454454

455455
knl = lp.split_iname(knl, "e", 16, outer_tag="g.0") # , slabs=(0, 1))
456456

457-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
457+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
458458

459459
print(knl)
460460
# 1/0
461461

462462
kernel_gen = lp.generate_loop_schedules(knl)
463-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000), kill_level_min=5)
463+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000}, kill_level_min=5)
464464

465465
K = 1000 # noqa
466466
lp.auto_test_vs_ref(knl, ctx, kernel_gen,
@@ -515,13 +515,13 @@ def test_interp_diff(ctx_factory):
515515

516516
knl = lp.split_iname(knl, "e", 16, outer_tag="g.0") # , slabs=(0, 1))
517517

518-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
518+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
519519

520520
print(knl)
521521
# 1/0
522522

523523
kernel_gen = lp.generate_loop_schedules(knl)
524-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000), kill_level_min=5)
524+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000}, kill_level_min=5)
525525

526526
K = 1000 # noqa
527527

‎proto-tests/test_tim.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ def test_tim2d(ctx_factory):
5353
knl = lp.precompute(knl, "us", np.float32, ["a", "b"], default_tag="l.auto")
5454
knl = lp.split_iname(knl, "e", 1, outer_tag="g.0") # , slabs=(0, 1))
5555

56-
knl = lp.tag_inames(knl, dict(i="l.0", j="l.1"))
57-
knl = lp.tag_inames(knl, dict(o="unr"))
58-
knl = lp.tag_inames(knl, dict(m="unr"))
56+
knl = lp.tag_inames(knl, {"i": "l.0", "j": "l.1"})
57+
knl = lp.tag_inames(knl, {"o": "unr"})
58+
knl = lp.tag_inames(knl, {"m": "unr"})
5959

6060

6161
# knl = lp.add_prefetch(knl, "G", [2,3], default_tag=None) # axis/argument indices on G # noqa
6262
knl = lp.add_prefetch(knl, "G", [2, 3], default_tag="l.auto") # axis/argument indices on G # noqa
6363

6464
kernel_gen = lp.generate_loop_schedules(knl)
65-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
65+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
6666

6767
K = 1000 # noqa
6868
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,
@@ -118,13 +118,13 @@ def test_red2d(ctx_factory):
118118
knl = lp.split_iname(knl, "j", n, inner_tag="l.0") # , slabs=(0, 1))
119119
knl = lp.split_iname(knl, "i", n, inner_tag="l.1") # , slabs=(0, 1))
120120

121-
knl = lp.tag_inames(knl, dict(o="unr"))
122-
knl = lp.tag_inames(knl, dict(m="unr"))
121+
knl = lp.tag_inames(knl, {"o": "unr"})
122+
knl = lp.tag_inames(knl, {"m": "unr"})
123123

124124
knl = lp.add_prefetch(knl, "G", [2, 3], default_tag="l.auto") # axis/argument indices on G # noqa
125125

126126
kernel_gen = lp.generate_loop_schedules(knl)
127-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
127+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
128128

129129
K = 1000 # noqa
130130
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,
@@ -188,14 +188,14 @@ def test_tim3d(ctx_factory):
188188

189189
# knl = lp.tag_inames(knl, dict(k_inner="unr"))
190190

191-
knl = lp.tag_inames(knl, dict(o="unr"))
192-
knl = lp.tag_inames(knl, dict(m="unr"))
191+
knl = lp.tag_inames(knl, {"o": "unr"})
192+
knl = lp.tag_inames(knl, {"m": "unr"})
193193
# knl = lp.tag_inames(knl, dict(i="unr"))
194194

195195
knl = lp.add_prefetch(knl, "G", [2, 3, 4], default_tag="l.auto") # axis/argument indices on G # noqa
196196

197197
kernel_gen = lp.generate_loop_schedules(knl)
198-
kernel_gen = lp.check_kernels(kernel_gen, dict(K=1000))
198+
kernel_gen = lp.check_kernels(kernel_gen, {"K": 1000})
199199

200200
K = 4000 # noqa
201201
lp.auto_test_vs_ref(seq_knl, ctx, kernel_gen,

‎pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ extend-ignore = [
111111

112112
# FIXME
113113
"NPY002", # numpy rng
114-
"C408", # unnecssary dict() -> literal
115114
]
116115

117116
[tool.ruff.lint.per-file-ignores]

‎test/gnuma_loopy_transforms.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ def set_D_storage_format(kernel): # noqa: N802
3939
def set_up_volume_loop(kernel, Nq): # noqa
4040
kernel = lp.fix_parameters(kernel, Nq=Nq)
4141
kernel = lp.prioritize_loops(kernel, "e,k,j,i")
42-
kernel = lp.tag_inames(kernel, dict(e="g.0", j="l.1", i="l.0"))
42+
kernel = lp.tag_inames(kernel, {"e": "g.0", "j": "l.1", "i": "l.0"})
4343
kernel = lp.assume(kernel, "elements >= 1")
4444
return kernel

0 commit comments

Comments
 (0)