From 46f2664b6f89b0e2527e7eee38cea72b24092ea8 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 31 Mar 2023 17:42:08 +0300 Subject: [PATCH 1/3] faiss: 1.7.2 -> 1.7.4 --- pkgs/development/libraries/science/math/faiss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 9d0265a9ce88..2e14b0e0d3a6 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -31,7 +31,7 @@ assert cudaSupport -> nvidia-thrust.cudaSupport; let pname = "faiss"; - version = "1.7.2"; + version = "1.7.4"; inherit (cudaPackages) cudaFlags backendStdenv; inherit (cudaFlags) cudaCapabilities dropDot; @@ -64,7 +64,7 @@ stdenv.mkDerivation { owner = "facebookresearch"; repo = pname; rev = "v${version}"; - hash = "sha256-Tklf5AaqJbOs9qtBZVcxXPLAp+K54EViZLSOvEhmswg="; + hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M="; }; buildInputs = [ From 416dba1bbc1826abc793eb6c7a62e482e500fec1 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 28 Apr 2023 11:57:30 +0300 Subject: [PATCH 2/3] faiss.tests: format = "other" now required --- pkgs/development/libraries/science/math/faiss/tests.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/science/math/faiss/tests.nix b/pkgs/development/libraries/science/math/faiss/tests.nix index fdc8d9259e27..bd38dbfe9e31 100644 --- a/pkgs/development/libraries/science/math/faiss/tests.nix +++ b/pkgs/development/libraries/science/math/faiss/tests.nix @@ -11,6 +11,8 @@ buildPythonPackage { pname = "faiss-pytest-suite"; inherit (faiss) version; + format = "other"; + src = "${faiss.src}/tests"; dontBuild = true; From f66901ff23f23d45b240bae2395627ded4e20f42 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 4 May 2023 20:20:51 +0300 Subject: [PATCH 3/3] faiss.tests.pytest: disable a failing float-vs-double test --- pkgs/development/libraries/science/math/faiss/tests.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/science/math/faiss/tests.nix b/pkgs/development/libraries/science/math/faiss/tests.nix index bd38dbfe9e31..858a980bfeaf 100644 --- a/pkgs/development/libraries/science/math/faiss/tests.nix +++ b/pkgs/development/libraries/science/math/faiss/tests.nix @@ -23,6 +23,11 @@ buildPythonPackage { "test_contrib.py" ]; + disabledTests = [ + # https://github.com/facebookresearch/faiss/issues/2836 + "test_update_codebooks_with_double" + ]; + nativeCheckInputs = [ faiss pytestCheckHook