Skip to content

[Relax] Enable bfloat16 for softmax struct-info inference #17781

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

Merged
yongwww merged 1 commit into from
Mar 27, 2025
Merged

[Relax] Enable bfloat16 for softmax struct-info inference #17781

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
3 changes: 2 additions & 1 deletion src/relax/op/nn/nn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ StructInfo InferStructInfoSoftmax(const Call& call, const BlockBuilder& ctx) {
if (data_sinfo->IsUnknownNdim()) {
return data_sinfo;
}
if (!data_sinfo->IsUnknownDtype() && !data_sinfo->dtype.is_float()) {
if (!data_sinfo->IsUnknownDtype() && !data_sinfo->dtype.is_float() &&
!data_sinfo->dtype.is_bfloat()) {
ctx->ReportFatal(Diagnostic::Error(call) << "Softmax requires the input tensor to have float "
"dtype. However, the given input dtype is "
<< data_sinfo->dtype);
Expand Down
9 changes: 7 additions & 2 deletions tests/python/relax/test_op_nn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
# specific language governing permissions and limitations
# under the License.
import pytest

import tvm
import tvm.testing
from tvm import relax, tir
from tvm import TVMError
from tvm import TVMError, relax, tir
from tvm.ir import Op, VDevice
from tvm.script import relax as R

Expand Down Expand Up @@ -143,6 +143,7 @@ def test_softmax_log_softmax_infer_struct_info():
x3 = relax.Var("x", R.Tensor((2, 3)))
x4 = relax.Var("x", R.Tensor())
x5 = relax.Var("x", R.Tensor((2, 3), "float32", vdev0))
x6 = relax.Var("x", R.Tensor((2, 3), "bfloat16"))

_check_inference(bb, relax.op.nn.softmax(x0), relax.TensorStructInfo((2, 3), "float32"))
_check_inference(bb, relax.op.nn.softmax(x5), relax.TensorStructInfo((2, 3), "float32", vdev0))
Expand All @@ -164,6 +165,10 @@ def test_softmax_log_softmax_infer_struct_info():
bb, relax.op.nn.log_softmax(x3, axis=-1), relax.TensorStructInfo((2, 3), dtype="")
)
_check_inference(bb, relax.op.nn.log_softmax(x4, axis=-2), relax.TensorStructInfo(dtype=""))
_check_inference(bb, relax.op.nn.softmax(x6), relax.TensorStructInfo((2, 3), dtype="bfloat16"))
_check_inference(
bb, relax.op.nn.log_softmax(x6), relax.TensorStructInfo((2, 3), dtype="bfloat16")
)


def test_softmax_log_softmax_infer_struct_info_shape_symbolic():
Expand Down