about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSamuel Ainsworth <skainsworth@gmail.com>2022-04-16 12:26:18 -0700
committerGitHub <noreply@github.com>2022-04-16 12:26:18 -0700
commit4c0422397f7ab2b301194704fc844681ec5f0fbe (patch)
tree72a52a66a220a229cd4a2a442960411ecd838ba6 /pkgs
parentf718d306566402ffb502001b2427629e4eadb12f (diff)
parentf539f7665db8e0e2ca1c424ddc2766af5dd32bef (diff)
Merge pull request #168545 from ndl/master
Fixed `dm-haiku` and `flax` builds
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/dm-haiku/default.nix2
-rw-r--r--pkgs/development/python-modules/flax/default.nix6
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix
index 8a6eabfde0f56..804233804a1fe 100644
--- a/pkgs/development/python-modules/dm-haiku/default.nix
+++ b/pkgs/development/python-modules/dm-haiku/default.nix
@@ -54,6 +54,8 @@ buildPythonPackage rec {
     # likely that's the reason the upstream uses TF-nightly for tests?
     # `nixpkgs` doesn't have the corresponding TF version packaged.
     "haiku/_src/integration/jax2tf_test.py"
+    # `TypeError: lax.conv_general_dilated requires arguments to have the same dtypes, got float32, float16`.
+    "haiku/_src/integration/numpy_inputs_test.py"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 1f1622dc1aead..42d506cccde32 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "flax";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rvdaxyf68qmm5d77gbizpcibyz2ic2pb2x7rgf7p8qwijyc39ws";
+    sha256 = "0j5ngdndm9nm49gcda7m36qzwk5lcbi4jnij9fi96vld54ip6f6v";
   };
 
   buildInputs = [ jaxlib ];
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     pytestCheckHook
     tensorflow
   ];
-  pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
+  pytestFlagsArray = [ "-n $NIX_BUILD_CORES -W ignore::FutureWarning" ];
 
   disabledTestPaths = [
     # Docs test, needs extra deps + we're not interested in it.