From 59013380135f1373a198b4eaf37782965d307258 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 14 Apr 2022 21:40:30 +0300 Subject: faiss: build with thrust from cuda_cccl ...instead of the separately built nvidia-thrust --- pkgs/development/libraries/science/math/faiss/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 48d22bf178edc..7ffd8f947e48d 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -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 [ -- cgit 1.4.1