diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-08-03 17:53:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-03 17:53:34 +0200 |
commit | e271c47fcbe5223ee42a8374093d70ef40564ee8 (patch) | |
tree | bf7723422ae3e0d1076fa604ab46973afc1b967e /pkgs/development | |
parent | da53c1248ba3c56d0ee67d8ab1d0849f9453bbb5 (diff) | |
parent | 0f8185e3fcec403b30fdc07e0a28bf6f2408a079 (diff) | |
download | nixlib-e271c47fcbe5223ee42a8374093d70ef40564ee8.tar nixlib-e271c47fcbe5223ee42a8374093d70ef40564ee8.tar.gz nixlib-e271c47fcbe5223ee42a8374093d70ef40564ee8.tar.bz2 nixlib-e271c47fcbe5223ee42a8374093d70ef40564ee8.tar.lz nixlib-e271c47fcbe5223ee42a8374093d70ef40564ee8.tar.xz nixlib-e271c47fcbe5223ee42a8374093d70ef40564ee8.tar.zst nixlib-e271c47fcbe5223ee42a8374093d70ef40564ee8.zip |
Merge pull request #44390 from dotlambda/keras-2.2.2
python.pkgs.Keras: 2.2.0 -> 2.2.2
Diffstat (limited to 'pkgs/development')
3 files changed, 58 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix new file mode 100644 index 000000000000..e06a0b75b504 --- /dev/null +++ b/pkgs/development/python-modules/keras-applications/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, numpy, h5py }: + +buildPythonPackage rec { + pname = "Keras_Applications"; + version = "1.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "8c95300328630ae74fb0828b6fa38269a25c0228a02f1e5181753bfd48961f49"; + }; + + # Cyclic dependency: keras-applications requires keras, which requires keras-applications + postPatch = '' + sed -i "s/keras>=[^']*//" setup.py + ''; + + # No tests in PyPI tarball + doCheck = false; + + propagatedBuildInputs = [ numpy h5py ]; + + meta = with lib; { + description = "Reference implementations of popular deep learning models"; + homepage = https://github.com/keras-team/keras-applications; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix new file mode 100644 index 000000000000..043e43eb1843 --- /dev/null +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six }: + +buildPythonPackage rec { + pname = "Keras_Preprocessing"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "f5306554d2b454d825b36f35e327744f5477bd2ae21017f1a93b2097bed6757e"; + }; + + # Cyclic dependency: keras-preprocessing requires keras, which requires keras-preprocessing + postPatch = '' + sed -i "s/keras>=[^']*//" setup.py + ''; + + # No tests in PyPI tarball + doCheck = false; + + propagatedBuildInputs = [ numpy scipy six ]; + + meta = with lib; { + description = "Easy data preprocessing and data augmentation for deep learning models"; + homepage = https://github.com/keras-team/keras-preprocessing; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 3b221238f3af..ea699c9c04a9 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,15 +1,16 @@ { stdenv, buildPythonPackage, fetchPypi , pytest, pytestcov, pytestpep8, pytest_xdist , six, numpy, scipy, pyyaml, h5py +, keras-applications, keras-preprocessing }: buildPythonPackage rec { pname = "Keras"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "5b8499d157af217f1a5ee33589e774127ebc3e266c833c22cb5afbb0ed1734bf"; + sha256 = "468d98da104ec5c3dbb10c2ef6bb345ab154f6ca2d722d4c250ef4d6105de17a"; }; checkInputs = [ @@ -21,6 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pyyaml numpy scipy h5py + keras-applications keras-preprocessing ]; # Couldn't get tests working |