diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-29 09:07:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-29 09:07:31 +0100 |
| commit | 40fe01a193edb01deddc0f4c19c02630c5b3dc8c (patch) | |
| tree | 92fdbad91c7939aa0060c1aea3ef148a6a067745 | |
| parent | d4e61b7dd8b5bceaa89db010fe85b5a6612dc046 (diff) | |
| parent | a06a03ed7c92c5482f6d260c596a4b593f201318 (diff) | |
| download | nixlib-40fe01a193edb01deddc0f4c19c02630c5b3dc8c.tar nixlib-40fe01a193edb01deddc0f4c19c02630c5b3dc8c.tar.gz nixlib-40fe01a193edb01deddc0f4c19c02630c5b3dc8c.tar.bz2 nixlib-40fe01a193edb01deddc0f4c19c02630c5b3dc8c.tar.lz nixlib-40fe01a193edb01deddc0f4c19c02630c5b3dc8c.tar.xz nixlib-40fe01a193edb01deddc0f4c19c02630c5b3dc8c.tar.zst nixlib-40fe01a193edb01deddc0f4c19c02630c5b3dc8c.zip | |
Merge pull request #299271 from josephst/fix-llamacpp
llama-cpp: merge upstream changes
| -rw-r--r-- | pkgs/by-name/ll/llama-cpp/package.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index ca2f4d5149d6..74be7dc68541 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -71,13 +71,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2481"; + version = "2568"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-40GSZZEnjM9L9KVVKdSKtBoSRy996l98ORM4NeltsSM="; + hash = "sha256-yBlLChtzfAi2TAGUO1zdnpHCvi5YDCzjdflQgTWh98Y="; }; postPatch = '' @@ -107,7 +107,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "BUILD_SHARED_LIBS" true) (cmakeBool "LLAMA_BLAS" blasSupport) (cmakeBool "LLAMA_CLBLAST" openclSupport) - (cmakeBool "LLAMA_CUBLAS" cudaSupport) + (cmakeBool "LLAMA_CUDA" cudaSupport) (cmakeBool "LLAMA_HIPBLAS" rocmSupport) (cmakeBool "LLAMA_METAL" metalSupport) (cmakeBool "LLAMA_MPI" mpiSupport) @@ -131,7 +131,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { # Should likely use `rocmPackages.clr.gpuTargets`. "-DAMDGPU_TARGETS=gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102" ] - ++ optionals metalSupport [ (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") ]; + ++ optionals metalSupport [ + (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") + (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true) + ]; # upstream plans on adding targets at the cmakelevel, remove those # additional steps after that |