Merge pull request #330191 from SomeoneSerge/fix/faissWithCuda

faiss: 1.7.4 -> 1.8.0

pkgs/by-name/sq/sqlite-vss/package.nix

@@ -43,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib;{
+    # Low maintenance mode, doesn't support up-to-date faiss
+    # https://github.com/NixOS/nixpkgs/pull/330191#issuecomment-2252965866
+    broken = lib.versionAtLeast faiss.version "1.8.0";
     description = "SQLite extension for efficient vector search based on Faiss";
     homepage = "https://github.com/asg017/sqlite-vss";
     changelog = "https://github.com/asg017/sqlite-vss/releases/tag/v${finalAttrs.version}";

pkgs/development/libraries/science/math/faiss/default.nix

@@ -1,7 +1,6 @@
 { lib
 , config
 , fetchFromGitHub
-, fetchpatch2
 , stdenv
 , cmake
 , cudaPackages ? { }
@@ -26,7 +25,7 @@
 
 let
   pname = "faiss";
-  version = "1.7.4";
+  version = "1.8.0";
 
   inherit (cudaPackages) flags backendStdenv;
 
@@ -51,18 +50,9 @@ stdenv.mkDerivation {
     owner = "facebookresearch";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M=";
+    hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Replace distutils with packaging for version checks
-      url = "https://github.com/facebookresearch/faiss/commit/c540e762ca0ecf8f43da0bfc215da148c5cf420e.patch";
-      includes = [ "faiss/python/loader.py" ];
-      hash = "sha256-yMHAXo0+oDXknSpv1fxUgil3R/WG1+vTLyxvwVR3VtE=";
-    })
-  ];
-
   postPatch = ''
     # Remove the following substituteInPlace when updating
     # to a release that contains change from PR
@@ -107,12 +97,14 @@ stdenv.mkDerivation {
     "-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}"
   ];
 
-  buildFlags = [
-    "faiss"
-    "demo_ivfpq_indexing"
-  ] ++ lib.optionals pythonSupport [
-    "swigfaiss"
-  ];
+
+  buildFlags =
+    [ "faiss" ]
+    # This is just a demo app used as a test.
+    # Disabled because linkage fails:
+    # https://github.com/facebookresearch/faiss/issues/3484
+    ++ lib.optionals (!cudaSupport) [ "demo_ivfpq_indexing" ]
+    ++ lib.optionals pythonSupport [ "swigfaiss" ];
 
   # pip wheel->pip install commands copied over from opencv4
 
@@ -123,7 +115,9 @@ stdenv.mkDerivation {
 
   postInstall = ''
     mkdir -p $demos/bin
-    cp ./demos/demo_ivfpq_indexing $demos/bin/
+    if [[ "$buildInputs" == *demo_ivfpq_indexing* ]] ; then
+      cp ./demos/demo_ivfpq_indexing $demos/bin/
+    fi
   '' + lib.optionalString pythonSupport ''
     mkdir -p $out/${pythonPackages.python.sitePackages}
     (cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache)