Skip to content

ConstantOfShape: output empty shape scalar for empty input. #451

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
yuslepukhin merged 1 commit into from
Feb 7, 2019
Merged

ConstantOfShape: output empty shape scalar for empty input. #451

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
13 changes: 5 additions & 8 deletions onnxruntime/core/providers/cpu/generator/constant_of_shape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,13 @@ Status ConstantOfShape::Compute(OpKernelContext* ctx) const {

auto& input_shape = shape_tensor->Shape();

// If empty the output is a scalar, which means a single value
// If empty the output is a scalar with empty shape
// TensorShape::Size() will still return 1 and we will output
// one value
std::vector<int64_t> output_dims;
const auto input_size = input_shape.Size();
if (input_size > 0) {
auto span = gsl::make_span(shape_tensor->Data<int64_t>(), input_size);
if (input_shape.NumDimensions() > 0) {
auto span = gsl::make_span(shape_tensor->Data<int64_t>(), input_shape.Size());
output_dims.insert(output_dims.end(), span.cbegin(), span.cend());
} else if (input_size == 0) {
output_dims.push_back(1); // scalar
} else {
return ORT_MAKE_STATUS(ONNXRUNTIME, FAIL, "Input tensor dimensions is expected to be either 1-D or empty");
}

TensorShape output_shape(output_dims);
Expand Down