Skip to content

sync : vendor #13901

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

Merged
merged 10 commits into from
May 30, 2025
Merged

sync : vendor #13901

merged 10 commits into from
May 30, 2025

Conversation

ggerganov
Copy link
Member

@ggerganov ggerganov commented May 29, 2025

  • Add sync script for 3rd party libraries:

    python ./scripts/sync_vendor.py
  • Move common/json.hpp -> common/nlohmann/json.hpp

  • Update nlohmann/json.hpp to v3.12.0

  • Update httplib to v0.20.1

  • Move all 3rd party code to /vendor

ggml-ci
@ggerganov ggerganov requested a review from ngxson as a code owner May 29, 2025 19:22
@github-actions github-actions bot added script Script related testing Everything test related examples python python script changes server labels May 29, 2025
@ngxson
Copy link
Collaborator

ngxson commented May 29, 2025

Is there a reason why json.hpp is moved to a subdir nlohmann?

Personally I think it may be better to regroup all 3rd party libs into a directory called vendor or 3rdparty

@ggerganov
Copy link
Member Author

Is there a reason why json.hpp is moved to a subdir nlohmann?

I believe the intended way to include the library is:

#include <nlohmann/json.hpp>

Simply json.hpp is a very common name that should not live in a global namespace to avoid name clashes.

@ggerganov
Copy link
Member Author

Personally I think it may be better to regroup all 3rd party libs into a directory called vendor or 3rdparty

@ngxson I moved the code to /vendor and cleaned-up some headers.

Copy link
Collaborator

@ngxson ngxson left a comment

Choose a reason for hiding this comment

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

Perfect, thanks

@ggerganov ggerganov merged commit 53f9250 into master May 30, 2025
55 checks passed
@ggerganov ggerganov deleted the gg/vendor-sync branch May 30, 2025 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
examples python python script changes script Script related server testing Everything test related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants