Skip to content

Commit

Permalink
llama.cpp in cmake and not submodule?
Browse files Browse the repository at this point in the history
  • Loading branch information
asg017 committed Nov 22, 2024
1 parent b38db9e commit a650a86
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-python@v5
with:
python-version: "3.12"
Expand All @@ -26,8 +24,6 @@ jobs:
runs-on: macos-12
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- run: make loadable
- run: /usr/local/opt/python@3/libexec/bin/python -m pip install --break-system-packages pytest numpy; make test-loadable python=/usr/local/opt/python@3/libexec/bin/python
- uses: actions/upload-artifact@v4
Expand All @@ -38,8 +34,6 @@ jobs:
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- run: make loadable
- run: /opt/homebrew/opt/python3/libexec/bin/python -m pip install pytest numpy --break-system-packages; make test-loadable python=/opt/homebrew/opt/python3/libexec/bin/python
- uses: actions/upload-artifact@v4
Expand All @@ -50,8 +44,6 @@ jobs:
runs-on: windows-2019
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: ilammy/msvc-dev-cmd@v1
- uses: actions/setup-python@v5
with:
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ FetchContent_MakeAvailable(sqlite_amalgamation)
set(LLAMA_METAL OFF)
set(LLAMA_STATIC ON)
set(LLAMA_OPENMP OFF)
set(LLAMA_CPP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vendor/llama.cpp")
add_subdirectory(${LLAMA_CPP_DIR} ${CMAKE_BINARY_DIR}/llama.cpp)

ExternalProject_Add(
"llama.cpp"
GIT_REPOSITORY git@github.com:ggerganov/llama.cpp.git
GIT_TAG b3091
)


# sqlite-lembed loadable
Expand Down

0 comments on commit a650a86

Please sign in to comment.