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 some typos for the, for, recieve, retrive. #55773

Merged
merged 2 commits into from
May 5, 2022
Merged

Fix some typos for the, for, recieve, retrive. #55773

merged 2 commits into from
May 5, 2022

Conversation

Yulv-git
Copy link
Contributor

Fix some typos for the, for, recieve, retrive.

@Yulv-git Yulv-git requested a review from penpornk as a code owner April 27, 2022 15:51
@google-ml-butler google-ml-butler bot added the size:S CL Change Size: Small label Apr 27, 2022
@google-ml-butler google-ml-butler bot added the awaiting review Pull request awaiting review label Apr 27, 2022
@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Apr 27, 2022
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Apr 27, 2022
@gbaned gbaned added this to Assigned Reviewer in PR Queue via automation Apr 28, 2022
@gbaned gbaned added the comp:core issues related to core part of tensorflow label Apr 28, 2022
@gbaned
Copy link
Contributor

gbaned commented Apr 29, 2022

@Yulv-git Can you please resolve conflicts? Thank you!

@gbaned gbaned removed awaiting review Pull request awaiting review ready to pull PR ready for merge process labels Apr 29, 2022
input_min_tensor.dims(), "."));
const Tensor& input_max_tensor = ctx->input(3);
OP_REQUIRES(ctx,
input_max_tensor.dims() == 0 || input_max_tensor.dims() == 1,
errors::InvalidArgument(
"Input max tensor must have dimension 1. Recieved ",
"Input max tensor must have dimension 1. Received ",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found that in the current master branch, someone has modified the typos in the file, so there is a conflict.
But I currently don't know how to resolve that conflict.
I am currently unable to merge or undo changes to this file.

@Yulv-git
Copy link
Contributor Author

@Yulv-git Can you please resolve conflicts? Thank you!

I found conflicts in tensorflow/core/kernels/quantize_and_dequantize_op.cc, but I'm not quite sure how to fix it.

@Yulv-git
Copy link
Contributor Author

@Yulv-git Can you please resolve conflicts? Thank you!

I found conflicts in tensorflow/core/kernels/quantize_and_dequantize_op.cc, but I'm not quite sure how to fix it.

Perhaps, I have resolved conflicts now.

@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Apr 29, 2022
PR Queue automation moved this from Assigned Reviewer to Approved by Reviewer Apr 29, 2022
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Apr 29, 2022
@copybara-service copybara-service bot merged commit cd6608b into tensorflow:master May 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp:core issues related to core part of tensorflow ready to pull PR ready for merge process size:S CL Change Size: Small
Projects
PR Queue
  
Approved by Reviewer
Development

Successfully merging this pull request may close these issues.

None yet

4 participants