llama-cpp: fix build version and commit info
This commit is contained in:
@@ -99,10 +99,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace ./ggml/src/ggml-metal/ggml-metal.m \
|
||||
--replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
|
||||
fi
|
||||
|
||||
substituteInPlace ./scripts/build-info.sh \
|
||||
--replace-fail 'build_number="0"' 'build_number="${finalAttrs.version}"' \
|
||||
--replace-fail 'build_commit="unknown"' "build_commit=\"$(cat COMMIT)\""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -124,6 +120,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
++ optionals vulkanSupport vulkanBuildInputs
|
||||
++ [ curl ];
|
||||
|
||||
preConfigure = ''
|
||||
prependToVar cmakeFlags "-DLLAMA_BUILD_COMMIT:STRING=$(cat COMMIT)"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
# -march=native is non-deterministic; override with platform-specific flags if needed
|
||||
(cmakeBool "GGML_NATIVE" false)
|
||||
@@ -137,6 +137,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
(cmakeBool "GGML_METAL" metalSupport)
|
||||
(cmakeBool "GGML_RPC" rpcSupport)
|
||||
(cmakeBool "GGML_VULKAN" vulkanSupport)
|
||||
(cmakeFeature "LLAMA_BUILD_NUMBER" finalAttrs.version)
|
||||
]
|
||||
++ optionals cudaSupport [
|
||||
(cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
|
||||
|
||||
Reference in New Issue
Block a user