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

Specific PYTORCH_VERSION when building RC for test channel #4804

Merged

Conversation

huydhn
Copy link
Contributor

@huydhn huydhn commented Dec 13, 2023

Cherry pick #4803 for 2.1.2 release. This is to fix the issue when building 2.1.2 RC for domains pick up 2.2.0 from test channel instead of 2.1.2

The changes in tools/tests/assets are not really needed but I like a green signal for python3 -m unittest discover -vs tools/tests -p 'test_*.py'. The differences are in the pinned Docker images.

@huydhn huydhn requested a review from atalman December 13, 2023 04:20
Copy link

vercel bot commented Dec 13, 2023

@huydhn is attempting to deploy a commit to the Meta Open Source Team on Vercel.

A member of the Team first needs to authorize it.

@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 Dec 13, 2023
@huydhn huydhn marked this pull request as draft December 13, 2023 04:22
@huydhn huydhn marked this pull request as ready for review December 13, 2023 04:52
Copy link

vercel bot commented Dec 13, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
torchci ⬜️ Ignored (Inspect) Dec 13, 2023 5:34am

@atalman atalman merged commit d0f7bc9 into pytorch:release/2.1 Dec 13, 2023
68 checks passed
atalman pushed a commit that referenced this pull request Dec 13, 2023
With 2 candidate RC in the test channel (2.1.2 and 2.2.0), we need to
have a way to specify which PYTORCH_VERSION to use. The issue surfaces
when we are trying to cut RC3 for 2.1.2 today while there is already RC1
for 2.2.0 in place. In the current state, `PYTHON_VERSION=3.11
PACKAGE_TYPE=conda CU_VERSION=cpu ARCH_NAME=arm64 CHANNEL=test python -m
pytorch_pkg_helpers` will set `PYTORCH_VERSION` to 2.2.0 whenever
domains are built

For example,
https://github.com/pytorch/vision/actions/runs/7190086502/job/19582646141#step:6:743
build M1 conda for vision 0.16.2 and it's expected to use 2.1.2 there,
not 2.2.0.

The fix here is to:

1. Correctly set the channel to `test` when building RC
2. If the channel is test, use the current candidate version as
PYTORCH_VERSION. The value is exposed via the build matrix as
`stable_version`
3. When doing branch cut for test-infra, the `CURRENT_CANDIDATE_VERSION`
variable could be set accordingly, for example, use 2.1.2 for
`release/2.1` and 2.2.0 for `release/2.2`

### Testing plan

This PR #4803 tests `nightly`
while the cherry pick #4804
covers `test` channel
atalman pushed a commit to atalman/test-infra that referenced this pull request Feb 12, 2024
)

With 2 candidate RC in the test channel (2.1.2 and 2.2.0), we need to
have a way to specify which PYTORCH_VERSION to use. The issue surfaces
when we are trying to cut RC3 for 2.1.2 today while there is already RC1
for 2.2.0 in place. In the current state, `PYTHON_VERSION=3.11
PACKAGE_TYPE=conda CU_VERSION=cpu ARCH_NAME=arm64 CHANNEL=test python -m
pytorch_pkg_helpers` will set `PYTORCH_VERSION` to 2.2.0 whenever
domains are built

For example,
https://github.com/pytorch/vision/actions/runs/7190086502/job/19582646141#step:6:743
build M1 conda for vision 0.16.2 and it's expected to use 2.1.2 there,
not 2.2.0.

The fix here is to:

1. Correctly set the channel to `test` when building RC
2. If the channel is test, use the current candidate version as
PYTORCH_VERSION. The value is exposed via the build matrix as
`stable_version`
3. When doing branch cut for test-infra, the `CURRENT_CANDIDATE_VERSION`
variable could be set accordingly, for example, use 2.1.2 for
`release/2.1` and 2.2.0 for `release/2.2`

### Testing plan

This PR pytorch#4803 tests `nightly`
while the cherry pick pytorch#4804
covers `test` channel
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.

3 participants