diff options
| author | Someone Serge <sergei.kozlukov@aalto.fi> | 2022-04-14 21:40:30 +0300 |
|---|---|---|
| committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-04-02 01:35:38 +0300 |
| commit | 59013380135f1373a198b4eaf37782965d307258 (patch) | |
| tree | 131ad030859fd26d64a159d1f035aa874c921818 | |
| parent | 83b4eec3622f05a565fcf6976eaf92d4059d8a06 (diff) | |
faiss: build with thrust from cuda_cccl
...instead of the separately built nvidia-thrust
| -rw-r--r-- | pkgs/development/libraries/science/math/faiss/default.nix | 8 |
1 files 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 [ |