Skip to content

Conversation

@larryliu0820
Copy link
Contributor

So that we can pip install executorch and run python code like examples/models/llama/runner/generation.py without installing pytorch-tokenizers separately.

So that we can `pip install executorch` and run python code like
`examples/models/llama/runner/generation.py` without installing
`pytorch-tokenizers` separately.
@pytorch-bot
Copy link

pytorch-bot bot commented Oct 31, 2025

🔗 Helpful Links

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

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

⏳ No Failures, 14 Pending

As of commit 6628888 with merge base 5b1004c (image):
💚 Looks good so far! There are no failures yet. 💚

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

@meta-cla meta-cla 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 Oct 31, 2025
@github-actions
Copy link

This PR needs a release notes: label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

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

Copy link
Contributor

@lucylq lucylq left a comment

Choose a reason for hiding this comment

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

Nice!

@larryliu0820 larryliu0820 merged commit 67a94af into main Oct 31, 2025
151 of 154 checks passed
@larryliu0820 larryliu0820 deleted the add_tokenizers_dep branch October 31, 2025 17:36
@larryliu0820
Copy link
Contributor Author

@pytorchbot cherry-pick --onto release/1.0 -c release

@pytorchbot
Copy link
Collaborator

Cherry picking #15492

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

hint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
hint: This can be accomplished with the following steps:
hint:  - go to submodule (extension/llm/tokenizers), and either merge commit 3aada3f
hint:    or update to an existing commit which has merged those changes
hint:  - come back to superproject and run:
hint:
hint:       git add extension/llm/tokenizers
hint:
hint:    to record the above merge or update
hint:  - resolve any other conflicts in the superproject
hint:  - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config set advice.submoduleMergeConflict false"
Failed to merge submodule extension/llm/tokenizers (commits don't follow merge-base)
CONFLICT (submodule): Merge conflict in extension/llm/tokenizers
Auto-merging pyproject.toml
error: could not apply 67a94af6ad... Add pytorch-tokenizers as a dependency of ExecuTorch (#15492)
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 set advice.mergeConflict false"
Details for Dev Infra team Raised by workflow job

larryliu0820 added a commit that referenced this pull request Oct 31, 2025
So that we can `pip install executorch` and run python code like
`examples/models/llama/runner/generation.py` without installing
`pytorch-tokenizers` separately.
abhinaykukkadapu pushed a commit to abhinaykukkadapu/executorch that referenced this pull request Nov 6, 2025
So that we can `pip install executorch` and run python code like
`examples/models/llama/runner/generation.py` without installing
`pytorch-tokenizers` separately.
jirioc pushed a commit to nxp-upstream/executorch that referenced this pull request Dec 19, 2025
So that we can `pip install executorch` and run python code like
`examples/models/llama/runner/generation.py` without installing
`pytorch-tokenizers` separately.
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.

4 participants