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

threads: fix msvc build without openmp #9615

Merged
merged 1 commit into from
Sep 24, 2024
Merged

threads: fix msvc build without openmp #9615

merged 1 commit into from
Sep 24, 2024

Conversation

max-krasnyansky
Copy link
Collaborator

We're missing atomic_thread_fence() in MSVC builds when openmp is disabled.

@max-krasnyansky
threads: fix msvc build without openmp
d9fa534 
We're missing atomic_thread_fence() in MSVC builds when openmp is disabled.
@github-actions github-actions bot added the ggml changes relating to the ggml tensor library for machine learning label Sep 23, 2024
@max-krasnyansky
Copy link
Collaborator Author

@giladgd
Can you please try this? It should fix the issue you were seeing with MSVC builds.
I realized that our CI didn't catch it because all MSVC builds have OpenMP enabled
in which case we don't use those atomic_xyz functions.

@max-krasnyansky max-krasnyansky mentioned this pull request Sep 23, 2024
Merged
4 tasks
@max-krasnyansky max-krasnyansky merged commit c087b6f into ggerganov:master Sep 24, 2024
53 checks passed
@giladgd
Copy link
Contributor

giladgd commented Sep 24, 2024

@max-krasnyansky I just tested it, and it now compiles as expected.
Thanks for the quick fix :)

dsx1986 pushed a commit to dsx1986/llama.cpp that referenced this pull request Oct 29, 2024
@max-krasnyansky @dsx1986
threads: fix msvc build without openmp (ggerganov#9615)
352b8c1 
We're missing atomic_thread_fence() in MSVC builds when openmp is disabled.
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Nov 15, 2024
@max-krasnyansky @arthw
threads: fix msvc build without openmp (ggerganov#9615)
94d522d 
We're missing atomic_thread_fence() in MSVC builds when openmp is disabled.
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Nov 18, 2024
@max-krasnyansky @arthw
threads: fix msvc build without openmp (ggerganov#9615)
5591cd8 
We're missing atomic_thread_fence() in MSVC builds when openmp is disabled.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slaren slaren slaren approved these changes

Assignees
No one assigned
Labels
ggml changes relating to the ggml tensor library for machine learning
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@max-krasnyansky @giladgd @slaren