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

common: llama_load_model_from_url using --model-url #6098

Merged
merged 53 commits into from
Mar 17, 2024
Merged

common: llama_load_model_from_url using --model-url #6098

merged 53 commits into from
Mar 17, 2024

Commits on Mar 16, 2024

  1. common: introduce llama_load_model_from_url to download model from hf… 

    … url using libopenssl only
    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    3221ab0 View commit details
    Browse the repository at this point in the history

  2. common: llama_load_model_from_url witch to libcurl dependency

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    a0ebdfc View commit details
    Browse the repository at this point in the history

  3. common: PR feedback, rename the definition to LLAMA_USE_CURL

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    42b25da View commit details
    Browse the repository at this point in the history

  4. common: LLAMA_USE_CURL in make toolchain

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    7e78285 View commit details
    Browse the repository at this point in the history

  5. ci: compile the server with curl, add make option curl example in def… 

    …ault cmake
    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    df0d822 View commit details
    Browse the repository at this point in the history

  6. llama_load_model_from_url: try to make the windows build passing

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    80bec98 View commit details
    Browse the repository at this point in the history

  7. Update Makefile 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    2c3a00e View commit details
    Browse the repository at this point in the history

  8. llama_load_model_from_url: typo

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    4135d4a View commit details
    Browse the repository at this point in the history

  9. llama_load_model_from_url: download the file only if modified based o… 

    …n etag and last-modified http headers
    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    5d99f32 View commit details
    Browse the repository at this point in the history

  10. ci: build, fix the default build to use LLAMA_CURL

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    921e4af View commit details
    Browse the repository at this point in the history

  11. llama_load_model_from_url: cleanup code

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    6633689 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into hp/download-model-from-hf 

    # Conflicts:
#	common/common.cpp
    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    1430e89 View commit details
    Browse the repository at this point in the history

  13. Update examples/server/README.md 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    e84206d View commit details
    Browse the repository at this point in the history

  14. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    4bc47b7 View commit details
    Browse the repository at this point in the history

  15. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    8751bd0 View commit details
    Browse the repository at this point in the history

  16. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    f53bfd5 View commit details
    Browse the repository at this point in the history

  17. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    b088122 View commit details
    Browse the repository at this point in the history

  18. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    f22456d View commit details
    Browse the repository at this point in the history

  19. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    9565ae3 View commit details
    Browse the repository at this point in the history

  20. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    330e28d View commit details
    Browse the repository at this point in the history

  21. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    89ab37a View commit details
    Browse the repository at this point in the history

  22. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    be561a7 View commit details
    Browse the repository at this point in the history

  23. Update common/common.cpp 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    eb9e52a View commit details
    Browse the repository at this point in the history

  24. Update examples/main/README.md 

    Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
    @phymbert @ggerganov
    phymbert and ggerganov authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    b0b49e0 View commit details
    Browse the repository at this point in the history

  25. llama_load_model_from_url: fix compilation warning, clearer logging

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    545fef6 View commit details
    Browse the repository at this point in the history

  26. server: tests: add --model-url tests

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    4fadb07 View commit details
    Browse the repository at this point in the history

  27. llama_load_model_from_url: coherent clearer logging

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    124c474 View commit details
    Browse the repository at this point in the history

  28. common: CMakeLists.txt fix typo in logging when lib curl is not found

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    064dc07 View commit details
    Browse the repository at this point in the history

  29. ci: tests: windows tests add libcurl

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    838178a View commit details
    Browse the repository at this point in the history

  30. ci: tests: windows tests add libcurl

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    176f039 View commit details
    Browse the repository at this point in the history

  31. ci: build: add libcurl in default make toolchain step

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    5df5605 View commit details
    Browse the repository at this point in the history

  32. llama_load_model_from_url: PR feedback, use snprintf instead of strnc… 

    …p and strncat
    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    78812c6 View commit details
    Browse the repository at this point in the history

  33. ci: build: add libcurl in default make toolchain step for tests

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    1ad5a45 View commit details
    Browse the repository at this point in the history

  34. common: fix windows build caused by double windows.h import

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    22b3bb3 View commit details
    Browse the repository at this point in the history

  35. build: move the make build with env LLAMA_CURL to a dedicated place

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    e6848ab View commit details
    Browse the repository at this point in the history

  36. build: introduce cmake option LLAMA_CURL to trigger libcurl linking t… 

    …o be coherent with the make toolchain
    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    d81acb6 View commit details
    Browse the repository at this point in the history

  37. build: move the make build with env LLAMA_CURL to a dedicated place

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    dbd9691 View commit details
    Browse the repository at this point in the history

  38. llama_load_model_from_url: minor spacing and log message changes

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    9da4eec View commit details
    Browse the repository at this point in the history

  39. ci: build: fix ubuntu-focal-make-curl

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    89d3483 View commit details
    Browse the repository at this point in the history

  40. ci: build: try to fix the windows build

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    13d8817 View commit details
    Browse the repository at this point in the history

  41. common: remove old dependency to openssl

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    1ddaf71 View commit details
    Browse the repository at this point in the history

  42. common: fix build

    @phymbert
    phymbert committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    73b4b44 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. common: fix windows build

    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    a3ed3d4 View commit details
    Browse the repository at this point in the history

  2. common: fix windows tests

    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    5e66ec8 View commit details
    Browse the repository at this point in the history

  3. common: fix windows tests

    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    9ca4acc View commit details
    Browse the repository at this point in the history

  4. common: llama_load_model_from_url windows set CURLOPT_SSL_OPTIONS, CU… 

    …RLSSLOPT_NATIVE_CA
    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    c1b002e View commit details
    Browse the repository at this point in the history

  5. ci: tests: print server logs in case of scenario failure

    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    cff7faa View commit details
    Browse the repository at this point in the history

  6. common: llama_load_model_from_url: make it working on windows: disabl… 

    …e global curl function, use a write callback.
    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    4fe431d View commit details
    Browse the repository at this point in the history

  7. ci: tests: increase timeout for windows

    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    47a9e5d View commit details
    Browse the repository at this point in the history

  8. common: fix typo

    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    31272c6 View commit details
    Browse the repository at this point in the history

  9. common: llama_load_model_from_url use a temporary file for downloading

    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    f902ab6 View commit details
    Browse the repository at this point in the history

  10. common: llama_load_model_from_url delete previous file before downloa… 

    …ding
    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    b24f30f View commit details
    Browse the repository at this point in the history

  11. ci: tests: fix behavior on windows

    @phymbert
    phymbert committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    fcf327f View commit details
    Browse the repository at this point in the history