summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorOlivier Chafik <ochafik@users.noreply.github.com>2024-04-29 17:02:45 +0100
committerGitHub <noreply@github.com>2024-04-29 17:02:45 +0100
commitb8a7a5a90fd3187175d84227dad705ade395ba46 (patch)
tree68b6af3e23d7b8d70b4247ae96b72a5455dd2d40 /examples
parentd2c898f746a527f09effb061829e68b2e1812a28 (diff)
build(cmake): simplify instructions (`cmake -B build && cmake --build build ...`) (#6964)
* readme: cmake . -B build && cmake --build build * build: fix typo Co-authored-by: Jared Van Bortel <cebtenzzre@gmail.com> * build: drop implicit . from cmake config command * build: remove another superfluous . * build: update MinGW cmake commands * Update README-sycl.md Co-authored-by: Neo Zhang Jianyu <jianyu.zhang@intel.com> * build: reinstate --config Release as not the default w/ some generators + document how to build Debug * build: revert more --config Release * build: nit / remove -H from cmake example * build: reword debug instructions around single/multi config split --------- Co-authored-by: Jared Van Bortel <cebtenzzre@gmail.com> Co-authored-by: Neo Zhang Jianyu <jianyu.zhang@intel.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/main-cmake-pkg/README.md16
-rw-r--r--examples/server/README.md13
2 files changed, 13 insertions, 16 deletions
diff --git a/examples/main-cmake-pkg/README.md b/examples/main-cmake-pkg/README.md
index f599fbae..edf20d8d 100644
--- a/examples/main-cmake-pkg/README.md
+++ b/examples/main-cmake-pkg/README.md
@@ -17,11 +17,9 @@ In this case, CLBlast was already installed so the CMake package is referenced i
```cmd
git clone https://github.com/ggerganov/llama.cpp
cd llama.cpp
-mkdir build
-cd build
-cmake .. -DBUILD_SHARED_LIBS=OFF -DLLAMA_CLBLAST=ON -DCMAKE_PREFIX_PATH=C:/CLBlast/lib/cmake/CLBlast -G "Visual Studio 17 2022" -A x64
-cmake --build . --config Release
-cmake --install . --prefix C:/LlamaCPP
+cmake -B build -DBUILD_SHARED_LIBS=OFF -DLLAMA_CLBLAST=ON -DCMAKE_PREFIX_PATH=C:/CLBlast/lib/cmake/CLBlast -G "Visual Studio 17 2022" -A x64
+cmake --build build --config Release
+cmake --install build --prefix C:/LlamaCPP
```
### Build main-cmake-pkg
@@ -29,9 +27,7 @@ cmake --install . --prefix C:/LlamaCPP
```cmd
cd ..\examples\main-cmake-pkg
-mkdir build
-cd build
-cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH="C:/CLBlast/lib/cmake/CLBlast;C:/LlamaCPP/lib/cmake/Llama" -G "Visual Studio 17 2022" -A x64
-cmake --build . --config Release
-cmake --install . --prefix C:/MyLlamaApp
+cmake -B build -DBUILD_SHARED_LIBS=OFF -DCMAKE_PREFIX_PATH="C:/CLBlast/lib/cmake/CLBlast;C:/LlamaCPP/lib/cmake/Llama" -G "Visual Studio 17 2022" -A x64
+cmake --build build --config Release
+cmake --install build --prefix C:/MyLlamaApp
```
diff --git a/examples/server/README.md b/examples/server/README.md
index 918ac129..b96a4444 100644
--- a/examples/server/README.md
+++ b/examples/server/README.md
@@ -74,15 +74,18 @@ page cache before using this. See https://github.com/ggerganov/llama.cpp/issues/
- Using `make`:
```bash
- make
+ make server
```
- Using `CMake`:
```bash
- cmake --build . --config Release
+ cmake -B build
+ cmake --build build --config Release -t server
```
+ Binary is at `./build/bin/server`
+
## Build with SSL
`server` can also be built with SSL support using OpenSSL 3
@@ -99,10 +102,8 @@ page cache before using this. See https://github.com/ggerganov/llama.cpp/issues/
- Using `CMake`:
```bash
- mkdir build
- cd build
- cmake .. -DLLAMA_SERVER_SSL=ON
- make server
+ cmake -B build -DLLAMA_SERVER_SSL=ON
+ cmake --build build --config Release -t server
```
## Quick Start