[AMD][OCP MX][CI] Fix tests to not dispatch on UNFUSED_TRITON backend on MI300, improve w_mxfp4_a_fp8 emulation support (#46142)
Signed-off-by: Felix Marty <Felix.Marty@amd.com>
This commit is contained in:
@@ -200,6 +200,16 @@ def _mxfp4_quantize(
|
||||
return A, None
|
||||
|
||||
|
||||
def _fp8_quantize_dequantize(
|
||||
A: torch.Tensor,
|
||||
A_scale: torch.Tensor,
|
||||
):
|
||||
qA, qA_scale = ops.scaled_fp8_quant(A, A_scale, use_per_token_if_dynamic=False)
|
||||
A = per_tensor_dequantize(qA, qA_scale).to(A.dtype)
|
||||
|
||||
return A, None
|
||||
|
||||
|
||||
def _mxfp8_e4m3_quantize(
|
||||
A: torch.Tensor,
|
||||
A_scale: torch.Tensor | None,
|
||||
@@ -268,23 +278,17 @@ def moe_kernel_quantize_input(
|
||||
# purpose, because there is no native kernel for weight in ocp_mx_scheme
|
||||
# and activation in FP8. The implementation is based on existing
|
||||
# non-emulation ops.
|
||||
qA, qA_scale = ops.scaled_fp8_quant(
|
||||
A, A_scale, use_per_token_if_dynamic=False
|
||||
)
|
||||
A = per_tensor_dequantize(qA, qA_scale).to(A.dtype)
|
||||
# After QDQ, we don't need further quantization
|
||||
return A, None
|
||||
# TODO: Remove this `ocp_mx_scheme is not None` block and rely solely
|
||||
# on `quantization_emulation`.
|
||||
return _fp8_quantize_dequantize(A, A_scale)
|
||||
# else: For other schemes (e.g., *_a_mxfp6_e3m2, *_a_mxfp6_e2m3),
|
||||
# weights are already dequantized, and we proceed with normal
|
||||
# activation quantization below.
|
||||
|
||||
if quant_dtype == current_platform.fp8_dtype():
|
||||
if quantization_emulation:
|
||||
raise NotImplementedError(
|
||||
f"moe_kernel_quantize_input does not support quant_dtype={quant_dtype}"
|
||||
" MOE quantization emulation. Please open an issue."
|
||||
)
|
||||
return _fp8_quantize(A, A_scale, per_act_token_quant, block_shape)
|
||||
return _fp8_quantize_dequantize(A, A_scale)
|
||||
else:
|
||||
return _fp8_quantize(A, A_scale, per_act_token_quant, block_shape)
|
||||
elif quant_dtype == torch.int8:
|
||||
if quantization_emulation:
|
||||
raise NotImplementedError(
|
||||
|
||||
Reference in New Issue
Block a user