Skip to content

Fix/test dim value of 0 handling in a couple of places #2337

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Nov 10, 2019
Merged

Fix/test dim value of 0 handling in a couple of places #2337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f57d19
Update the CUDA Where implementation broadcasting logic to handle a d…
skottmckay Nov 7, 2019
41606a0
Exclude ngraph from Where test with 0 dim.
skottmckay Nov 7, 2019
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
33 changes: 20 additions & 13 deletions onnxruntime/core/providers/cuda/tensor/where.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ namespace onnxruntime {
namespace cuda {

// kernel builder functions
#define WHERE_TYPED_KERNEL_WITH_TYPE_NAME(T, TName) \
ONNX_OPERATOR_TYPED_KERNEL_EX( \
Where, \
kOnnxDomain, \
9, \
TName, \
kCudaExecutionProvider, \
KernelDefBuilder() \
.TypeConstraint("B", DataTypeImpl::GetTensorType<bool>()) \
.TypeConstraint("T", DataTypeImpl::GetTensorType<T>()), \
#define WHERE_TYPED_KERNEL_WITH_TYPE_NAME(T, TName) \
ONNX_OPERATOR_TYPED_KERNEL_EX( \
Where, \
kOnnxDomain, \
9, \
TName, \
kCudaExecutionProvider, \
KernelDefBuilder() \
.TypeConstraint("B", DataTypeImpl::GetTensorType<bool>()) \
.TypeConstraint("T", DataTypeImpl::GetTensorType<T>()), \
Where<T>);

// Compute where operator output shape based upon three way broad-casting.
Expand All @@ -44,6 +44,10 @@ Status ComputeOutputShape(const std::string& node_name, const TensorShape& cond_
y_dim = y_shape[y_rank - 1 - i];

int64_t out_dim = std::max(std::max(cond_dim, x_dim), y_dim);
// special case to handle a dim of 0 which can be broadcast with a 1
if (out_dim == 1)
out_dim = std::min(std::min(cond_dim, x_dim), y_dim);

if (cond_dim != out_dim && cond_dim != 1)
return ORT_MAKE_STATUS(ONNXRUNTIME, FAIL, node_name, ": condition operand cannot broadcast on dim ", cond_rank - 1 - i,
" Condition Shape: ", cond_shape.ToString(), ", X Shape: ", x_shape.ToString(), ", Y Shape: ", y_shape.ToString());
Expand Down Expand Up @@ -150,6 +154,9 @@ Status Where<T>::ComputeInternal(OpKernelContext* context) const {
ORT_RETURN_IF_ERROR(ComputeOutputShape(Node().Name(), condition_shape, X_shape, Y_shape, output_shape));
auto output_tensor = context->Output(0, output_shape);

if (output_shape.Size() == 0)
return Status::OK();

TernaryElementwisePreparation prepare(this, condition, X, Y);
ORT_RETURN_IF_ERROR(prepare.TernaryElementwiseBroadcastPrepareHelper(condition_shape, X_shape, Y_shape, output_shape));
ORT_RETURN_IF_ERROR(prepare.CopyToGpu());
Expand All @@ -169,11 +176,11 @@ Status Where<T>::ComputeInternal(OpKernelContext* context) const {
return Status::OK();
}

#define SPECIALIZED_COMPUTE_WITH_NAME(T, TName) \
WHERE_TYPED_KERNEL_WITH_TYPE_NAME(T, TName) \
#define SPECIALIZED_COMPUTE_WITH_NAME(T, TName) \
WHERE_TYPED_KERNEL_WITH_TYPE_NAME(T, TName) \
template Status Where<T>::ComputeInternal(OpKernelContext* context) const;

#define SPECIALIZED_COMPUTE(T) \
#define SPECIALIZED_COMPUTE(T) \
SPECIALIZED_COMPUTE_WITH_NAME(T, T)

SPECIALIZED_COMPUTE(int32_t)
Expand Down
9 changes: 8 additions & 1 deletion onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
namespace onnxruntime {
namespace test {

TEST(BroadcastingTest, DimWithZeroHandling) {
TEST(MathOpTest, DimWithZeroHandling) {
auto run = [](OpTester& tester) {
// exclude NGraph and TensorRT as this isn't handled by those EPs
tester.Run(OpTester::ExpectResult::kExpectSuccess, "", {kTensorrtExecutionProvider, kNGraphExecutionProvider});
};

// test binary element-wise op broadcasting when there's a dim with value of zero
// equal rank
OpTester test("Add");
test.AddInput<int64_t>("A", {3, 1}, {1, 2, 3});
Expand Down Expand Up @@ -51,6 +52,12 @@ TEST(BroadcastingTest, DimWithZeroHandling) {
test4.AddInput<int64_t>("B", {2, 1}, {1, 2});
test4.AddOutput<int64_t>("C", {2, 2, 0}, {});
run(test4);

// test unary op handles it as well
OpTester test5("Floor");
test5.AddInput<float>("A", {0, 3}, {});
test5.AddOutput<float>("B", {0, 3}, {});
run(test5);
}

TEST(MathOpTest, Add_int32) {
Expand Down
13 changes: 13 additions & 0 deletions onnxruntime/test/providers/cpu/tensor/where_op_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,18 @@ TEST(WhereOpTest, Broadcast) {
WhereBroadcastTest<std::string>("true", "false");
}

TEST(WhereOpTest, BroadcastDimWithZero) {
// test where broadcast is possible, and dim of 0 should be selected
OpTester test{kOpName, kOpVersion};

test.AddInput<bool>("condition", {3}, {true, false, true});
test.AddInput<int64_t>("X", {1, 3}, {1, 2, 3});
test.AddInput<int64_t>("Y", {0, 1}, {});

test.AddOutput<int64_t>("output", {0, 3}, {});

// exclude NGraph as this isn't handled by that EP
test.Run(OpTester::ExpectResult::kExpectSuccess, "", {kNGraphExecutionProvider});
}
} // namespace test
} // namespace onnxruntime