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

Nvfuser code base nuke #111447

Closed
wants to merge 6 commits into from
Closed

Conversation

jjsjann123
Copy link
Collaborator

@jjsjann123 jjsjann123 commented Oct 18, 2023

removing nvfuser code base.

cc @albanD

@pytorch-bot
Copy link

pytorch-bot bot commented Oct 18, 2023

🔗 Helpful Links

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

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

✅ No Failures

As of commit 34e2881 with merge base 2f09da3 (image):
💚 Looks good so far! There are no failures yet. 💚

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

@jjsjann123 jjsjann123 added the ciflow/trunk Trigger trunk jobs on your pull request label Oct 18, 2023
@jjsjann123
Copy link
Collaborator Author

I don't think failing tests are relevant. I'm gonna wait until viable/strict catches up to retry CI. 😆

@jjsjann123 jjsjann123 marked this pull request as ready for review October 26, 2023 16:32
@jjsjann123
Copy link
Collaborator Author

This is breaking the 2k LOC sanity check.

But it's just removing dead code. Can we make an exception on that here, otherwise, it's going to be a ~85 PRs. 😆 cc'ing @malfet

Meanwhile, since I'm removing some bazel build files, would you mind try import and run this? @davidberard98

@facebook-github-bot
Copy link
Contributor

@davidberard98 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@malfet
Copy link
Contributor

malfet commented Oct 26, 2023

@jjsjann123 i'm fine with ignoring this check (also, let me modify it to never fire up if total is net negative)

@davidberard98 davidberard98 added release notes: jit release notes category topic: deprecation topic category labels Oct 26, 2023
@facebook-github-bot
Copy link
Contributor

@davidberard98 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@albanD
Copy link
Collaborator

albanD commented Oct 26, 2023

Yes completely fine to skip this!

@davidberard98
Copy link
Contributor

@pytorchbot rebase

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here

@pytorchmergebot
Copy link
Collaborator

Rebase failed due to Command git -C /home/runner/work/pytorch/pytorch rebase refs/remotes/origin/viable/strict pull/111447/head returned non-zero exit code 1

Rebasing (1/2)
CONFLICT (modify/delete): third_party/nvfuser/test/test_gpu3.cpp deleted in ad57aef02ba (removing nvfuser code base) and modified in HEAD.  Version HEAD of third_party/nvfuser/test/test_gpu3.cpp left in tree.
error: could not apply ad57aef02ba... removing nvfuser code base
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".
Could not apply ad57aef02ba... removing nvfuser code base

Raised by https://github.com/pytorch/pytorch/actions/runs/6662910163

@davidberard98
Copy link
Contributor

@jjsjann123 can you do the manual rebase please?

@albanD albanD added the triaged This issue has been looked at a team member, and triaged and prioritized into an appropriate module label Oct 27, 2023
@jjsjann123
Copy link
Collaborator Author

merged viable/strict. Let me know if you want main instead.

@facebook-github-bot
Copy link
Contributor

@davidberard98 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@davidberard98
Copy link
Contributor

@pytorchbot rebase -s

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here

@pytorchmergebot
Copy link
Collaborator

Rebase failed due to Command git -C /home/runner/work/pytorch/pytorch rebase refs/remotes/origin/viable/strict pull/111447/head returned non-zero exit code 1

Rebasing (1/2)
CONFLICT (modify/delete): third_party/nvfuser/test/test_gpu3.cpp deleted in ad57aef02ba (removing nvfuser code base) and modified in HEAD.  Version HEAD of third_party/nvfuser/test/test_gpu3.cpp left in tree.
error: could not apply ad57aef02ba... removing nvfuser code base
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".
Could not apply ad57aef02ba... removing nvfuser code base

Raised by https://github.com/pytorch/pytorch/actions/runs/6706601765

Copy link
Collaborator

@albanD albanD left a comment

Choose a reason for hiding this comment

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

@davidberard98 if this is too prone to merge conflicts, it might be simpler to rebase + insta merge yourself.
The merge conflicts should be pretty clear.

@jjsjann123
Copy link
Collaborator Author

Let me do manual rebase.

@jjsjann123
Copy link
Collaborator Author

merged upstream/viable/strict cc'ing @davidberard98

@davidberard98
Copy link
Contributor

thanks!

(btw, I'm kind of confused why the automated rebase didn't work; test_gpu3.cpp doesn't seem like it has changed since your last manual merge?)

@facebook-github-bot
Copy link
Contributor

@davidberard98 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@jjsjann123
Copy link
Collaborator Author

thanks!

(btw, I'm kind of confused why the automated rebase didn't work; test_gpu3.cpp doesn't seem like it has changed since your last manual merge?)

Indeed!

There's no merge conflict when I just merged to upstream/viable/strict. But this isn't the first time with a false merge conflict from the bot.

@jjsjann123
Copy link
Collaborator Author

CI failure looks mysterious. The import did happen after my last rebase.

Meta Internal-Only Changes Check — The Diff and Pull Request are not in sync!

@facebook-github-bot
Copy link
Contributor

@pytorchbot merge

(Initiating merge automatically since Phabricator Diff has merged)

@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

xuhancn pushed a commit to xuhancn/pytorch that referenced this pull request Nov 7, 2023
removing nvfuser code base.

Pull Request resolved: pytorch#111447
Approved by: https://github.com/albanD
Skylion007 pushed a commit to Skylion007/pytorch that referenced this pull request Nov 14, 2023
removing nvfuser code base.

Pull Request resolved: pytorch#111447
Approved by: https://github.com/albanD
andreigh pushed a commit to andreigh/pytorch that referenced this pull request Nov 19, 2023
removing nvfuser code base.

Pull Request resolved: pytorch#111447
Approved by: https://github.com/albanD
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 open source release notes: jit release notes category skip-pr-sanity-checks topic: deprecation topic category triaged This issue has been looked at a team member, and triaged and prioritized into an appropriate module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants