move upate vars out of meta so it doesn't collide with upstream

mlir/extras/dialects/ext/cf.py

@@ -8,7 +8,7 @@
     _cext,
 )
 from ....ir import Value, InsertionPoint, Block, OpView
-from ...meta import get_user_code_loc, Successor
+from ...util import get_user_code_loc, Successor
 
 
 @_cext.register_operation(_Dialect, replace=True)

mlir/extras/dialects/ext/func.py

@@ -2,8 +2,8 @@
 import sys
 from typing import Union, Optional
 
-from ...meta import make_maybe_no_args_decorator, op_region_builder
-from ...util import get_user_code_loc
+from ...meta import op_region_builder
+from ...util import get_user_code_loc, make_maybe_no_args_decorator
 from ....dialects.func import *
 from ....ir import (
     InsertionPoint,

mlir/extras/dialects/ext/gpu.py

@@ -21,12 +21,10 @@
 from .arith import constant
 from .func import FuncBase
 from ...meta import (
-    ModuleMeta,
-    make_maybe_no_args_decorator,
     region_op,
 )
 from ....dialects._ods_common import get_op_result_or_op_results
-from ...util import get_user_code_loc
+from ...util import get_user_code_loc, make_maybe_no_args_decorator, ModuleMeta
 
 
 def block_id_x():

mlir/extras/dialects/ext/scf.py

@@ -13,8 +13,8 @@
 )
 from ...ast.util import ast_call, set_lineno
 from .gpu import get_device_mapping_array_attr
-from ...meta import region_adder, region_op
-from ...util import get_user_code_loc
+from ...meta import region_op
+from ...util import get_user_code_loc, region_adder
 from ....dialects._ods_common import (
     get_op_result_or_op_results,
     get_default_loc_context,

mlir/extras/dialects/ext/tensor.py

@@ -18,9 +18,9 @@
 from ....dialects import tensor
 from ....dialects.tensor import *
 from .arith import ArithValue, Scalar, constant
-from ...meta import region_op, _update_caller_vars
+from ...meta import region_op
 from ...._mlir_libs._mlir import register_value_caster
-from ...util import get_user_code_loc
+from ...util import get_user_code_loc, _update_caller_vars
 from ....dialects._ods_common import get_op_result_or_op_results
 
 S = ShapedType.get_dynamic_size()