diff options
Diffstat (limited to 'pkgs/development/python-modules/tensorflow/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/tensorflow/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index a9f3ebf9e486..cdf659a74dc7 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +{ stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin , addOpenGLRunpath # Python deps , buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python @@ -7,7 +7,7 @@ , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta , functools32 , opt-einsum -, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator +, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1_15_1 # Common deps , git, swig, which, binutils, glibcLocales, cython # Common libraries @@ -69,7 +69,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "1.15.0"; + version = "1.15.1"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -94,6 +94,7 @@ let bazel-build = buildBazelPackage { name = "${pname}-${version}"; + bazel = bazel_1; src = fetchFromGitHub { owner = "tensorflow"; @@ -114,6 +115,11 @@ let url = "https://github.com/tensorflow/tensorflow/pull/29673/commits/498e35a3bfe38dd75cf1416a1a23c07c3b59e6af.patch"; sha256 = "1m2qmwv1ysqa61z6255xggwbq6mnxbig749bdvrhnch4zydxb4di"; }) + (fetchpatch { + name = "backport-pr-18950.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch"; + sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; + }) ./tf-1.15-bazel-1.0.patch @@ -290,10 +296,12 @@ let TF_SYSTEM_LIBS = null; # cudaSupport causes fetch of ncclArchive, resulting in different hashes + # FIXME: can't (re)produce this output with current bazel. + # FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35 sha256 = if cudaSupport then - "1rbg8w8pjf15hpvzrclsi19lhsrwdns6f8psb1wz35ay0ggdw8c0" + "0gyhjvzshgj59mbns8njlfl9qpz4sdg4j0xs2dva0w2nql7cr7im" else - "0d8wq89iz9vrzvr971mgdclxxjcjr32r7aj817h019x3pc53qnwx"; + "04jvg3mc2si4xdbszc1vnw1rmf22p7snbjphmnklp7bc39jxkcrz"; }; buildAttrs = { @@ -368,7 +376,7 @@ in buildPythonPackage { numpy six protobuf - tensorflow-estimator + tensorflow-estimator_1_15_1 termcolor wrapt grpcio |