From 52feeffa4c53e95d58f7cda41ff3cc6454f012ec Mon Sep 17 00:00:00 2001 From: George Bisbas Date: Thu, 1 Feb 2024 16:56:16 +0000 Subject: [PATCH 1/2] docs: minor Updates --- devito/core/cpu.py | 2 +- devito/ir/ietxdsl/cluster_to_ssa.py | 8 +++++--- devito/ir/ietxdsl/lowering.py | 2 +- fast/diffusion_2D_wBCs.py | 2 +- fast/diffusion_3D_wBCs.py | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/devito/core/cpu.py b/devito/core/cpu.py index a1ca16cfd8..76de920bc9 100644 --- a/devito/core/cpu.py +++ b/devito/core/cpu.py @@ -155,7 +155,7 @@ def _specialize_clusters(cls, clusters, **kwargs): options = kwargs['options'] platform = kwargs['platform'] sregistry = kwargs['sregistry'] - + # Toposort+Fusion (the former to expose more fusion opportunities) clusters = fuse(clusters, toposort=True) diff --git a/devito/ir/ietxdsl/cluster_to_ssa.py b/devito/ir/ietxdsl/cluster_to_ssa.py index 42032dfdb6..6733458371 100644 --- a/devito/ir/ietxdsl/cluster_to_ssa.py +++ b/devito/ir/ietxdsl/cluster_to_ssa.py @@ -141,7 +141,7 @@ def _visit_math_nodes(self, node: Expr) -> SSAValue: return cst.result # Handle Floats elif isinstance(node, Float): - cst = arith.Constant.from_float_and_width(float(node), builtin.f32) + cst = arith.Constant(builtin.FloatAttr(float(node), builtin.f32)) self.block.add_op(cst) return cst.result # Handle Symbols @@ -466,8 +466,10 @@ def match_and_rewrite(self, op: iet_ssa.LoadSymbolic, rewriter: PatternRewriter, if op.result.type in (builtin.f32, builtin.f64): rewriter.replace_matched_op( - arith.Constant.from_float_and_width( - float(self.known_symbols[symb_name]), op.result.type + arith.Constant(builtin.FloatAttr + ( + float(self.known_symbols[symb_name]), op.result.type + ) ) ) return diff --git a/devito/ir/ietxdsl/lowering.py b/devito/ir/ietxdsl/lowering.py index 2327422131..bce6950b07 100644 --- a/devito/ir/ietxdsl/lowering.py +++ b/devito/ir/ietxdsl/lowering.py @@ -94,7 +94,7 @@ def match_and_rewrite(self, op: iet_ssa.For, rewriter: PatternRewriter, /): rewriter.replace_matched_op([ cst1 := arith.Constant.from_int_and_width(1, builtin.IndexType()), new_ub := arith.Addi(op.ub, cst1), - scf_for := scf.For.get(op.lb, new_ub.result, op.step, subindice_vals, body), + scf_for := scf.For(op.lb, new_ub.result, op.step, subindice_vals, body), ], [scf_for.results[0]]) for use in scf_for.results[0].uses: diff --git a/fast/diffusion_2D_wBCs.py b/fast/diffusion_2D_wBCs.py index 6fd0fcd637..fcdcc19d96 100644 --- a/fast/diffusion_2D_wBCs.py +++ b/fast/diffusion_2D_wBCs.py @@ -85,7 +85,7 @@ u.data[:] = u2.data[:] configuration['mpi'] = mpiconf -# Reset data +# Reset our data field and ICs init_hat(field=u.data[0], dx=dx, dy=dy, value=1.) if args.xdsl: diff --git a/fast/diffusion_3D_wBCs.py b/fast/diffusion_3D_wBCs.py index f497a6729e..d04b2d2d55 100644 --- a/fast/diffusion_3D_wBCs.py +++ b/fast/diffusion_3D_wBCs.py @@ -48,8 +48,8 @@ u = TimeFunction(name='u', grid=grid, space_order=so) devito_out = TimeFunction(name='u', grid=grid, space_order=so) -a = Constant(name='a') # Create an equation with second-order derivatives +a = Constant(name='a') eq = Eq(u.dt, a * u.laplace) stencil = solve(eq, u.forward) eq_stencil = Eq(u.forward, stencil) @@ -91,4 +91,4 @@ if args.xdsl and args.devito: assert np.isclose(norm(u), norm(devito_out), rtol=1e-5) max_error = np.max(np.abs(u.data - devito_out.data)) - assert np.isclose(norm(u), norm(devito_out), rtol=1e-5) + print("Max error: ", max_error) From 0e1097c6486fb4ee5b84482646b95a1868858bb2 Mon Sep 17 00:00:00 2001 From: George Bisbas Date: Thu, 1 Feb 2024 16:58:29 +0000 Subject: [PATCH 2/2] docs: flake8 --- devito/core/cpu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devito/core/cpu.py b/devito/core/cpu.py index 76de920bc9..a1ca16cfd8 100644 --- a/devito/core/cpu.py +++ b/devito/core/cpu.py @@ -155,7 +155,7 @@ def _specialize_clusters(cls, clusters, **kwargs): options = kwargs['options'] platform = kwargs['platform'] sregistry = kwargs['sregistry'] - + # Toposort+Fusion (the former to expose more fusion opportunities) clusters = fuse(clusters, toposort=True)