From ba9880a5c366a17966d6e6077e577b8251f31b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 17 Nov 2020 14:42:24 -0600 Subject: [PATCH] Revert "Add tags to Loopy" --- loopy/kernel/array.py | 7 ++----- loopy/kernel/data.py | 14 +++++--------- setup.py | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/loopy/kernel/array.py b/loopy/kernel/array.py index 4254171db..d5b4284b8 100644 --- a/loopy/kernel/array.py +++ b/loopy/kernel/array.py @@ -659,7 +659,7 @@ class ArrayBase(ImmutableRecord): def __init__(self, name, dtype=None, shape=None, dim_tags=None, offset=0, dim_names=None, strides=None, order=None, for_atomic=False, - target=None, alignment=None, tags=None, + target=None, alignment=None, **kwargs): """ All of the following (except *name*) are optional. @@ -698,9 +698,7 @@ def __init__(self, name, dtype=None, shape=None, dim_tags=None, offset=0, using atomic-capable data types. :arg offset: (See :attr:`offset`) :arg alignment: memory alignment in bytes - :arg tags: A metadata tag or list of metadata tags intended for - consumption by an application. It is intended these tags be - instances of :class:`pytools.tag.Tag`. + """ for kwarg_name in kwargs: @@ -857,7 +855,6 @@ def __init__(self, name, dtype=None, shape=None, dim_tags=None, offset=0, order=order, alignment=alignment, for_atomic=for_atomic, - tags=tags, **kwargs) def __eq__(self, other): diff --git a/loopy/kernel/data.py b/loopy/kernel/data.py index 45021c2d1..43770ffb6 100644 --- a/loopy/kernel/data.py +++ b/loopy/kernel/data.py @@ -357,6 +357,7 @@ def __init__(self, **kwargs): DeprecationWarning, stacklevel=2) dtype = None + kwargs["dtype"] = dtype ImmutableRecord.__init__(self, **kwargs) @@ -378,13 +379,13 @@ class ArrayArg(ArrayBase, KernelArgument): allowed_extra_kwargs = [ "address_space", - "is_output_only", - "tags"] + "is_output_only"] def __init__(self, *args, **kwargs): if "address_space" not in kwargs: raise TypeError("'address_space' must be specified") kwargs["is_output_only"] = kwargs.pop("is_output_only", False) + super().__init__(*args, **kwargs) min_target_axes = 0 @@ -452,18 +453,13 @@ def get_arg_decl(self, ast_builder, name_suffix, shape, dtype, is_written): class ValueArg(KernelArgument): def __init__(self, name, dtype=None, approximately=1000, target=None, - is_output_only=False, tags=None): - """ - :arg tags: A metadata tag or list of metadata tags intended for - consumption by an application. It is intended these tags be - instances of :class:`pytools.tag.Tag`. - """ + is_output_only=False): KernelArgument.__init__(self, name=name, dtype=dtype, approximately=approximately, target=target, - is_output_only=is_output_only, tags=tags) + is_output_only=is_output_only) def __str__(self): import loopy as lp diff --git a/setup.py b/setup.py index 084aaeab5..ddc47fefc 100644 --- a/setup.py +++ b/setup.py @@ -84,7 +84,7 @@ def write_git_revision(package_name): python_requires="~=3.6", install_requires=[ - "pytools>=2020.4.2", + "pytools>=2020.4", "pymbolic>=2019.2", "genpy>=2016.1.2", "cgen>=2016.1",