Skip to content

[Submodule] Add flash as third-party submodule [Prep for later PRs]#145502

Closed
drisspg wants to merge 2 commits intogh/drisspg/117/basefrom
gh/drisspg/117/head
Closed

[Submodule] Add flash as third-party submodule [Prep for later PRs]#145502
drisspg wants to merge 2 commits intogh/drisspg/117/basefrom
gh/drisspg/117/head

Conversation

@drisspg
Copy link
Contributor

@drisspg drisspg commented Jan 23, 2025

Stack from ghstack (oldest at bottom):

Context

Prototyped here: #144120, we are going to make flash-attention a 3rd party submodule. We will then use the c++ sources and include into our build of libtorch.so

This requires various changes to work including external and internal changes. Since these require internal changes we need to co-dev and in the co-dev environment I haven't found a way to sync submodule changes + internal only changes.

This is unused for now

cc @ptrblck @msaroufim @eqy

[ghstack-poisoned]
@pytorch-bot pytorch-bot bot added the topic: not user facing topic category label Jan 23, 2025
@pytorch-bot
Copy link

pytorch-bot bot commented Jan 23, 2025

🔗 Helpful Links

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

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

✅ No Failures

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

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

@drisspg drisspg changed the title Add flash as third-party submodule [Prep for later PRs] [Submodule] Add flash as third-party submodule [Prep for later PRs] Jan 23, 2025
@drisspg drisspg added the module: cuda Related to torch.cuda, and CUDA support in general label Jan 23, 2025
@drisspg
Copy link
Contributor Author

drisspg commented Jan 23, 2025

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Jan 23, 2025
@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@pytorch-bot pytorch-bot bot temporarily deployed to upload-benchmark-results January 23, 2025 18:16 Inactive
@pytorch-bot pytorch-bot bot temporarily deployed to upload-benchmark-results January 23, 2025 18:16 Inactive
@pytorch-bot pytorch-bot bot temporarily deployed to upload-benchmark-results January 23, 2025 18:16 Inactive
@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: Command git -C /home/runner/work/pytorch/pytorch rebase origin/main returned non-zero exit code 1

Rebasing (1/1)
Auto-merging .gitmodules
CONFLICT (content): Merge conflict in .gitmodules
error: could not apply 67a2f017cbe... [Submodule] Add flash as third-party submodule [Prep for later PRs] (#145502)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Could not apply 67a2f017cbe... [Submodule] Add flash as third-party submodule [Prep for later PRs] (#145502)
Details for Dev Infra team Raised by workflow job

@drisspg
Copy link
Contributor Author

drisspg commented Jan 24, 2025

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x 15c983dc15a4e1fa1fc9e32b2bc39ee9b6e57238 returned non-zero exit code 1

Auto-merging .gitmodules
CONFLICT (content): Merge conflict in .gitmodules
error: could not apply 15c983dc15a... Add flash as third-party submodule [Prep for later PRs]
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

[ghstack-poisoned]
drisspg added a commit that referenced this pull request Jan 24, 2025
@drisspg
Copy link
Contributor Author

drisspg commented Jan 24, 2025

@pytorchbot merge

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@pytorch-bot pytorch-bot bot temporarily deployed to upload-benchmark-results January 24, 2025 02:00 Inactive
@pytorch-bot pytorch-bot bot temporarily deployed to upload-benchmark-results January 24, 2025 02:00 Inactive
@pytorch-bot pytorch-bot bot temporarily deployed to upload-benchmark-results January 24, 2025 02:00 Inactive
@pytorchmergebot
Copy link
Collaborator

The merge job was canceled or timed out. This most often happen if two merge requests were issued for the same PR, or if merge job was waiting for more than 6 hours for tests to finish. In later case, please do not hesitate to reissue the merge command
For more information see pytorch-bot wiki.

@eqy
Copy link
Collaborator

eqy commented Jan 24, 2025

@pytorchmergebot merge

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@github-actions github-actions bot deleted the gh/drisspg/117/head branch February 24, 2025 02:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ciflow/trunk Trigger trunk jobs on your pull request Merged module: cuda Related to torch.cuda, and CUDA support in general topic: not user facing topic category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants