Skip to content

Conversation

@GregoryComer
Copy link
Member

@GregoryComer GregoryComer commented Sep 28, 2024

Minor CMake target cleanup for beta.

Note that the iOS test failure is due to running the test on a fork - framework build, coreML tests, and other iOS functional tests all pass.

@pytorch-bot
Copy link

pytorch-bot bot commented Sep 28, 2024

🔗 Helpful Links

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

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

❗ 1 Merge Blocking SEVs

There is 1 active merge blocking SEVs. Please view them below:

If you must merge, use @pytorchbot merge -f.

❌ 2 New Failures, 2 Unrelated Failures

As of commit 95f6ad1 with merge base b4a6148 (image):

NEW FAILURES - The following jobs have failed:

UNSTABLE - The following jobs failed but were likely due to flakiness present on trunk and has been marked as unstable:

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

@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 Sep 28, 2024
@GregoryComer GregoryComer added ciflow/periodic ciflow/trunk ciflow/binaries and removed CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. labels Sep 28, 2024
@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 Sep 28, 2024
@GregoryComer GregoryComer force-pushed the rename-executorch-no-prim-ops branch from 7d0d58d to 081484a Compare September 28, 2024 01:32
@facebook-github-bot
Copy link
Contributor

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

@GregoryComer GregoryComer force-pushed the rename-executorch-no-prim-ops branch from 752b180 to 95f6ad1 Compare September 29, 2024 00:05
@facebook-github-bot
Copy link
Contributor

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

@GregoryComer GregoryComer marked this pull request as ready for review September 29, 2024 00:46
@facebook-github-bot
Copy link
Contributor

@GregoryComer merged this pull request in 905b88c.

@GregoryComer
Copy link
Member Author

@pytorchbot cherry-pick --onto release/0.4 -c critical

@pytorchbot
Copy link
Collaborator

Cherry picking #5740

Command git -C /home/runner/work/executorch/executorch cherry-pick -x -X theirs 905b88c75c9a9c63fb609e8e653e707a00d5cdc4 returned non-zero exit code 1

Auto-merging CMakeLists.txt
Auto-merging backends/xnnpack/CMakeLists.txt
Auto-merging build/cmake_deps.toml
Auto-merging build/executorch-config.cmake
Auto-merging extension/llm/custom_ops/CMakeLists.txt
CONFLICT (modify/delete): extension/training/CMakeLists.txt deleted in HEAD and modified in 905b88c75 (Rename executorch_no_prim_ops to executorch_core (#5740)).  Version 905b88c75 (Rename executorch_no_prim_ops to executorch_core (#5740)) of extension/training/CMakeLists.txt left in tree.
error: could not apply 905b88c75... Rename executorch_no_prim_ops to executorch_core (#5740)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Details for Dev Infra team Raised by workflow job

GregoryComer added a commit to GregoryComer/executorch that referenced this pull request Oct 7, 2024
Summary:
Minor CMake target cleanup for beta.

Pull Request resolved: pytorch#5740

Reviewed By: shoumikhin

Differential Revision: D63576097

Pulled By: GregoryComer

fbshipit-source-id: b10f9f15cfcae3bce769d07cd014e8064d735dbd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ciflow/binaries ciflow/periodic ciflow/trunk CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. Merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants