faiss: build with thrust from cuda_cccl

...instead of the separately built nvidia-thrust
This commit is contained in:
Someone Serge 2022-04-14 21:40:30 +03:00
parent 83b4eec362
commit 5901338013
No known key found for this signature in database
GPG Key ID: 7B0E3B1390D61DA4

View File

@ -6,8 +6,9 @@
, cmake
, cudaPackages ? { }
, cudaSupport ? config.cudaSupport or false
, pythonSupport ? true
, nvidia-thrust
, useThrustSourceBuild ? true
, pythonSupport ? true
, pythonPackages
, llvmPackages
, boost
@ -42,6 +43,10 @@ let
libcublas
libcurand
cuda_nvprof # cuda_profiler_api.h
] ++ lib.optionals useThrustSourceBuild [
nvidia-thrust
] ++ lib.optionals (!useThrustSourceBuild) [
cuda_cccl
];
};
in
@ -68,7 +73,6 @@ stdenv.mkDerivation {
llvmPackages.openmp
] ++ lib.optionals cudaSupport [
cudaJoined
nvidia-thrust
];
propagatedBuildInputs = lib.optionals pythonSupport [