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

[Deprecated][inductor] switch CppCodeCache to new cpp_builder. (take 2) #129144

Closed
wants to merge 17 commits into from

Conversation

xuhancn
Copy link
Collaborator

@xuhancn xuhancn commented Jun 20, 2024

The old one is damaged on Pre CI: #128303, this is new one.


This PR is the implemention of #124245 step 2.1

  1. Switch CppCodeCache to new CPP builder.
  2. Switch AotCodeCompiler to new CPP builder.
  3. Switch HalideCodeCache to new CPP builder.

TODO:
Current still need to optimize code structure and circle import. I will do this work in further PR. I have did the exploration: #128330

cc @peterjc123 @mszhanyi @skyline75489 @nbcsm @vladimir-aubrecht @iremyux @Blackhex @cristianPanaite @jgong5 @mingfeima @XiaobingSuper @sanchitintel @ashokei @jingxu10 @ezyang @anijain2305 @chauhang @voznesenskym @penguinwu @EikanWang @Guobing-Chen @zhuhaozhe @blzheng @wenzhe-nrv @jiayisunx @peterbell10 @ipiszy @yf225 @chenyang78 @kadeng @muchulee8 @ColinPeppler @amjames @desertfire

@xuhancn xuhancn requested a review from desertfire June 20, 2024 15:36
Copy link

pytorch-bot bot commented Jun 20, 2024

🔗 Helpful Links

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

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

❌ 17 New Failures, 32 Unrelated Failures

As of commit d282bc0 with merge base 93a33bf (image):

NEW FAILURES - The following jobs have failed:

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

UNSTABLE - The following jobs failed but were likely due to flakiness present on trunk and has been marked as unstable:

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

@xuhancn
Copy link
Collaborator Author

xuhancn commented Jun 20, 2024

@pytorchbot rebase -b main

@pytorchmergebot
Copy link
Collaborator

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

@pytorchmergebot
Copy link
Collaborator

Successfully rebased xu_switch_to_new_cpp_builder_2 onto refs/remotes/origin/main, please pull locally before adding more changes (for example, via git checkout xu_switch_to_new_cpp_builder_2 && git pull --rebase)

@xuhancn
Copy link
Collaborator Author

xuhancn commented Jun 20, 2024

@pytorchmergebot 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

Tried to rebase and push PR #129144, but it was already up to date. Try rebasing against main by issuing:
@pytorchbot rebase -b main

@xuhancn
Copy link
Collaborator Author

xuhancn commented Jun 21, 2024

Hi @desertfire could you please help on test it on fb_code environment? Thanks.

@facebook-github-bot
Copy link
Contributor

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

@xuhancn
Copy link
Collaborator Author

xuhancn commented Jun 22, 2024

@pytorchmergebot rebase -b main

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/main. 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/main pull/129144/head returned non-zero exit code 1

Rebasing (1/2)
Auto-merging torch/_inductor/codecache.py
CONFLICT (content): Merge conflict in torch/_inductor/codecache.py
error: could not apply d26c975560... switch to new cpp_builder.
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 d26c975560... switch to new cpp_builder.

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

@xuhancn
Copy link
Collaborator Author

xuhancn commented Jun 22, 2024

@pytorchmergebot rebase -b main

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/main. 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/main pull/129144/head returned non-zero exit code 1

Rebasing (1/3)
Rebasing (2/3)
Auto-merging torch/_inductor/codecache.py
CONFLICT (content): Merge conflict in torch/_inductor/codecache.py
error: could not apply d26c975560... switch to new cpp_builder.
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 d26c975560... switch to new cpp_builder.

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

@janeyx99 janeyx99 added the triaged This issue has been looked at a team member, and triaged and prioritized into an appropriate module label Jun 24, 2024
@xuhancn
Copy link
Collaborator Author

xuhancn commented Jun 24, 2024

hi @desertfire , I tried to fix issue by this commit: 1dd0d10
Detailed analysis synced with you via slack, thanls.

@facebook-github-bot
Copy link
Contributor

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

pytorchmergebot pushed a commit that referenced this pull request Jun 27, 2024
Original PRs is damaged by confilct and rebase: #128303, #129144

This PR just switch `HalideCodeCache` to new cpp_builder and it is not `fb_code` related. It can merge without `fb_code` test.
Let's land this change firstly.

Pull Request resolved: #129441
Approved by: https://github.com/jgong5, https://github.com/desertfire
@xuhancn xuhancn changed the title [inductor] switch CppCodeCache to new cpp_builder. (take 2) [Deprecated][inductor] switch CppCodeCache to new cpp_builder. (take 2) Jun 30, 2024
@xuhancn xuhancn closed this Jul 4, 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 intel This tag is for PR from Intel module: inductor module: windows Windows support for PyTorch oncall: pt2 open source topic: not user facing 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

6 participants