pythonPackages.tensorflow 1.0.0 -> 1.1.0

This commit is contained in:
Jean-Philippe Bernardy 2017-05-05 16:57:59 +02:00 committed by Frederik Rietdijk
parent 183cada05a
commit 7b5356ed5e

View File

@ -11,6 +11,7 @@
, six , six
, protobuf3_2 , protobuf3_2
, swig , swig
, werkzeug
, mock , mock
, gcc , gcc
, zlib , zlib
@ -31,7 +32,7 @@ assert ! (stdenv.isDarwin && cudaSupport);
buildPythonPackage rec { buildPythonPackage rec {
pname = "tensorflow"; pname = "tensorflow";
version = "1.0.0"; version = "1.1.0";
name = "${pname}-${version}"; name = "${pname}-${version}";
format = "wheel"; format = "wheel";
disabled = ! (isPy35 || isPy27); disabled = ! (isPy35 || isPy27);
@ -49,31 +50,31 @@ buildPythonPackage rec {
darwin.cpu = { darwin.cpu = {
py2 = { py2 = {
url = tfurl "mac" "cpu" "py2-none-any" ; url = tfurl "mac" "cpu" "py2-none-any" ;
sha256 = "15ayil28p20wkgpwkr4mz0imjxnf049xx4117jspg1qkjg2bn1b2"; sha256 = "1fgf26lw0liqxc9pywc8y2mj8l1mv48nhkav0pag9vavdacb9mqr";
}; };
py3 = { py3 = {
url = tfurl "mac" "cpu" "py3-none-any" ; url = tfurl "mac" "cpu" "py3-none-any" ;
sha256 = "1ynyhbm7yrp421364s49a1r3p83zxy74iiy5c4hx2xm5c4gs29an"; sha256 = "0z5p1fra7bih0vqn618i2w3vyy8d1rkc72k7bmjq0rw8msl717ia";
}; };
}; };
linux-x86_64.cpu = { linux-x86_64.cpu = {
py2 = { py2 = {
url = tfurl "linux" "cpu" "cp27-none-linux_x86_64"; url = tfurl "linux" "cpu" "cp27-none-linux_x86_64";
sha256 = "1hwhq1qhjrfkqfkxpsrq6mdmdibnqr3n7xvzkxp6gaqj73vn5ch2"; sha256 = "0ld3hqx3idxk0zcrvn3p9yqnmx09zsj3mw66jlfw6fkv5hznx8j2";
}; };
py3 = { py3 = {
url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64"; url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64";
sha256 = "0jx2mmlw0nxah9l25r46i7diqiv31qcz7855n250lsxfwcppy7y3"; sha256 = "0ahz9222rzqrk43lb9w4m351klkm6mlnnvw8xfqip28vbmymw90b";
}; };
}; };
linux-x86_64.cuda = { linux-x86_64.cuda = {
py2 = { py2 = {
url = tfurl "linux" "gpu" "cp27-none-linux_x86_64"; url = tfurl "linux" "gpu" "cp27-none-linux_x86_64";
sha256 = "0l8f71x3ama5a6idj05jrswlmp4yg37fxhz8lx2xmgk14aszbcy5"; sha256 = "1baa9jwr6f8f62dyx6isbw8yyrd0pi1dz1srjblfqsyk1x3pnfvh";
}; };
py3 = { py3 = {
url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64"; url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64";
sha256 = "12q7s0yk0h3r4glh0fhl1fcdx7jl8xikwwp04a1lcagasr51s36m"; sha256 = "0606m2awy0ifhniy8lsyhd0xc388dgrwksn87989xlgy90wpxi92";
}; };
}; };
}; };
@ -96,7 +97,7 @@ buildPythonPackage rec {
); );
propagatedBuildInputs = with stdenv.lib; propagatedBuildInputs = with stdenv.lib;
[ numpy six protobuf3_2 swig mock ] [ numpy six protobuf3_2 swig werkzeug mock ]
++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ]; ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ];
# Note that we need to run *after* the fixup phase because the # Note that we need to run *after* the fixup phase because the
@ -121,6 +122,7 @@ buildPythonPackage rec {
description = "TensorFlow helps the tensors flow"; description = "TensorFlow helps the tensors flow";
homepage = http://tensorflow.org; homepage = http://tensorflow.org;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ jpbernardy ];
platforms = with platforms; if cudaSupport then linux else linux ++ darwin; platforms = with platforms; if cudaSupport then linux else linux ++ darwin;
}; };
} }