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

micro: list test and kernel files explicitly in Makefile #45389

Conversation

rkuester
Copy link
Contributor

@rkuester rkuester commented Dec 3, 2020

See issue #45387. We occasionally want to exclude, from the build, test and kernel files that would otherwise match wildcards.

Listing files explicitly, as done in this PR, is one method of achieving the goal. There is an alternative PR #45388 which keeps the wildcards and adds exclusion lists instead. This PR's scheme may be a little cleaner and less prone to merge conflicts when multiple PRs with exclusions are in-flight at the same time. Of course, the tradeoff is a long list of files; however, that's a common trend in build system configuration files these days.

@google-ml-butler google-ml-butler bot added the size:M CL Change Size: Medium label Dec 3, 2020
@google-ml-butler
Copy link

Thanks for contributing to TensorFlow Lite Micro.

To keep this process moving along, we'd like to make sure that you have completed the items on this list:

We would like to have a discussion on the Github issue first to determine the best path forward, and then proceed to the PR review.

@google-cla google-cla bot added the cla: yes label Dec 3, 2020
@rkuester rkuester added the comp:micro Related to TensorFlow Lite Microcontrollers label Dec 4, 2020
@gbaned gbaned self-assigned this Dec 4, 2020
@gbaned gbaned added this to Assigned Reviewer in PR Queue via automation Dec 4, 2020
In the micro Makefile, trivially move MICROLITE_BENCHMARK_SRCS
def out from in between test and kernel defs in preperation for the
next change, which will be more readable if the test and kernel
defs are together.
List test and kernel files explicitly to provide an easy means of
excluding files from the build that would have matched the
now-removed wildcard patterns. Listing exceptions and using
$(filter-out) would have been more ugly and prone to merge
conflicts.

These lists were verified to match those produced by the
wildcards they replaced as of commit 5543ed6.

There are a few other wildcards in the Makefile for files other
than kernels and kernel tests. Those aren't replaced in this
commit, but should probably be replaced eventually for
consistency's sake.
@rkuester rkuester force-pushed the feature-micro-exclude-kernels-list branch from d43ca6a to cd67a17 Compare December 4, 2020 18:41
@rkuester rkuester changed the title micro: list test and kernel files explicitly micro: list test and kernel files explicitly in Makefile Dec 4, 2020
@rkuester
Copy link
Contributor Author

rkuester commented Dec 4, 2020

This is the chosen way to resolve #45387. I've just now rebased this on master as of 5543ed6, to ensure the wildcard-to-list conversion is as fresh as possible. We should merge ASAP to maintain that freshness.

@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Dec 4, 2020
PR Queue automation moved this from Assigned Reviewer to Approved by Reviewer Dec 4, 2020
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Dec 4, 2020
@copybara-service copybara-service bot merged commit aee5c80 into tensorflow:master Dec 4, 2020
PR Queue automation moved this from Approved by Reviewer to Merged Dec 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes 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

4 participants