Skip to content
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.

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

Fix one hot scalar tensor bug #7975

Merged
merged 24 commits into from
Apr 8, 2022
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e6e6973
fix reduce_sum scalar check bug
BBuf Mar 22, 2022
a0abdd5
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 23, 2022
00522df
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 23, 2022
68e0e08
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 24, 2022
0b90f9b
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 28, 2022
d81aa80
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 29, 2022
81954d7
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 29, 2022
c910fbe
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 29, 2022
32702cf
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 29, 2022
9fa0513
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 30, 2022
8402ce3
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Mar 31, 2022
e3bf835
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Apr 1, 2022
7a46669
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Apr 2, 2022
5786ed5
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Apr 2, 2022
1f66c27
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Apr 3, 2022
265c15a
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Apr 5, 2022
68f1baf
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Apr 6, 2022
8f4ce10
Merge branch 'master' of github.com:Oneflow-Inc/oneflow
BBuf Apr 7, 2022
6d2f65b
fix one_hot scalar tensor bug
BBuf Apr 7, 2022
579be6d
Merge branch 'master' into fix_one_hot_scalar_tensor_bug
mergify[bot] Apr 7, 2022
d8ec0c7
Merge branch 'master' into fix_one_hot_scalar_tensor_bug
BBuf Apr 8, 2022
a925d6d
fix clang tidy error
BBuf Apr 8, 2022
8aa2d7d
Merge branch 'fix_one_hot_scalar_tensor_bug' of github.com:Oneflow-In…
BBuf Apr 8, 2022
2930483
Merge branch 'master' into fix_one_hot_scalar_tensor_bug
mergify[bot] Apr 8, 2022
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 oneflow/user/ops/one_hot_op.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ namespace oneflow {
const int64_t depth = ctx->Attr<int64_t>("depth");
CHECK_GT_OR_RETURN(depth, 0);
const user_op::TensorDesc& indices_desc = ctx->InputTensorDesc("indices", 0);
CHECK_GT_OR_RETURN(indices_desc.shape().NumAxes(), 0);
// For 0-dim Tensor
CHECK_GE_OR_RETURN(indices_desc.shape().NumAxes(), 0);
user_op::TensorDesc* out_desc = ctx->OutputTensorDesc("out", 0);
*out_desc->mut_is_dynamic() = indices_desc.is_dynamic();
DimVector dim_vec = indices_desc.shape().dim_vec();
Expand Down
10 changes: 8 additions & 2 deletions python/oneflow/test/modules/test_one_hot.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import oneflow as flow


def _test_onehot(test_case, device, num_classes, size, on_value, off_value):
def _test_one_hot(test_case, device, num_classes, size, on_value, off_value):
x = np.random.randint(9, size=size)
input = flow.tensor(x, device=flow.device(device), dtype=flow.int64)
output = flow.nn.functional.one_hot(input, num_classes, on_value, off_value)
Expand All @@ -41,7 +41,7 @@ class TestOnehot(flow.unittest.TestCase):
def test_onehot(test_case):
arg_dict = OrderedDict()
arg_dict["test_fun"] = [
_test_onehot,
_test_one_hot,
]
arg_dict["device"] = ["cpu", "cuda"]
arg_dict["num_classes"] = [-1, 10, 11]
Expand All @@ -51,6 +51,12 @@ def test_onehot(test_case):
for arg in GenArgList(arg_dict):
arg[0](test_case, *arg[1:])

@autotest(auto_backward=False)
def test_one_hot_scalar(test_case):
x = torch.tensor(2)
y = torch.nn.functional.one_hot(x, num_classes=5)
return y


if __name__ == "__main__":
unittest.main()