Skip to content

use the same pytorch/torchao version same as ET repro in the wheel package test #14560

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 8 commits into from
Sep 27, 2025
Merged

use the same pytorch/torchao version same as ET repro in the wheel package test #14560

merged 8 commits into from
Sep 27, 2025

Conversation

cccclai
Copy link
Contributor

@cccclai cccclai commented Sep 24, 2025

As title, it was hardcoded to use nightly before, causing gaps as the main executorch flow

@pytorch-bot PyTorch Bot
Copy link

pytorch-bot bot commented Sep 24, 2025 •
edited
Loading

🔗 Helpful Links

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

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

❌ 2 Cancelled Jobs

As of commit 9500c91 with merge base 411578a (image):

CANCELLED JOBS - The following jobs were cancelled. Please retry:

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 Sep 24, 2025
@github-actions 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.

@cccclai cccclai force-pushed the fix_qnn_wheel_test branch 2 times, most recently from cf9a879 to 1aa800b Compare September 25, 2025 20:32
kimishpatel
kimishpatel reviewed Sep 25, 2025
View reviewed changes
install_requirements.py Outdated
#
# NOTE: If you're changing, make the corresponding supported CUDA versions in
# SUPPORTED_CUDA_VERSIONS above if needed.
TORCH_VERSION = "2.10.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you put this in a separate PR?

kimishpatel
kimishpatel reviewed Sep 25, 2025
View reviewed changes
.ci/scripts/test_wheel_package_qnn.sh
Comment on lines 142 to 165
TORCH_VERSION=$(
"$PYBIN" - <<'PY'
import re, pathlib
txt = pathlib.Path("install_requirements.py").read_text()
print(re.search(r'TORCH_VERSION\s*=\s*["\']([^"\']+)["\']', txt).group(1))
PY
)

NIGHTLY_VERSION=$(
"$PYBIN" - <<'PY'
import re, pathlib
txt = pathlib.Path("install_requirements.py").read_text()
print(re.search(r'NIGHTLY_VERSION\s*=\s*["\']([^"\']+)["\']', txt).group(1))
PY
)
echo "=== [$LABEL] Install torch==${TORCH_VERSION}.${NIGHTLY_VERSION} ==="

# Install torchao based on the pinned PyTorch version
"$PIPBIN" install torch=="${TORCH_VERSION}.${NIGHTLY_VERSION}" --index-url "https://download.pytorch.org/whl/nightly/cpu"

# Install torchao based on the pinned commit from third-party/ao submodule
pushd "$REPO_ROOT/third-party/ao" > /dev/null
USE_CPP=0 "$PYBIN" setup.py develop
popd > /dev/null
Copy link
Contributor

Choose a reason for hiding this comment

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

Given how these are stored in install_requirements.py, it feels a bit flaky. I think you can just refactor install_requirements.py so that you have torch_pin.py that defines TORCH_VERSION and NIGHTLY_VERSION. That would be cleaner.

Copy link
Contributor

Choose a reason for hiding this comment

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

That comment was for torch

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, add it in #14631

Copy link
Contributor

Choose a reason for hiding this comment

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

ok rebase on top of it and fix this?

kimishpatel
kimishpatel reviewed Sep 25, 2025
View reviewed changes
@kimishpatel
Copy link
Contributor

cc @GregoryComer. lets make sure there is one way to get the torchpin

kimishpatel
kimishpatel reviewed Sep 26, 2025
View reviewed changes
.ci/scripts/test_wheel_package_qnn.sh Outdated
Comment on lines 152 to 154
import re, pathlib
txt = pathlib.Path("torch_pin.py").read_text()
print(re.search(r'NIGHTLY_VERSION\s*=\s*["\']([^"\']+)["\']', txt).group(1))
Copy link
Contributor

Choose a reason for hiding this comment

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

can you not just import torch_pin.py and get the TORCH_VERSION and NIGHTLY_VERSION from that instead of parsing the file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

kimishpatel
kimishpatel approved these changes Sep 26, 2025
View reviewed changes
Copy link
Contributor

@kimishpatel kimishpatel left a comment

Choose a reason for hiding this comment

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

if you can import torch_pin.py that is better than parsing. approving but see if you can do that

@cccclai cccclai merged commit 7f2a593 into main Sep 27, 2025
270 of 272 checks passed
@cccclai cccclai deleted the fix_qnn_wheel_test branch September 27, 2025 22:17
@cccclai
Copy link
Contributor Author

cccclai commented Sep 30, 2025

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

pytorchbot pushed a commit that referenced this pull request Sep 30, 2025
@cccclai @pytorchbot
use the same pytorch/torchao version same as ET repro in the wheel pa…
4057704 
…ckage test (#14560)

As title, it was hardcoded to use nightly before, causing gaps as the
main executorch flow

(cherry picked from commit 7f2a593)
@pytorchbot
Copy link
Collaborator

Cherry picking #14560

The cherry pick PR is at #14682 and it is recommended to link a regression cherry pick PR with an issue. The following tracker issues are updated:

Details for Dev Infra team Raised by workflow job

@pytorchbot pytorchbot mentioned this pull request Sep 30, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kimishpatel kimishpatel kimishpatel approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cccclai @kimishpatel @pytorchbot