rebase: Fix after rebase

xdslproject · Jun 19, 2024 · 8d4a737 · 8d4a737
1 parent fe8e201
commit 8d4a737
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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