From 8d4a737c6597a14c9520a35beb19abdeedb63146 Mon Sep 17 00:00:00 2001 From: George Bisbas Date: Wed, 19 Jun 2024 13:51:58 +0100 Subject: [PATCH] rebase: Fix after rebase --- devito/data/__init__.py | 1 - devito/ir/xdsl_iet/cluster_to_ssa.py | 5 +++-- devito/xdsl_core/xdsl_cpu.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devito/data/__init__.py b/devito/data/__init__.py index c481fdc294c..09fd26f3532 100644 --- a/devito/data/__init__.py +++ b/devito/data/__init__.py @@ -1,6 +1,5 @@ from devito.data.meta import * # noqa from devito.data.allocators import * # noqa -from devito.data.allocators_xdsl import * # noqa from devito.data.decomposition import * # noqa from devito.data.data import * # noqa from devito.data.utils import * # noqa diff --git a/devito/ir/xdsl_iet/cluster_to_ssa.py b/devito/ir/xdsl_iet/cluster_to_ssa.py index dd5e7c771eb..50c78ace6db 100644 --- a/devito/ir/xdsl_iet/cluster_to_ssa.py +++ b/devito/ir/xdsl_iet/cluster_to_ssa.py @@ -43,12 +43,13 @@ from devito.tools.data_structures import OrderedSet from devito.types.dense import DiscreteFunction, Function, TimeFunction from devito.types.equation import Eq -from devito.types.mlir_types import dtype_to_xdsltype +from devito.types.mlir_types import dtype_to_xdsltype, ptr_of, f32 # ------------- devito-xdsl SSA imports -------------# from devito.ir.xdsl_iet import iet_ssa -from devito.ir.xdsl_iet.utils import is_int, is_float +from devito.ir.xdsl_iet.utils import is_int, is_float, dtypes_to_xdsltypes +from examples.seismic import PointSource # flake8: noqa diff --git a/devito/xdsl_core/xdsl_cpu.py b/devito/xdsl_core/xdsl_cpu.py index 2411c9966ea..09deae79d35 100644 --- a/devito/xdsl_core/xdsl_cpu.py +++ b/devito/xdsl_core/xdsl_cpu.py @@ -22,7 +22,8 @@ from xdsl.xdsl_opt_main import xDSLOptMain from devito.ir.xdsl_iet.cluster_to_ssa import (ExtractDevitoStencilConversion, - finalize_module_with_globals) # noqa + finalize_module_with_globals, + setup_memref_args) # noqa from devito.ir.xdsl_iet.profiling import apply_timers from devito.passes.iet import CTarget, OmpTarget