JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tensorflow: 1.15.0 -> 1.15.1

Browse Source 
* Apply glibc 2.3 patch
* build tensorflow with bazel_1
* Bump openssl version to 1.1
This commit is contained in:
Michael Lingelbach 2020-02-25 08:00:44 -08:00 committed by Frederik Rietdijk
parent ca7f750959
commit 34296980d1
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/build-bazel-package/default.nix
View File

@ -4,8 +4,13 @@
, lib , lib
}: }:
let
bazelPkg = bazel;
in
args@{ args@{
name name
, bazel ? bazelPkg
, bazelFlags ? [] , bazelFlags ? []
, bazelBuildFlags ? [] , bazelBuildFlags ? []
, bazelFetchFlags ? [] , bazelFetchFlags ? []

14
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin { stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
, addOpenGLRunpath , addOpenGLRunpath
# Python deps # Python deps
, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python , buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
@ -69,7 +69,7 @@ let
tfFeature = x: if x then "1" else "0"; tfFeature = x: if x then "1" else "0";
version = "1.15.0"; version = "1.15.1";
variant = if cudaSupport then "-gpu" else ""; variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}"; pname = "tensorflow${variant}";
@ -94,6 +94,7 @@ let
bazel-build = buildBazelPackage { bazel-build = buildBazelPackage {
name = "${pname}-${version}"; name = "${pname}-${version}";
bazel = bazel_1;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tensorflow"; owner = "tensorflow";
@ -114,6 +115,11 @@ let
url = "https://github.com/tensorflow/tensorflow/pull/29673/commits/498e35a3bfe38dd75cf1416a1a23c07c3b59e6af.patch"; url = "https://github.com/tensorflow/tensorflow/pull/29673/commits/498e35a3bfe38dd75cf1416a1a23c07c3b59e6af.patch";
sha256 = "1m2qmwv1ysqa61z6255xggwbq6mnxbig749bdvrhnch4zydxb4di"; 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 ./tf-1.15-bazel-1.0.patch
@ -291,9 +297,9 @@ let
# cudaSupport causes fetch of ncclArchive, resulting in different hashes # cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then sha256 = if cudaSupport then
"1rbg8w8pjf15hpvzrclsi19lhsrwdns6f8psb1wz35ay0ggdw8c0" "1p544yk7jcspgc4qr4amw11ds16c2an5yxvagx5pmwawz0s083pf"
else else
"0d8wq89iz9vrzvr971mgdclxxjcjr32r7aj817h019x3pc53qnwx"; "1dqbw3k3avqiy9xpgs44l6z65ab5rjjlxwig8z7gcl7fw9h6sbq9";
}; };
buildAttrs = { buildAttrs = {

2
pkgs/top-level/python-packages.nix
View File

@ -6671,7 +6671,7 @@ in {
cudatoolkit = pkgs.cudatoolkit_10; cudatoolkit = pkgs.cudatoolkit_10;
cudnn = pkgs.cudnn_cudatoolkit_10; cudnn = pkgs.cudnn_cudatoolkit_10;
nccl = pkgs.nccl_cudatoolkit_10; nccl = pkgs.nccl_cudatoolkit_10;
openssl = pkgs.openssl_1_0_2; openssl = pkgs.openssl_1_1;
inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
}; };