From b044544e0ac521c362f4e46d1354ac54496acea6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 10 Aug 2024 10:43:55 +0200 Subject: [PATCH 1/2] python312Packages.blackjax: 1.2.2 -> 1.2.3 Diff: https://github.com/blackjax-devs/blackjax/compare/refs/tags/1.2.2...1.2.3 Changelog: https://github.com/blackjax-devs/blackjax/releases/tag/1.2.3 --- .../python-modules/blackjax/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index fa4ef1b19f06..9f7917738665 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -1,23 +1,30 @@ { lib, - stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, - pytest-xdist, - pytestCheckHook, + + # build-system setuptools-scm, + + # dependencies fastprogress, jax, jaxlib, jaxopt, optax, typing-extensions, + + # checks + pytestCheckHook, + pytest-xdist, + + stdenv, }: buildPythonPackage rec { pname = "blackjax"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +33,7 @@ buildPythonPackage rec { owner = "blackjax-devs"; repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-W89L/3bpvecZdCpLCQOppev+fPc+SXd/T+zZLBH2wJs="; + hash = "sha256-f1piE79TLVLtIe9/DaLhXss/ifhU719nEylyl70SVJc="; }; build-system = [ setuptools-scm ]; From ebd5579dbf3b3ace97e97e020726c128083e2e71 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 10 Aug 2024 12:27:33 +0200 Subject: [PATCH 2/2] python312Packages.jaxopt: skip failing tests on darwin --- pkgs/development/python-modules/jaxopt/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 83a847b5a2f4..8159533fc203 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -86,13 +86,21 @@ buildPythonPackage rec { "test_dtype_consistency" # AssertionError: Array(0.01411963, dtype=float32) not less than or equal to 0.01 "test_multiclass_logreg6" + ] + ++ lib.optionals stdenv.isDarwin [ + # Fatal Python error: Aborted + "test_dtype_consistency" + + # AssertionError (flaky numerical tests) + "test_logreg_with_intercept_manual_loop3" + "test_binary_logit_log_likelihood" ]; - meta = with lib; { + meta = { homepage = "https://jaxopt.github.io"; description = "Hardware accelerated, batchable and differentiable optimizers in JAX"; changelog = "https://github.com/google/jaxopt/releases/tag/jaxopt-v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; }; }