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

Move shim/xplat to shim_et/xplat #8583

Closed
wants to merge 4 commits into from
Closed

Move shim/xplat to shim_et/xplat #8583

wants to merge 4 commits into from

Conversation

swolchok
Copy link
Contributor

@swolchok swolchok commented Feb 19, 2025

In preparation for replacing the checked-in files in shim/ with https://github.com/facebook/buck2-shims-meta as a submodule. The portions of this diff that are not a pure move are:

  • creation of shim_et/BUCK
  • symlink shim/tools to shim_et/tools so that fbsource//tools
  • movement of Android toolchains from shim/BUCK to shim_et/BUCK because they are not present in buck2-shims-meta
  • edits to .buckconfig
  • edit to Utils.cmake to point at shim_et// instead of shim//
  • edit to shim_et/README.md (note that shim/README.md will come back when shim/ is a submodule pointing to buck2-shims-meta)

[ghstack-poisoned]
@swolchok
Copy link
Contributor Author

swolchok commented Feb 19, 2025

Stack from ghstack (oldest at bottom):

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Feb 19, 2025
swolchok added a commit that referenced this pull request Feb 19, 2025
In preparation for replacing the checked-in files in shim/ with https://github.com/facebook/buck2-shims-meta as a submodule. The portions of this diff that are not a pure move are:
- creation of shim_et/BUCK
- movement of Android toolchains from shim/BUCK to shim_et/BUCK because they are not present in buck2-shims-meta
- edits to .buckconfig
- edit to Utils.cmake to point at shim_et// instead of shim//

ghstack-source-id: c99b5d00c7aaed76b812984f4b7f51625b22e979
ghstack-comment-id: 2669799227
Pull Request resolved: #8583
Copy link

pytorch-bot bot commented Feb 19, 2025

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/8583

Note: Links to docs will display an error until the docs builds have been completed.

❌ 1 New Failure, 1 Unrelated Failure

As of commit 8574dc7 with merge base b6ffe1a (image):

NEW FAILURE - The following job has failed:

BROKEN TRUNK - The following job failed but were present on the merge base:

👉 Rebase onto the `viable/strict` branch to avoid these failures

This comment was automatically generated by Dr. CI and updates every 15 minutes.

Copy link

This PR needs a release notes: label

If your changes are user facing and intended to be a part of release notes, please use a label starting with release notes:.

If not, please add the topic: not user facing label.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "topic: not user facing"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

@swolchok swolchok marked this pull request as draft February 19, 2025 21:30
@swolchok swolchok changed the title Move shim/xplat to shim_et Move shim/xplat to shim_et/xplat Feb 19, 2025
[ghstack-poisoned]
swolchok added a commit that referenced this pull request Feb 19, 2025
In preparation for replacing the checked-in files in shim/ with https://github.com/facebook/buck2-shims-meta as a submodule. The portions of this diff that are not a pure move are:
- creation of shim_et/BUCK
- movement of Android toolchains from shim/BUCK to shim_et/BUCK because they are not present in buck2-shims-meta
- edits to .buckconfig
- edit to Utils.cmake to point at shim_et// instead of shim//

ghstack-source-id: 6747d6c6cad7cc2699a884a940b2054d50d3218f
ghstack-comment-id: 2669799227
Pull Request resolved: #8583
[ghstack-poisoned]
swolchok added a commit that referenced this pull request Feb 19, 2025
In preparation for replacing the checked-in files in shim/ with https://github.com/facebook/buck2-shims-meta as a submodule. The portions of this diff that are not a pure move are:
- creation of shim_et/BUCK
- movement of Android toolchains from shim/BUCK to shim_et/BUCK because they are not present in buck2-shims-meta
- edits to .buckconfig
- edit to Utils.cmake to point at shim_et// instead of shim//

ghstack-source-id: af3cc9d0329459bd7931b0a0630de7275bdcc94e
ghstack-comment-id: 2669799227
Pull Request resolved: #8583
[ghstack-poisoned]
swolchok added a commit that referenced this pull request Feb 19, 2025
In preparation for replacing the checked-in files in shim/ with https://github.com/facebook/buck2-shims-meta as a submodule. The portions of this diff that are not a pure move are:
- creation of shim_et/BUCK
- movement of Android toolchains from shim/BUCK to shim_et/BUCK because they are not present in buck2-shims-meta
- edits to .buckconfig
- edit to Utils.cmake to point at shim_et// instead of shim//

ghstack-source-id: f5fa84beb8545ff951020746a74214b1993f4ec0
ghstack-comment-id: 2669799227
Pull Request resolved: #8583
@facebook-github-bot
Copy link
Contributor

@swolchok has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@swolchok
Copy link
Contributor Author

will replace with a PR initiated from internal repo

@swolchok swolchok closed this Feb 20, 2025
swolchok pushed a commit that referenced this pull request Feb 21, 2025
Looks like in order to get this right, we're going to have to update some internal configuration and originate this PR from internal repo. Supersedes #8583 / D69882927.

Differential Revision: [D69955361](https://our.internmc.facebook.com/intern/diff/D69955361/)

[ghstack-poisoned]
swolchok pushed a commit that referenced this pull request Feb 21, 2025
Looks like in order to get this right, we're going to have to update some internal configuration and originate this PR from internal repo. Supersedes #8583 / D69882927.

Differential Revision: [D69955361](https://our.internmc.facebook.com/intern/diff/D69955361/)

ghstack-source-id: 267533770
Pull Request resolved: #8607
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants