ollama/llama
Daniel Hiltgen bf4018b9ec
llama: Decouple patching script from submodule (#7139)
* Refine llama.cpp vendoring workflow tools

Switch from the sync.sh over to make based tooling

* Run new make sync and patch flow
2024-10-17 15:03:09 -07:00
..
ggml-cuda IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llamafile Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
make llama: Decouple patching script from submodule (#7139) 2024-10-17 15:03:09 -07:00
patches llama: Decouple patching script from submodule (#7139) 2024-10-17 15:03:09 -07:00
runner IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
.gitignore Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
base64.hpp Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
build-info.cpp llama: Decouple patching script from submodule (#7139) 2024-10-17 15:03:09 -07:00
clip.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
clip.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
common.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
common.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
Dockerfile Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
ggml-aarch64.c IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-aarch64.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-alloc.c IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-alloc.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-backend-impl.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-backend.c IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-backend.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-blas.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-blas.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-common.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-cpu-impl.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-cuda.cu IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-cuda.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-impl.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-metal.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-metal.metal IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-metal_darwin_arm64.m IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-quants.c IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml-quants.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml.c IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
ggml.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
json-schema-to-grammar.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
json-schema-to-grammar.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
json.hpp Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
llama-grammar.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama-grammar.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama-impl.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama-sampling.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama-sampling.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama-vocab.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama-vocab.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama.go llama: add compiler tags for cpu features (#7137) 2024-10-17 13:43:20 -07:00
llama.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llama_darwin.c Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
llama_darwin.go Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
llama_test.go Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
llava.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
llava.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
log.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
log.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
Makefile llama: Decouple patching script from submodule (#7139) 2024-10-17 15:03:09 -07:00
README.md llama: Decouple patching script from submodule (#7139) 2024-10-17 15:03:09 -07:00
sampling.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
sampling.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
sampling_ext.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
sampling_ext.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
sgemm.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
sgemm.h Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
stb_image.h Re-introduce the llama package (#5034) 2024-10-08 08:53:54 -07:00
unicode-data.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
unicode-data.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
unicode.cpp IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00
unicode.h IBM granite/granitemoe architecture support (#6760) 2024-10-17 11:59:52 -07:00

llama

This package integrates the llama.cpp library as a Go package and makes it easy to build it with tags for different CPU and GPU processors.

Supported:

  • CPU
  • avx, avx2
  • macOS Metal
  • Windows CUDA
  • Windows ROCm
  • Linux CUDA
  • Linux ROCm
  • Llava

Extra build steps are required for CUDA and ROCm on Windows since nvcc and hipcc both require using msvc as the host compiler. For these shared libraries are created:

  • ggml_cuda.dll on Windows or ggml_cuda.so on Linux
  • ggml_hipblas.dll on Windows or ggml_hipblas.so on Linux

Note: it's important that memory is allocated and freed by the same compiler (e.g. entirely by code compiled with msvc or mingw). Issues from this should be rare, but there are some places where pointers are returned by the CUDA or HIP runtimes and freed elsewhere, causing a a crash. In a future change the same runtime should be used in both cases to avoid crashes.

Building

go build .

AVX

go build -tags avx .

AVX2

# go doesn't recognize `-mfma` as a valid compiler flag
# see https://github.com/golang/go/issues/17895
go env -w "CGO_CFLAGS_ALLOW=-mfma|-mf16c"
go env -w "CGO_CXXFLAGS_ALLOW=-mfma|-mf16c"
go build -tags=avx,avx2 .

Linux

CUDA

Install the CUDA toolkit v11.3.1:

make ggml_cuda.so
go build -tags avx,cuda .

ROCm

Install the CUDA toolkit v11.3.1:

make ggml_hipblas.so
go build -tags avx,rocm .

Windows

Download w64devkit for a simple MinGW development environment.

CUDA

Install the CUDA toolkit v11.3.1 then build the cuda code:

make ggml_cuda.dll
go build -tags avx,cuda .

ROCm

Install ROCm 5.7.1.

make ggml_hipblas.dll
go build -tags avx,rocm .

Building runners

# build all runners for this platform
make -j

Vendoring

Ollama currently vendors llama.cpp and ggml through a vendoring model. While we generally strive to contribute changes back upstream to avoid drift, we cary a small set of patches which are applied to the tracking commit. A set of make targets are available to aid developers in updating to a newer tracking commit, or to work on changes.

Important

Prior to merging #7157 we continue to leverage a submodule for llama.cpp which establishes the tracking commit. After merging that PR a new manifest file we be utilized

If you update the vendoring code, start by running the following command to establish the tracking llama.cpp repo in the ./vendor/ directory.

make -C llama apply-patches

Updating Base Commit

Pin to new base commit

To update to a newer base commit, select the upstream git tag or commit

Important

After merging #7157 a manifest will be used instead of the submodule

cd llm/llama.cpp
git fetch
git checkout NEW_BASE_COMMIT
cd ..
git add llama.cpp

Applying patches

When updating to a newer base commit, the existing patches may not apply cleanly and require manual merge resolution.

Start by applying the patches. If any of the patches have conflicts, the git am will stop at the first failure.

make -C llama apply-patches

If you see an error message about a conflict, go into the ./vendor/ directory, and perform merge resolution using your preferred tool to the patch commit which failed. Save the file(s) and continue the patch series with git am --continue . If any additional patches fail, follow the same pattern until the full patch series is applied. Once finished, run a final create-patches and sync target to ensure everything is updated.

make -C llama create-patches sync

Build and test Ollama, and make any necessary changes to the Go code based on the new base commit. Submit your PR to the Ollama repo.

Generating Patches

When working on new fixes or features that impact vendored code, use the following model. First get a clean tracking repo with all current patches applied:

make -C llama apply-patches

Now edit the upstream native code in the ./vendor/ directory. You do not need to commit every change in order to build, a dirty working tree in the tracking repo is OK while developing. Simply save in your editor, and run the following to refresh the vendored code with your changes, build the backend(s) and build ollama:

make -C llama sync
make -C llama -j 8
go build .

Important

Do NOT run apply-patches while you're iterating as that will reset the tracking repo. It will detect a dirty tree and abort, but if your tree is clean and you accidentally ran this target, use git reflog to recover your commit(s).

Iterate until you're ready to submit PRs. Once your code is ready, commit a change in the ./vendor/ directory, then generate the patches for ollama with

make -C llama create-patches

Important

Once you have completed this step, it is safe to run apply-patches since your change is preserved in the patches.

In your ./vendor/ directory, create a branch, and cherry-pick the new commit to that branch, then submit a PR upstream to llama.cpp.

Commit the changes in the ollama repo and submit a PR to Ollama, which will include the vendored code update with your change, along with the patches.

After your PR upstream is merged, follow the Updating Base Commit instructions above, however first remove your patch before running apply-patches since the new base commit contains your change already.