faiss: build with thrust from cuda_cccl

...instead of the separately built nvidia-thrust
2023-04-02 01:35:38 +03:00
parent 83b4eec362
commit 5901338013
1 changed files with 6 additions and 2 deletions
@@ -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 [