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

ggml-backend : make path_str compatible with C++20 #12269

Merged
merged 1 commit into from
Mar 8, 2025

Conversation

ctrysbita
Copy link
Contributor

#12144 breaks the compatibility with C++20

In C++20, fs::path::u8string() return type changed from std::string (C++17) to std::u8string (C++20+). This PR modifies the path_str function to use conditional compilation to detect __cpp_lib_char8_t (a standard feature flag introduced in C++20):

  • When compiled with C++20+, convert std::u8string to std::string
  • When compiled with C++17, use the returned std::string directly

@github-actions github-actions bot added the ggml changes relating to the ggml tensor library for machine learning label Mar 8, 2025
@@ -1045,3 +1045,4 @@ zrm <[email protected]>
蕭澧邦 <[email protected]>
谢乃闻 <[email protected]>
Нияз Гарифзянов <[email protected]>
Jason C.H <[email protected]>
Copy link
Member

Choose a reason for hiding this comment

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

@ggerganov I am not sure what are the guidelines for modifying this file, I believe that until now it has been generated automatically from the git commits. Should this change be merged as is?

Copy link
Member

Choose a reason for hiding this comment

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

Either way is fine - the gen-authors.sh script will re-generate the file.

I'll run it after this gets in.

@slaren slaren merged commit 6fefc05 into ggml-org:master Mar 8, 2025
45 of 46 checks passed
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Mar 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ggml changes relating to the ggml tensor library for machine learning
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants