Skip to content

Fix inconsistent tensor shapes between shuffle_scale_a16w4 and shuffle_weight_a16w4 #1454

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Fix inconsistent tensor shapes between shuffle_scale_a16w4 and shuffle_weight_a16w4 #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad466b7
wip; todo fix unit test input
Rohan138 Nov 14, 2025
6525ad4
merge main
Rohan138 Nov 17, 2025
bccbdbb
Merge branch 'main' into ropotdar/fix_a16w4_scale_shuffle
Rohan138 Nov 20, 2025
9649745
Add -q for aiter A16W4 UT selection
Rohan138 Nov 20, 2025
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
7 changes: 2 additions & 5 deletions aiter/ops/shuffle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,8 @@ def shuffle_weight_a16w4(src: torch.Tensor, NLane: int, gate_up: bool) -> torch.
return interleaved.contiguous().view(src_type)


def shuffle_scale_a16w4(
src: torch.Tensor, experts_cnt: int, gate_up: bool
) -> torch.Tensor:
n_experts, k_ = src.shape
n_ = n_experts // experts_cnt
def shuffle_scale_a16w4(src: torch.Tensor, gate_up: bool) -> torch.Tensor:
experts_cnt, n_, k_ = src.shape
# MXFP4 constants
K_Pack = 2
N_Pack = 2
Expand Down
9 changes: 4 additions & 5 deletions op_tests/test_moe_2stage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ def weight_per_128x128_quant(weight, quant_dtype):
exp_bias2_aiter = exp_bias2 = None

# pre-shuffle
w1_scale_aiter = w1_scale
w2_scale_aiter = w2_scale
if WQDType == torch.int4: # int4 w quant
w1_qt_aiter = rearrange_4bit_elements(
convert_int8_to_uint32_int4(
Expand All @@ -173,9 +171,9 @@ def weight_per_128x128_quant(weight, quant_dtype):
and (WQDType == dtypes.fp4x2)
): # a16w4
w1_qt_aiter = shuffle_weight_a16w4(w1_qt_aiter, 16, True)
w1_scale_aiter = shuffle_scale_a16w4(w1_scale, E, True)
w1_scale_aiter = shuffle_scale_a16w4(w1_scale, True)
w2_qt_aiter = shuffle_weight_a16w4(w2_qt_aiter, 16, False)
w2_scale_aiter = shuffle_scale_a16w4(w2_scale, E, False)
w2_scale_aiter = shuffle_scale_a16w4(w2_scale, False)
elif WQDType != dtypes.fp4x2 or preshuffle:
w1_qt_aiter = shuffle_weight(w1_qt_aiter, layout=(16, 16))
w2_qt_aiter = shuffle_weight(w2_qt_aiter, layout=(16, 16))
Expand Down Expand Up @@ -350,7 +348,8 @@ def calc_diff(x: torch.Tensor, y: torch.Tensor):
2: aiter.QuantType.per_Token, dtypes.fp8, dtypes.fp8 # a8w8
3: aiter.QuantType.per_Token, dtypes.fp8, torch.int4 # a8w4
4: aiter.QuantType.per_1x32, dtypes.fp4x2, dtypes.fp4x2 # a4w4
5: aiter.QuantType.per_128x128, dtypes.fp8, dtypes.fp8, # a8w8""",
5: aiter.QuantType.per_128x128, dtypes.fp8, dtypes.fp8, # a8w8
6: aiter.QuantType.per_1x32, dtypes.bf16, dtypes.fp4x2 # a16w4""",
)

parser.add_argument(
Expand Down
Loading