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.

Sign up for GitHub

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

Jump to bottom

Fix broken Vulkan Cmake (properly) #5230

Merged
merged 4 commits into from
Jan 31, 2024
Merged

Fix broken Vulkan Cmake (properly) #5230

merged 4 commits into from
Jan 31, 2024

Conversation

netrunnereve
Copy link
Collaborator

@netrunnereve netrunnereve commented Jan 31, 2024 •
edited
Loading

Sorry about breaking Vulkan Windows CMake with #5182! This PR fixes the build for both Linux and Windows and adds Vulkan CI support as well.

Resolves #5191.

@0cc4m
Copy link
Collaborator

0cc4m commented Jan 31, 2024

Wasn't it just the "STATIC" that caused issues? Why revert the changes that make Vulkan work like the other backends in the CMakeLists.txt?

@henk717
Copy link

henk717 commented Jan 31, 2024 •
edited
Loading

Can confirm this compiles on Windows again.

@sorasoras
Copy link

Work as well on windows

@stduhpf
Copy link
Contributor

stduhpf commented Jan 31, 2024

Anyone with write acess to the repo want to accept this PR?

@ggerganov ggerganov requested a review from 0cc4m January 31, 2024 16:41
@0cc4m
Copy link
Collaborator

0cc4m commented Jan 31, 2024

I don't know enough about CMake to be able to tell why the version on master fails, but this seems to work on Windows and Linux, so it's fine by me.

@0cc4m 0cc4m merged commit 1cfb537 into ggml-org:master Jan 31, 2024
52 checks passed
@netrunnereve
Copy link
Collaborator Author

netrunnereve commented Jan 31, 2024 •
edited
Loading

Wasn't it just the "STATIC" that caused issues? Why revert the changes that make Vulkan work like the other backends in the CMakeLists.txt?

I reverted it because those changes were plain wrong. Changing from static to object is all you need to make it build properly on both Linux and Windows. I explain this in more detail at #5191 (comment).

jordankanter pushed a commit to jordankanter/llama.cpp that referenced this pull request Feb 3, 2024
@netrunnereve @jordankanter
Fix broken Vulkan Cmake (properly) (ggml-org#5230)
75cbca5 
* build vulkan as object

* vulkan ci
@0cc4m 0cc4m mentioned this pull request Feb 13, 2024
Merged
hodlen pushed a commit to hodlen/llama.cpp that referenced this pull request Apr 1, 2024
@netrunnereve @hodlen
Fix broken Vulkan Cmake (properly) (ggml-org#5230)
701b4f8 
* build vulkan as object

* vulkan ci
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0cc4m 0cc4m 0cc4m approved these changes

@stduhpf stduhpf stduhpf approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Vulkan build on Windows cmake broken since commit 172ac826 (PR #5182)
5 participants
@netrunnereve @0cc4m @henk717 @sorasoras @stduhpf