Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
10 changes: 7 additions & 3 deletions lib/Dialect/Fly/IR/FlyOps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -903,11 +903,15 @@ FLY_INFER_RETURN_TYPES(SliceOp) {
if (auto srcCoordTensorTy = dyn_cast<CoordTensorType>(srcTy)) {
Attribute layout = srcCoordTensorTy.getLayout();
Attribute newLayout;
if (auto la = dyn_cast<LayoutAttr>(layout))
if (auto la = dyn_cast<LayoutAttr>(layout)) {
newLayout = sliceLayout(la);
else
IntTupleAttr offsetAttr = layoutCrd2Idx(builder, coordAttr, la.getShape(), la.getStride());
IntTupleAttr newBase = intTupleAdd(builder, srcCoordTensorTy.getBase(), offsetAttr);
inferredReturnTypes.assign({CoordTensorType::get(newBase, newLayout)});
} else {
newLayout = sliceComposed(cast<ComposedLayoutAttr>(layout));
inferredReturnTypes.assign({CoordTensorType::get(srcCoordTensorTy.getBase(), newLayout)});
inferredReturnTypes.assign({CoordTensorType::get(srcCoordTensorTy.getBase(), newLayout)});
}
Comment thread
tingqli marked this conversation as resolved.
Resolved
return success();
}

Expand Down
22 changes: 22 additions & 0 deletions tests/unit/test_coord_tensor.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import torch

import flydsl.compiler as flyc
import flydsl.expr as fx


def test_coord_tensor_slicing():
@flyc.jit
def test(i: fx.Int32, output: fx.Tensor):
row_base = fx.make_int_tuple(0)
row_layout = fx.make_layout((128, 64), (1, 0))
coord_tensor = fx.Tensor(fx.make_view(row_base, row_layout))
ct0 = coord_tensor[6, None]
ct1 = coord_tensor[i, None]
assert ct0[0].get_static_leaf_int == 6, f"expected static slice to be 6, got {ct0[0].get_static_leaf_int}"
output[0] = fx.get_scalar(ct0[0])
output[1] = fx.get_scalar(ct1[0])

output = torch.zeros(2, dtype=torch.int32, device="cpu", requires_grad=False)
test(6, output)
assert output[0].item() == 6, f"expected 6 for static slice, got {output[0].item()}"
assert output[1].item() == 6, f"expected 6 for dynamic slice, got {output[1].item()}"
Comment thread
tingqli marked this conversation as resolved.
Resolved
Loading