diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index 1ef78166571c..42022b15ebe9 100644 --- a/pkgs/development/python-modules/ax-platform/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -30,14 +30,14 @@ buildPythonPackage (finalAttrs: { pname = "ax-platform"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; src = fetchFromGitHub { owner = "facebook"; repo = "ax"; tag = finalAttrs.version; - hash = "sha256-zIK3D7QSkfzAxySumdxsA3tiPWYbP9E6SS21837H4ZY="; + hash = "sha256-ZeYoLOPF2D1bk89V5/WO/v0UCtDisbAOOL/Su9sB2Fg="; }; env.ALLOW_BOTORCH_LATEST = "1"; @@ -120,8 +120,8 @@ buildPythonPackage (finalAttrs: { # broken with sqlalchemy 2 "test_sql_storage" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # flaky on x86 + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # flaky "test_gen_with_expanded_parameter_space" ]; diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index fb297754b330..827e86b7151a 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -29,14 +29,14 @@ buildPythonPackage (finalAttrs: { pname = "botorch"; - version = "0.17.0"; + version = "0.17.2"; pyproject = true; src = fetchFromGitHub { owner = "meta-pytorch"; repo = "botorch"; tag = "v${finalAttrs.version}"; - hash = "sha256-NDdXsmVdrTEXMXXVf89EkGXVOYnEcXwtzarB5niTNaw="; + hash = "sha256-KWkRdgOAhWoVRoBn0XvKhTQX3KPHJrzqWoiaKrYzi7o="; }; build-system = [ @@ -82,10 +82,19 @@ buildPythonPackage (finalAttrs: { # RuntimeError: Boolean value of Tensor with more than one value is ambiguous "test_optimize_acqf_mixed_binary_only" ] - ++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ # stuck tests on hydra "test_moo_predictive_entropy_search" ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # RuntimeError: Failed to initialize cpuinfo! + "test_append_features" + "test_delattr_ctx" + "test_input_perturbation" + "test_module_rollback_ctx" + "test_parameter_rollback_ctx" + "test_zero_grad_ctx" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # RuntimeError: required keyword attribute 'value' has the wrong type "test_posterior_in_trace_mode" diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 41df6ade307c..a6cacfc63e87 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -9,7 +9,6 @@ setuptools-scm, # dependencies - jaxtyping, linear-operator, mpmath, scikit-learn, @@ -22,31 +21,22 @@ buildPythonPackage (finalAttrs: { pname = "gpytorch"; - version = "1.15.1"; + version = "1.15.2"; pyproject = true; src = fetchFromGitHub { owner = "cornellius-gp"; repo = "gpytorch"; tag = "v${finalAttrs.version}"; - hash = "sha256-ftiAY02K0EwVQZufk8xR+/21A+2ONWchuWPF3a5lRW0="; + hash = "sha256-1CavS+qrV8YqnsT87GjmJV2LOtvExFYQE5YpYZEw9ts="; }; - # AttributeError: module 'numpy' has no attribute 'trapz' - postPatch = '' - substituteInPlace gpytorch/kernels/spectral_mixture_kernel.py \ - --replace-fail \ - "np.trapz(emp_spect, freq)" \ - "np.trapezoid(emp_spect, freq)" - ''; - build-system = [ setuptools setuptools-scm ]; dependencies = [ - jaxtyping linear-operator mpmath scikit-learn @@ -67,6 +57,11 @@ buildPythonPackage (finalAttrs: { "test_optimization_optimal_error" # https://github.com/cornellius-gp/gpytorch/issues/2396 "test_t_matmul_matrix" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # RuntimeError: Failed to initialize cpuinfo! + "test_dtype_value_context" + "test_half" ]; disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ diff --git a/pkgs/development/python-modules/linear-operator/default.nix b/pkgs/development/python-modules/linear-operator/default.nix index 7a00d4115e69..b831a21cb603 100644 --- a/pkgs/development/python-modules/linear-operator/default.nix +++ b/pkgs/development/python-modules/linear-operator/default.nix @@ -1,26 +1,31 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - jaxtyping, - pytestCheckHook, - scipy, + + # build-system setuptools, setuptools-scm, + + # dependencies + scipy, torch, - typeguard, + + # tests + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "linear-operator"; - version = "0.6"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "cornellius-gp"; repo = "linear_operator"; - tag = "v${version}"; - hash = "sha256-qBC7wrpcZ8ViFqIOSd2F8heeBRQxrac/l33srHhNaIM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Ghe4a3zMSvTv3J6ROd1RLELK+k24/rO8p+XUPVsl090="; }; build-system = [ @@ -29,15 +34,8 @@ buildPythonPackage rec { ]; dependencies = [ - jaxtyping scipy torch - typeguard - ]; - - pythonRelaxDeps = [ - "jaxtyping" - "typeguard" ]; pythonImportsCheck = [ "linear_operator" ]; @@ -49,12 +47,17 @@ buildPythonPackage rec { "test_matmul_matrix_broadcast" "test_solve_matrix_broadcast" "test_svd" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # RuntimeError: Failed to initialize cpuinfo! + "test_half" ]; meta = { description = "LinearOperator implementation to wrap the numerical nuts and bolts of GPyTorch"; - homepage = "https://github.com/cornellius-gp/linear_operator/"; + homepage = "https://github.com/cornellius-gp/linear_operator"; + changelog = "https://github.com/cornellius-gp/linear_operator/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ veprbl ]; }; -} +})