diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 87f241d3b2ab..4b871998f851 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -9,21 +9,22 @@ # dependencies absl-py, + distutils, h5py, ml-dtypes, namex, numpy, + onnxruntime, optree, packaging, - rich, - tensorflow, pythonAtLeast, - distutils, + rich, + scikit-learn, + tensorflow, # tests dm-tree, jax, - jaxlib, pandas, pydot, pytestCheckHook, @@ -33,14 +34,14 @@ buildPythonPackage rec { pname = "keras"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; tag = "v${version}"; - hash = "sha256-qidY1OmlOYPKVoxryx1bEukA7IS6rPV4jqlnuf3y39w="; + hash = "sha256-sbAGiI1Ai0MPiQ8AMpa5qX6hYt/plsIqhn9xYLBb120="; }; build-system = [ @@ -53,9 +54,11 @@ buildPythonPackage rec { ml-dtypes namex numpy + onnxruntime optree packaging rich + scikit-learn tensorflow ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ]; @@ -66,7 +69,6 @@ buildPythonPackage rec { nativeCheckInputs = [ dm-tree - jaxlib jax pandas pydot @@ -81,6 +83,9 @@ buildPythonPackage rec { disabledTests = [ + # Requires onnx which is currently broken + "test_export_onnx" + # Tries to install the package in the sandbox "test_keras_imports" @@ -99,6 +104,9 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # Require onnx which is currently broken + "keras/src/export/onnx_test.py" + # Datasets are downloaded from the internet "integration_tests/dataset_tests" @@ -121,7 +129,6 @@ buildPythonPackage rec { # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects "keras/src/backend/tensorflow/saved_model_test.py" - "keras/src/export/export_lib_test.py" # KeyError: 'Unable to synchronously open object (bad object header version number)' "keras/src/saving/file_editor_test.py" diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index d84e66034801..759ce4b4b5dc 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -132,46 +133,51 @@ buildPythonPackage rec { ++ optional-dependencies.gym-continuous ++ optional-dependencies.rendering; - disabledTests = [ - # torchrl is incompatible with gymnasium>=1.0 - # https://github.com/pytorch/rl/discussions/2483 - "test_resetting_strategies" - "test_torchrl_to_gym" + disabledTests = + [ + # torchrl is incompatible with gymnasium>=1.0 + # https://github.com/pytorch/rl/discussions/2483 + "test_resetting_strategies" + "test_torchrl_to_gym" - # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called - "test_vecenvs_env" + # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called + "test_vecenvs_env" - # ValueError: Can't write images with one color channel. - "test_log_video" + # ValueError: Can't write images with one color channel. + "test_log_video" - # Those tests require the ALE environments (provided by unpackaged shimmy) - "test_collector_env_reset" - "test_gym" - "test_gym_fake_td" - "test_recorder" - "test_recorder_load" - "test_rollout" - "test_parallel_trans_env_check" - "test_serial_trans_env_check" - "test_single_trans_env_check" - "test_td_creation_from_spec" - "test_trans_parallel_env_check" - "test_trans_serial_env_check" - "test_transform_env" + # Those tests require the ALE environments (provided by unpackaged shimmy) + "test_collector_env_reset" + "test_gym" + "test_gym_fake_td" + "test_recorder" + "test_recorder_load" + "test_rollout" + "test_parallel_trans_env_check" + "test_serial_trans_env_check" + "test_single_trans_env_check" + "test_td_creation_from_spec" + "test_trans_parallel_env_check" + "test_trans_serial_env_check" + "test_transform_env" - # undeterministic - "test_distributed_collector_updatepolicy" - "test_timeit" + # undeterministic + "test_distributed_collector_updatepolicy" + "test_timeit" - # On a 24 threads system - # assert torch.get_num_threads() == max(1, init_threads - 3) - # AssertionError: assert 23 == 21 - "test_auto_num_threads" + # On a 24 threads system + # assert torch.get_num_threads() == max(1, init_threads - 3) + # AssertionError: assert 23 == 21 + "test_auto_num_threads" - # Flaky (hangs indefinitely on some CPUs) - "test_gae_multidim" - "test_gae_param_as_tensor" - ]; + # Flaky (hangs indefinitely on some CPUs) + "test_gae_multidim" + "test_gae_param_as_tensor" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Flaky (AssertionError) + "test_vecnorm_parallel_auto" + ]; meta = { description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning";