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.

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

Jump to bottom

Validate (and ensure validation sticks) inputs for MatrixTriangularSolve. #49524

Merged
merged 1 commit into from May 27, 2021
Merged

Validate (and ensure validation sticks) inputs for MatrixTriangularSolve. #49524

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 16 additions & 4 deletions tensorflow/core/kernels/linalg/matrix_triangular_solve_op_impl.h
View file
Open in desktop
Expand Up @@ -162,6 +162,9 @@ class BaseMatrixTriangularSolveOp : public OpKernel {
const Tensor& in1 = ctx->input(1);

ValidateInputTensors(ctx, in0, in1);
if (!ctx->status().ok()) {
return;
}

MatMulBCast bcast(in0.shape().dim_sizes(), in1.shape().dim_sizes());
OP_REQUIRES(
Expand Down Expand Up @@ -230,13 +233,22 @@ class MatrixTriangularSolveOp
private:
void ValidateInputTensors(OpKernelContext* ctx, const Tensor& in0,
const Tensor& in1) override {
const auto in0_num_dims = in0.dims();
OP_REQUIRES(
ctx, in0.dims() >= 2,
errors::InvalidArgument("In[0] ndims must be >= 2: ", in0.dims()));
ctx, in0_num_dims >= 2,
errors::InvalidArgument("In[0] ndims must be >= 2: ", in0_num_dims));

const auto in1_num_dims = in1.dims();
OP_REQUIRES(
ctx, in1.dims() >= 2,
errors::InvalidArgument("In[0] ndims must be >= 2: ", in1.dims()));
ctx, in1_num_dims >= 2,
errors::InvalidArgument("In[1] ndims must be >= 2: ", in1_num_dims));

const auto in0_last_dim = in0.dim_size(in0_num_dims - 1);
const auto in0_prev_dim = in0.dim_size(in0_num_dims - 2);
OP_REQUIRES(ctx, in0_last_dim == in0_prev_dim,
errors::InvalidArgument(
"In[0] matrices in the last dimensions must be square (",
in0_last_dim, " =/= ", in0_prev_dim, ")"));
}
};

Expand Down