refactor : remove libcurl, use OpenSSL when available#18828
refactor : remove libcurl, use OpenSSL when available#18828angt merged 6 commits intoggml-org:masterfrom
Conversation
Signed-off-by: Adrien Gallouët <angt@huggingface.co>
Signed-off-by: Adrien Gallouët <angt@huggingface.co>
Signed-off-by: Adrien Gallouët <angt@huggingface.co>
Signed-off-by: Adrien Gallouët <angt@huggingface.co>
Signed-off-by: Adrien Gallouët <angt@huggingface.co>
|
@CISC we can also enable boringssl in build-linux-cross.yml ? |
They all probably have working |
That would be very surprising, they all do cross-building 👀 |
Why? There's cross-built dependencies. Anyway, doesn't matter, just leave them, might as well have test-cases for non-ssl build. |
|
Let's go ? |
ngxson
left a comment
There was a problem hiding this comment.
this make the downloading code much cleaner now 🚀
| } | ||
|
|
||
| #endif // LLAMA_USE_CURL || LLAMA_USE_HTTPLIB | ||
| #endif // defined(LLAMA_USE_HTTPLIB) |
There was a problem hiding this comment.
small note here, but we should probably move the #ifdef inside each function, as it make things easier to follow.
(this should be a follow-up PR)
Co-authored-by: Xuan-Son Nguyen <thichthat@gmail.com>
|
This will be why my CI/CD built versions of For the next person scratching their head: |
|
Thanks @timwalls. |
Two Dockerfile fixes:
1. vulkan.Dockerfile: replace apt-based python3.13/python3.13-dev
install with uv (Astral Python manager). Ubuntu 26.04 ('resolute')
does not ship python3.13-dev as a separate apt package, causing the
'full' stage to fail with exit code 100 ('Unable to locate package
python3.13-dev'). Using uv to install Python 3.13 independently of
the system package manager resolves this.
Also switches build-stage SSL dep from libcurl4-openssl-dev to
libssl-dev, consistent with upstream refactor (ggml-org#18828).
2. s390x.Dockerfile: replace libcurl4-openssl-dev with libssl-dev in
the build stage, matching upstream refactor (ggml-org#18828).
Fixes: vulkan linux/amd64 'full' stage failing with exit code 100
Refs: ggml-org#20530, ggml-org#18828
Two Dockerfile fixes:
1. vulkan.Dockerfile: replace apt-based python3.13/python3.13-dev
install with uv (Astral Python manager). Ubuntu 26.04 ('resolute')
does not ship python3.13-dev as a separate apt package, causing the
'full' stage to fail with exit code 100 ('Unable to locate package
python3.13-dev'). Using uv to install Python 3.13 independently of
the system package manager resolves this.
Also switches build-stage SSL dep from libcurl4-openssl-dev to
libssl-dev, consistent with upstream refactor (ggml-org#18828).
2. s390x.Dockerfile: replace libcurl4-openssl-dev with libssl-dev in
the build stage, matching upstream refactor (ggml-org#18828).
Fixes: vulkan linux/amd64 full stage failing with exit code 100
Refs: ggml-org#20530, ggml-org#18828
No description provided.