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

TFLu: Allocate scratch tensors even though they are not in subgraph #43538

Merged
merged 3 commits into from Oct 23, 2020

Conversation

mansnils
Copy link
Contributor

This is fixing issue: #43537

…nput

Change-Id: Iebe41ed254eeaef8e4ef6b2a2626291326c2a307
@google-ml-butler google-ml-butler bot added the size:M CL Change Size: Medium label Sep 24, 2020
@gbaned gbaned self-assigned this Sep 24, 2020
@gbaned gbaned added comp:lite TF Lite related issues comp:micro Related to TensorFlow Lite Microcontrollers labels Sep 24, 2020
@gbaned gbaned added this to Assigned Reviewer in PR Queue via automation Sep 24, 2020
@advaitjain
Copy link
Member

@nkreeger, can you take a look?

@nkreeger nkreeger self-requested a review September 29, 2020 18:31
Copy link
Contributor

@nkreeger nkreeger left a comment

Choose a reason for hiding this comment

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

Looks mostly good - just some style cleanup.

tensorflow/lite/micro/micro_allocator_test.cc Outdated Show resolved Hide resolved
tensorflow/lite/micro/micro_allocator_test.cc Outdated Show resolved Hide resolved
tensorflow/lite/micro/micro_allocator_test.cc Outdated Show resolved Hide resolved
PR Queue automation moved this from Assigned Reviewer to Reviewer Requested Changes Oct 5, 2020
@gbaned gbaned requested a review from nkreeger October 6, 2020 16:13
@gbaned gbaned added the awaiting review Pull request awaiting review label Oct 9, 2020
@mansnils
Copy link
Contributor Author

@nkreeger Ping for review

@mansnils
Copy link
Contributor Author

@advaitjain @nkreeger ping for review

PR Queue automation moved this from Reviewer Requested Changes to Approved by Reviewer Oct 19, 2020
@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Oct 19, 2020
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Oct 19, 2020
@gbaned gbaned added ready to pull PR ready for merge process and removed awaiting review Pull request awaiting review ready to pull PR ready for merge process labels Oct 20, 2020
@nkreeger
Copy link
Contributor

Hi @mansnils this looks like it doesn't build the micro_allocator_test:

tensorflow/lite/micro/micro_allocator_test.cc:836:70: error: too few arguments to function call, expected 3, have 2
      kTfLiteOk, allocator->FinishModelAllocation(model, eval_tensors));
                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                    ^
./tensorflow/lite/micro/testing/micro_test.h:118:15: note: expanded from macro 'TF_LITE_MICRO_EXPECT_EQ'
    auto vy = y;                                                               \
              ^
./tensorflow/lite/micro/micro_allocator.h:137:16: note: 'FinishModelAllocation' declared here
  TfLiteStatus FinishModelAllocation(
               ^
1 error generated.

@gbaned gbaned removed the ready to pull PR ready for merge process label Oct 20, 2020
FinishModelAllocation function interface was changed, on latest
upstream/master but not on the original topic branch.
@gbaned gbaned requested a review from nkreeger October 21, 2020 11:53
@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Oct 23, 2020
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Oct 23, 2020
@copybara-service copybara-service bot merged commit b35dceb into tensorflow:master Oct 23, 2020
PR Queue automation moved this from Approved by Reviewer to Merged Oct 23, 2020
@mansnils mansnils deleted the scratch_tensors branch November 17, 2020 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes comp:lite TF Lite related issues comp:micro Related to TensorFlow Lite Microcontrollers ready to pull PR ready for merge process size:M CL Change Size: Medium
Projects
PR Queue
  
Merged
Development

Successfully merging this pull request may close these issues.

None yet

6 participants