dsl: Reworked inheritance

devitocodes · Nov 13, 2024 · acdcb1e · acdcb1e
1 parent ff4b4d0
commit acdcb1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/devito/types/basic.py b/devito/types/basic.py
@@ -297,7 +297,7 @@ def bound_symbols(self):
         return set()
 
 
-class AbstractSymbol(sympy.Symbol, Basic, Pickable, Evaluable, ArgProvider):
+class AbstractSymbol(sympy.Symbol, Basic, Pickable, Evaluable):
 
     """
     Base class for scalar symbols.
@@ -526,7 +526,7 @@ def __new__(cls, *args, **kwargs):
     __hash__ = Cached.__hash__
 
 
-class DataSymbol(AbstractSymbol, Uncached):
+class DataSymbol(AbstractSymbol, Uncached, ArgProvider):
 
     """
     A unique scalar symbol that carries data.
@@ -549,7 +549,7 @@ def __new__(cls, *args, **kwargs):
     __hash__ = Uncached.__hash__
 
 
-class Scalar(Symbol):
+class Scalar(Symbol, ArgProvider):
 
     """
     Like a Symbol, but in addition it can pass runtime values to an Operator.

diff --git a/devito/types/constant.py b/devito/types/constant.py
@@ -2,13 +2,12 @@
 
 from devito.exceptions import InvalidArgument
 from devito.logger import warning
-from devito.types.args import ArgProvider
 from devito.types.basic import DataSymbol
 
 __all__ = ['Constant']
 
 
-class Constant(DataSymbol, ArgProvider):
+class Constant(DataSymbol):
 
     """
     Symbol representing a constant, scalar value in symbolic equations.