Skip to content

simplify Indexed(ComponentTensor(Indexed(ListTensor(..), ..), ..), ..) #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

simplify Indexed(ComponentTensor(Indexed(ListTensor(..), ..), ..), ..) #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion test/test_simplify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
acos,
as_tensor,
as_ufl,
as_vector,
asin,
atan,
cos,
Expand Down Expand Up @@ -234,7 +235,7 @@ def test_untangle_indexed_component_tensor(self):
A = as_tensor(Indexed(C, MultiIndex(kk)), jj)
assert A is not C

ii = kk
ii = indices(len(A.ufl_shape))
expr = Indexed(A, MultiIndex(ii))
assert isinstance(expr, Indexed)
B, ll = expr.ufl_operands
Expand Down Expand Up @@ -266,3 +267,24 @@ def test_simplify_indexed(self):
# ComponentTensor + ListTensor
c = ComponentTensor(Indexed(ll, MultiIndex((i, j))), MultiIndex((j, i)))
assert Indexed(c, MultiIndex((FixedIndex(1), FixedIndex(2)))) == l2[1]


def test_simplify_indexed_componenttensor_indexed_listtensor():
list_item_0 = as_vector([10.0, 11.0, 12.0])
list_item_1 = as_vector([20.0, 21.0, 22.0])
i = Index()
j = Index()
value = Indexed(
ComponentTensor(
Indexed(
ListTensor(
Indexed(list_item_0, MultiIndex((j,))),
Indexed(list_item_1, MultiIndex((j,))),
),
MultiIndex((i,)),
),
MultiIndex((i, j)),
),
MultiIndex((FixedIndex(1), FixedIndex(2))),
)
assert value == list_item_1[2]
16 changes: 13 additions & 3 deletions ufl/tensors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,24 @@ def _simplify_indexed(self, multiindex):
"""Return a simplified Expr used in the constructor of Indexed(self, multiindex)."""
# Untangle as_tensor(C[kk], jj)[ii] -> C[ll]
B, jj = self.ufl_operands
if len(multiindex) != len(jj):
raise ValueError(f"len(multiindex) ({len(multiindex)}) != len(jj) ({len(jj)})")
rep = dict(zip(jj, multiindex))
# Avoid recursion and just attempt to simplify some common patterns
# as the result of this method is not cached.
if isinstance(B, Indexed):
C, kk = B.ufl_operands
if isinstance(C, ListTensor) and len(kk) == 1 and isinstance(rep[kk[0]], FixedIndex):
(k,) = kk
B = C.ufl_operands[int(rep[k])]
jj = MultiIndex(tuple(j for j in jj if j != k))
multiindex = MultiIndex(tuple(rep[j] for j in jj))
rep = dict(zip(jj, multiindex))
if isinstance(B, Indexed):
C, kk = B.ufl_operands
if all(j in kk for j in jj):
ii = tuple(multiindex)
rep = dict(zip(jj, ii))
Cind = tuple(rep.get(k, k) for k in kk)
return Indexed(C, MultiIndex(Cind))

return Operator._simplify_indexed(self, multiindex)

def indices(self):
Expand Down
Loading