[TF] Simplify tensorflow_osx_base build preset.
#29947
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, the `tensorflow_osx_base` preset duplicated all options from from the `buildbot_osx_package` preset. This was not ideal: `tensorflow_osx_base` was not robust against changes to `buildbot_osx_package` and broke when changes were not copied. Now, `tensorflow_osx_base` directly uses `buildbot_osx_package` as a mixin. Updating `update-checkout-config.json` was necessary to make `build-toolchain-tensorflow` pass. Resolves TF-941.
|
Merging this patch to unblock progress. Happy to address comments later! Skipping CI since it doesn't test the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the
tensorflow_osx_basepreset duplicated all options from from thebuildbot_osx_packagepreset. This was not ideal:tensorflow_osx_basewas not robust against changes tobuildbot_osx_packageand broke when changes were not copied.Now,
tensorflow_osx_basedirectly usesbuildbot_osx_packageas a mixin.Resolves TF-941.
Verified that
swift/utils/build-toolchain-tensorflow --pkgcontinues to pass on macOS.Updating
update-checkout-config.jsonwas necessary to make it pass.