Skip to content

[Relay][Bugfix] Fix off-by-one error in BiasAddRel, use new reporting #7467

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
junrushao merged 3 commits into from
Feb 19, 2021
Merged

[Relay][Bugfix] Fix off-by-one error in BiasAddRel, use new reporting #7467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c500fe
Fix off-by-one in BiasAddRel, use new reporting
slyubomirsky Feb 18, 2021
7178723
No need to mark xfail if the exception is caught
slyubomirsky Feb 18, 2021
30ebfcd
lint
slyubomirsky Feb 18, 2021
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
9 changes: 7 additions & 2 deletions src/relay/op/nn/nn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,13 @@ bool BiasAddRel(const Array<Type>& types, int num_inputs, const Attrs& attrs,
if (axis < 0) {
axis = data->shape.size() + axis;
}
ICHECK_LE(axis, static_cast<int>(data->shape.size()))
<< "axis " << param->axis << " is out of range";
if (axis >= static_cast<int>(data->shape.size())) {
reporter->GetDiagCtx().EmitFatal(Diagnostic::Error(reporter->GetSpan())
<< "The axis in bias_add must be in range for the shape; "
<< "attempted to access index " << axis << " of "
<< PrettyPrint(data->shape));
return false;
}

// assign output type
reporter->Assign(types[1], TensorType({data->shape[axis]}, data->dtype));
Expand Down
12 changes: 12 additions & 0 deletions tests/python/relay/test_op_level1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,17 @@ def test_bias_add():
np.testing.assert_allclose(op_res.asnumpy(), ref_res, rtol=rtol)


def test_bias_add_type_failure():
# the axis is out of range
try:
b_add = relay.nn.bias_add(relay.const(1), relay.const(2), axis=0)
run_infer_type(b_add)
except tvm._ffi.base.TVMError:
pass
else:
assert False


def test_expand_dims_infer_type():
for dtype in ["float16", "float32"]:
n, t, d = te.size_var("n"), te.size_var("t"), 100
Expand Down Expand Up @@ -484,6 +495,7 @@ def test_bitserial_dense():
if __name__ == "__main__":
test_concatenate()
test_bias_add()
test_bias_add_type_failure()
test_unary_op()
test_binary_op()
test_expand_dims_infer_type()
Expand Down