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

Fix Vulkan compiling issues on Windows #92207

Closed
wants to merge 1 commit into from

Conversation

mantaionut
Copy link
Collaborator

PR based on #61431
Fix USE_VULKAN=1 and USE_VULKAN_WRAPPER=0 not compiling on Windows.
Change designated initializers since they require C++20.
Rename Hasher typename since it's not compiling due to https://developercommunity.visualstudio.com/t/1397858

Fixes #59519

@pytorch-bot
Copy link

pytorch-bot bot commented Jan 14, 2023

🔗 Helpful Links

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

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

✅ No Failures

As of commit 28f6eab:
💚 Looks good so far! There are no failures yet. 💚

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

@pytorch-bot pytorch-bot bot added the release notes: vulkan release notes category label Jan 14, 2023
@mantaionut mantaionut force-pushed the fix_Vulkan_Windows branch 2 times, most recently from 407fbe9 to 6a8efb4 Compare January 14, 2023 14:54
@mantaionut
Copy link
Collaborator Author

@malfet can you please review these changes?
Thanks.

binder.resource_info.buffer_info.buffer = buffer.handle(); // buffer
binder.resource_info.buffer_info.offset = buffer.mem_offset(); // offset
binder.resource_info.buffer_info.range = buffer.mem_range(); // range
add_binding(binder);
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider std::move() here?

@ezyang ezyang requested a review from SS-JIA January 20, 2023 16:46
@ezyang ezyang added triaged This issue has been looked at a team member, and triaged and prioritized into an appropriate module ciflow/android Trigger android build and test (run_android_test.yml) labels Jan 20, 2023
@ezyang
Copy link
Contributor

ezyang commented Jan 20, 2023

this looks plausible but I'm deferring to vulkan expert

@mantaionut mantaionut force-pushed the fix_Vulkan_Windows branch 2 times, most recently from 50f9e73 to fc3a760 Compare January 23, 2023 08:20
@mantaionut
Copy link
Collaborator Author

@ezyang I made the change you requested. Do you know who can review my changes?

SS-JIA
SS-JIA previously requested changes Jan 30, 2023
Copy link
Contributor

@SS-JIA SS-JIA left a comment

Choose a reason for hiding this comment

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

Overall looks good! But I would suggest removing the changes in c10/util/flat_hash_map.h since it doesn't seem to be needed.

@@ -234,12 +234,14 @@ template <
typename T,
typename FindKey,
typename ArgumentHash,
typename Hasher,
typename DetailHasher,
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this change necessary? Seems that it's simply changing the name of Hasher to DetailHasher. I believe this file was copied over from this repo so I think we should avoid making changes unless necessary.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's mentioned in PR description, isn't it

Rename Hasher typename since it's not compiling due to https://developercommunity.visualstudio.com/t/1397858

@ezyang
Copy link
Contributor

ezyang commented Jan 30, 2023

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Jan 30, 2023
@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: This PR is too stale; the last push date was more than 3 days ago. Please rebase and try again. You can rebase by leaving the following comment on this PR:
@pytorchbot rebase

Details for Dev Infra team Raised by workflow job

Change designated initializers since they require c++20.
Rename Hasher typename since it's not compiling due to
https://developercommunity.visualstudio.com/t/1397858
@ezyang
Copy link
Contributor

ezyang commented Jan 31, 2023

@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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ciflow/android Trigger android build and test (run_android_test.yml) ciflow/trunk Trigger trunk jobs on your pull request Merged open source release notes: vulkan release notes 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.

SPIR-V codegen fails when building on Windows with Vulkan
6 participants