From c35424418144b7a4eafd5ed7a28cbcb76445102a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 7 Apr 2024 15:37:45 +0200
Subject: [PATCH] local-ai: reduce closure by using cuda_nvcc
---
pkgs/by-name/lo/local-ai/package.nix | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index 8c5715e8841b..d3b317a867ae 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -67,9 +67,17 @@ let
else if with_clblas then "clblas"
else "";
+ inherit (cudaPackages) libcublas cuda_nvcc cuda_cccl cuda_cudart;
+
typedBuiltInputs =
lib.optionals with_cublas
- [ cudaPackages.cudatoolkit cudaPackages.cuda_cudart ]
+ [
+ cuda_nvcc # should be part of nativeBuildInputs
+ cuda_cudart
+ cuda_cccl
+ (lib.getDev libcublas)
+ (lib.getLib libcublas)
+ ]
++ lib.optionals with_clblas
[ clblast ocl-icd opencl-headers ]
++ lib.optionals with_openblas
@@ -430,7 +438,7 @@ let
"VERSION=v${version}"
"BUILD_TYPE=${BUILD_TYPE}"
]
- ++ lib.optional with_cublas "CUDA_LIBPATH=${cudaPackages.cuda_cudart}/lib"
+ ++ lib.optional with_cublas "CUDA_LIBPATH=${cuda_cudart}/lib"
++ lib.optional with_tts "PIPER_CGO_CXXFLAGS=-DSPDLOG_FMT_EXTERNAL=1";
buildPhase = ''
@@ -467,7 +475,7 @@ let
postFixup = ''
wrapProgram $out/bin/${pname} \
'' + lib.optionalString with_cublas ''
- --prefix LD_LIBRARY_PATH : "${cudaPackages.libcublas}/lib:${cudaPackages.cuda_cudart}/lib:/run/opengl-driver/lib" \
+ --prefix LD_LIBRARY_PATH : "${lib.getLib libcublas}/lib:${cuda_cudart}/lib:/run/opengl-driver/lib" \
'' + lib.optionalString with_clblas ''
--prefix LD_LIBRARY_PATH : "${clblast}/lib:${ocl-icd}/lib" \
'' + lib.optionalString with_openblas ''