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

Fixes for Windows #2790

Merged
merged 3 commits into from
Feb 6, 2025
Merged

Fixes for Windows #2790

merged 3 commits into from
Feb 6, 2025

Conversation

foldl
Copy link
Collaborator

@foldl foldl commented Feb 5, 2025

  • MSVC default to utf-8 without BOM.
  • Console output code page changed to utf-8.

Judd added 2 commits February 5, 2025 14:42
* MSVC default to utf-8 without BOM.
* Console output code page changed to utf-8.
Copy link
Owner

@ggerganov ggerganov left a comment

Choose a reason for hiding this comment

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

Not sure why the CUDA build failed - restarted it just now.

@foldl foldl mentioned this pull request Feb 5, 2025
Comment on lines +45 to +46
add_compile_options("$<$<COMPILE_LANGUAGE:C>:/utf-8>")
add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/utf-8>")
Copy link
Owner

Choose a reason for hiding this comment

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

Btw, which source files require this flag? I am wondering because in llama.cpp we don't seem to need this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

whisper.cpp requires this flag:

"_", "`", "{", "|", "}", "~", "", "", "", "", "<<", ">>", "<<<", ">>>", "--",

There are such flags in llama.cpp:

https://github.com/ggerganov/llama.cpp/blob/d774ab3acc4fee41fbed6dbfc192b57d5f79f34b/CMakeLists.txt#L51

Copy link
Owner

@ggerganov ggerganov left a comment

Choose a reason for hiding this comment

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

Thanks. Merge at will.

@foldl foldl merged commit d682e15 into master Feb 6, 2025
43 checks passed
@foldl foldl deleted the fix_build_with_msvc branch February 6, 2025 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants