Skip to content

Conversation

@atalman
Copy link
Contributor

@atalman atalman commented Sep 10, 2024

  1. Cherry-Pick Bump triton pin and release version #135627

  2. Cherry Pick Bump triton xpu pin and release version #135638

  3. Use pytorch-triton package instead of triton untill triton is released to pypi. Workflow for triton package is that: We use pytorch-triton package untill we are are ready to release to pypi. Once pypi is released we use triton package. Disadvantage here, is this temp change required. Advantage is that we know that pytorch-triton package build by our CD. triton package build by OpenAI.

  4. Revert Temp Release only changes to build from pin: [RELEASE-ONLY CHANGES] Temp changes to build triton from pin for first RC #135517
    So far we followed this process:

    1. Branch cut pytorch/pytorch
    2. Build first RC from pin by landing pr: 135517
    3. Branch cut for triton and cherry-picks
    4. Land PR that switches builds from pin to Branch - This PR

    I think for future releases we should do something like this:

    1. Triton Branch Cut and cherry-picks - few days before Branch Cut for pytorch
    2. Land pytorch/pytorch main PR to use new triton hash and version
    3. Branch cut pytorch/pytorch

@atalman atalman requested review from a team and jeffdaily as code owners September 10, 2024 20:04
@pytorch-bot
Copy link

pytorch-bot bot commented Sep 10, 2024

🔗 Helpful Links

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

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

❌ 1 New Failure, 155 Cancelled Jobs, 5 Unrelated Failures

As of commit 7346619 with merge base b7eb725 (image):

NEW FAILURE - The following job has failed:

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

FLAKY - The following jobs failed but were likely due to flakiness present on trunk:

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

@pytorch-bot pytorch-bot bot added the topic: not user facing topic category label Sep 10, 2024
Copy link
Contributor

@malfet malfet left a comment

Choose a reason for hiding this comment

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

Some of those changes should go thru regular trunk->release branch cherry-pick process

@atalman wrote. Done: #135627

@@ -1 +1 @@
757b6a61e7df814ba806f498f8bb3160f84b120c
5fe38ffd73c2ac6ed6323b554205186696631c6f
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this be a pin or a branch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Branch. To get green signal on PR, we need to bump the pin as well.

# Only linux Python < 3.13 are supported wheels for triton
TRITON_REQUIREMENT="triton==${TRITON_VERSION}; ${TRITON_CONSTRAINT}"
if [[ -n "$PYTORCH_BUILD_VERSION" ]]; then
TRITON_REQUIREMENT="pytorch-triton==${TRITON_VERSION}; ${TRITON_CONSTRAINT}"
Copy link
Contributor

Choose a reason for hiding this comment

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

This feels like something we shouldn't be doing?

Copy link
Contributor Author

@atalman atalman Sep 10, 2024

Choose a reason for hiding this comment

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

This job builds pytorch-triton package. Here is the workflow from 2.4:
https://github.com/pytorch/pytorch/actions/runs/10200015317/job/28218504485#step:8:51 . For RC builds we use this package that we build. Once we are happy with it, release to pypi happens. Then we use triton package.

Copy link
Contributor

Choose a reason for hiding this comment

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

Should we undo those changes on trunk than?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, agree. Will post a change with this to trunk. It will save us 1 cherry-pick during the release process.

Comment on lines +68 to +69
env:
IS_RELEASE_TAG: ${{ startsWith(github.event.ref, 'refs/tags/v') }}
Copy link
Contributor

Choose a reason for hiding this comment

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

It feels like this is something that should have been landed in main first, and than cherry-picked into release

Copy link
Contributor Author

@atalman atalman Sep 10, 2024

Choose a reason for hiding this comment

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

Its part of the revert, we actually first RC from pin rather then branch since branch was not ready 4a3dabd.

This code is already a part of main

@atalman atalman marked this pull request as draft September 10, 2024 22:50
@atalman atalman marked this pull request as ready for review September 10, 2024 23:42
@atalman atalman requested a review from malfet September 10, 2024 23:43
@atalman atalman changed the title [RELEASE-ONLY CHANGES] Revert " Temp changes to build triton from pin", Bump version to 3.1.0 and build from branch [Cherry-Pick] Bump triton pin and release version, revert temporary changes to build from pin Sep 10, 2024
Copy link
Contributor

@malfet malfet left a comment

Choose a reason for hiding this comment

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

Sure, though again, it feels we are doing a bit more changes that what is mentioned in cherry-pick/revert

@atalman atalman merged commit cea5620 into pytorch:release/2.5 Sep 11, 2024
@atalman atalman deleted the triron_from_release branch September 11, 2024 19:03
@atalman atalman changed the title [Cherry-Pick] Bump triton pin and release version, revert temporary changes to build from pin [Cherry-Pick] Bump triton pin and release version, revert temporary changes to build from pin, use pytorch-triton package Sep 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ciflow/inductor ciflow/trunk Trigger trunk jobs on your pull request topic: not user facing topic category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants