From 01cf5e23f1707ec302d186b3b422ab025dbe3b85 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 20 Jan 2025 22:33:10 -0500 Subject: [PATCH 1/5] python312Packages.jaxopt: disable failing test --- pkgs/development/python-modules/jaxopt/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 211afb5ee57a..dcabae9d459a 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -79,6 +79,9 @@ buildPythonPackage rec { # AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06 # https://github.com/google/jaxopt/issues/618 "test_binary_logit_log_likelihood" + + # AssertionError (flaky numerical tests) + "test_logreg_with_intercept_manual_loop3" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # https://github.com/google/jaxopt/issues/577 From fec45dfe9768106c6d662ba9df04ba125d4e68e8 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 20 Jan 2025 22:34:57 -0500 Subject: [PATCH 2/5] python312Packages.jaxopt: remove redundant disables --- pkgs/development/python-modules/jaxopt/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index dcabae9d459a..c3347f2dfbdd 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -84,11 +84,6 @@ buildPythonPackage rec { "test_logreg_with_intercept_manual_loop3" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # https://github.com/google/jaxopt/issues/577 - "test_binary_logit_log_likelihood" - "test_solve_sparse" - "test_logreg_with_intercept_manual_loop3" - # Flaky (AssertionError) "test_inv_hessian_product_pytree3" @@ -103,8 +98,6 @@ buildPythonPackage rec { "test_dtype_consistency" # AssertionError (flaky numerical tests) - "test_logreg_with_intercept_manual_loop3" - "test_binary_logit_log_likelihood" "test_inv_hessian_product_pytree3" ]; From 533fe938c482608b42cec00388781009d6256c54 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 20 Jan 2025 22:37:24 -0500 Subject: [PATCH 3/5] python312Packages.jaxopt: unify disables --- .../python-modules/jaxopt/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index c3347f2dfbdd..f991aaf18265 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -76,29 +75,18 @@ buildPythonPackage rec { # https://github.com/google/jaxopt/issues/592 "test_solve_sparse" + # https://github.com/google/jaxopt/issues/593 + # Makes the test suite crash + "test_dtype_consistency" + # AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06 # https://github.com/google/jaxopt/issues/618 "test_binary_logit_log_likelihood" # AssertionError (flaky numerical tests) "test_logreg_with_intercept_manual_loop3" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # Flaky (AssertionError) "test_inv_hessian_product_pytree3" - - # https://github.com/google/jaxopt/issues/593 - # Makes the test suite crash - "test_dtype_consistency" - # AssertionError: Array(0.01411963, dtype=float32) not less than or equal to 0.01 "test_multiclass_logreg6" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - "test_dtype_consistency" - - # AssertionError (flaky numerical tests) - "test_inv_hessian_product_pytree3" ]; meta = { From 6aa6e67026be204be65e9221b2c444a671b1dd20 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 20 Jan 2025 22:38:12 -0500 Subject: [PATCH 4/5] python312Packages.jaxopt: add failures from hdyra --- pkgs/development/python-modules/jaxopt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index f991aaf18265..341fc1880e69 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -87,6 +87,8 @@ buildPythonPackage rec { "test_logreg_with_intercept_manual_loop3" "test_inv_hessian_product_pytree3" "test_multiclass_logreg6" + "test_Rosenbrock2" + "test_Rosenbrock5" ]; meta = { From 9e701f602012810e39d05961492bedd2a7bf044c Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Mon, 20 Jan 2025 22:43:18 -0500 Subject: [PATCH 5/5] python312Packages.jaxopt: add string escape patch --- .../python-modules/jaxopt/default.nix | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 341fc1880e69..dbab34993a5c 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -42,6 +42,12 @@ buildPythonPackage rec { url = "https://github.com/google/jaxopt/commit/48b09dc4cc93b6bc7e6764ed5d333f9b57f3493b.patch"; hash = "sha256-v+617W7AhxA1Dzz+DBtljA4HHl89bRTuGi1QfatobNY="; }) + # fix invalid string escape sequences + (fetchpatch { + name = "fix-escape-sequences.patch"; + url = "https://github.com/google/jaxopt/commit/f5bb530f5f000d0739c9b26eee2d32211eb99f40.patch"; + hash = "sha256-E0ZXIfzWxKHuiBn4lAWf7AjNtll7OJU/NGZm6PTmhzo="; + }) ]; build-system = [ setuptools ]; @@ -70,26 +76,25 @@ buildPythonPackage rec { "jaxopt.tree_util" ]; - disabledTests = - [ - # https://github.com/google/jaxopt/issues/592 - "test_solve_sparse" + disabledTests = [ + # https://github.com/google/jaxopt/issues/592 + "test_solve_sparse" - # https://github.com/google/jaxopt/issues/593 - # Makes the test suite crash - "test_dtype_consistency" + # https://github.com/google/jaxopt/issues/593 + # Makes the test suite crash + "test_dtype_consistency" - # AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06 - # https://github.com/google/jaxopt/issues/618 - "test_binary_logit_log_likelihood" + # AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06 + # https://github.com/google/jaxopt/issues/618 + "test_binary_logit_log_likelihood" - # AssertionError (flaky numerical tests) - "test_logreg_with_intercept_manual_loop3" - "test_inv_hessian_product_pytree3" - "test_multiclass_logreg6" - "test_Rosenbrock2" - "test_Rosenbrock5" - ]; + # AssertionError (flaky numerical tests) + "test_logreg_with_intercept_manual_loop3" + "test_inv_hessian_product_pytree3" + "test_multiclass_logreg6" + "test_Rosenbrock2" + "test_Rosenbrock5" + ]; meta = { homepage = "https://jaxopt.github.io";