gentoo resync : 15.12.2019

8 files changed, 38 insertions, 211 deletions

diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0001-systemlibs-unbundle-enum34.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0001-systemlibs-unbundle-enum34.patch
deleted file mode 100644
index a220bca57d69..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0001-systemlibs-unbundle-enum34.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2956ac52f8495e08d5328f672c1366c52c9f8cfe Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Wed, 29 May 2019 19:27:11 +0800
-Subject: [PATCH] systemlibs: unbundle enum34
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- tensorflow/workspace.bzl                     |  1 +
- third_party/systemlibs/enum34.BUILD          | 14 ++++++++++++++
- third_party/systemlibs/syslibs_configure.bzl |  1 +
- 3 files changed, 16 insertions(+)
- create mode 100644 third_party/systemlibs/enum34.BUILD
-
-diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
-index 55d7eb9371..a53a12e720 100755
---- a/tensorflow/workspace.bzl
-+++ b/tensorflow/workspace.bzl
-@@ -346,6 +346,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
-         ],
-         sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1",
-         build_file = clean_dep("//third_party:enum34.BUILD"),
-+        system_build_file = clean_dep("//third_party/systemlibs:enum34.BUILD"),
-         strip_prefix = "enum34-1.1.6/enum",
-     )
- 
-diff --git a/third_party/systemlibs/enum34.BUILD b/third_party/systemlibs/enum34.BUILD
-new file mode 100644
-index 0000000000..de14bd5641
---- /dev/null
-+++ b/third_party/systemlibs/enum34.BUILD
-@@ -0,0 +1,14 @@
-+# Description:
-+#   enum34 provides a backport of the enum module for Python 2.
-+
-+licenses(["notice"])  # MIT
-+
-+filegroup(
-+    name = "LICENSE",
-+    visibility = ["//visibility:public"],
-+)
-+
-+py_library(
-+    name = "enum",
-+    visibility = ["//visibility:public"],
-+)
-diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
-index a2d4123fd6..16f3b09697 100644
---- a/third_party/systemlibs/syslibs_configure.bzl
-+++ b/third_party/systemlibs/syslibs_configure.bzl
-@@ -21,6 +21,7 @@ VALID_LIBS = [
-     "curl",
-     "cython",
-     "double_conversion",
-+    "enum34_archive",
-     "flatbuffers",
-     "gast_archive",
-     "gif_archive",
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch
deleted file mode 100644
index 566f28743764..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5176e1feb22fac2f9d4ca9d8ad261ef6893d3c76 Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Mon, 29 Jul 2019 01:17:06 +0800
-Subject: [PATCH 2/3] install_headers: fix paths of generated headers
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- tensorflow/BUILD | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tensorflow/BUILD b/tensorflow/BUILD
-index a04ddf9f8a..1e0cc9207b 100644
---- a/tensorflow/BUILD
-+++ b/tensorflow/BUILD
-@@ -703,8 +703,8 @@ genrule(
-     mkdir $@
-     for f in $(SRCS); do
-       d="$${f%/*}"
--      d="$${d#bazel-out*genfiles/}"
--      d="$${d#*external/eigen_archive/}"
-+      d="$${d#bazel-out/*/genfiles/}"
-+      d="$${d#bazel-out/*/bin/}"
- 
-       if [[ $${d} == *local_config_* ]]; then
-         continue
-@@ -716,6 +716,9 @@ genrule(
-         if [[ $${TF_SYSTEM_LIBS:-} == *$${extname}* ]]; then
-           continue
-         fi
-+
-+        d="$${d#*external/farmhash_archive/src}"
-+        d="$${d#*external/$${extname}/}"
-       fi
- 
-       mkdir -p "$@/$${d}"
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch
deleted file mode 100644
index 3ccdf4933732..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 22275f7dbfa2d483ed4778427b137e83144bac3d Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 2 Aug 2019 20:06:33 +0800
-Subject: [PATCH 3/3] systemlibs: jsoncpp: update header symlinks for jsoncpp
- 1.9
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- third_party/systemlibs/jsoncpp.BUILD | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/systemlibs/jsoncpp.BUILD b/third_party/systemlibs/jsoncpp.BUILD
-index 526fd0c418..7d54f9289b 100644
---- a/third_party/systemlibs/jsoncpp.BUILD
-+++ b/third_party/systemlibs/jsoncpp.BUILD
-@@ -6,6 +6,8 @@ filegroup(
- )
- 
- HEADERS = [
-+    "include/json/allocator.h",
-+    "include/json/assertions.h",
-     "include/json/autolink.h",
-     "include/json/config.h",
-     "include/json/features.h",
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch
deleted file mode 100644
index 5e65c413e776..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a8144189b257d515f1eb72a4b50098e9f4abd4ea Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 2 Aug 2019 22:21:25 +0800
-Subject: [PATCH 4/5] pkgconfig: generate tensorflow_cc pkg-config entry
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- tensorflow/c/generate-pc.sh | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/tensorflow/c/generate-pc.sh b/tensorflow/c/generate-pc.sh
-index 7184ad68fb..a4d51a1b3b 100755
---- a/tensorflow/c/generate-pc.sh
-+++ b/tensorflow/c/generate-pc.sh
-@@ -63,12 +63,26 @@ cat << EOF > tensorflow.pc
- prefix=${TF_PREFIX}
- exec_prefix=\${prefix}
- libdir=\${exec_prefix}/${LIBDIR}
--includedir=\${prefix}/include
-+includedir=\${prefix}/include/tensorflow
- 
- Name: TensorFlow
- Version: ${TF_VERSION}
- Description: Library for computation using data flow graphs for scalable machine learning
- Requires:
--Libs: -L\${libdir} -ltensorflow
-+Libs: -L\${libdir} -ltensorflow -ltensorflow_framework
-+Cflags: -I\${includedir}
-+EOF
-+
-+cat << EOF > tensorflow_cc.pc
-+prefix=${TF_PREFIX}
-+exec_prefix=\${prefix}
-+libdir=\${exec_prefix}/${LIBDIR}
-+includedir=\${prefix}/include/tensorflow
-+
-+Name: TensorFlow
-+Version: ${TF_VERSION}
-+Description: Library for computation using data flow graphs for scalable machine learning
-+Requires:
-+Libs: -L\${libdir} -ltensorflow_cc -ltensorflow_framework
- Cflags: -I\${includedir}
- EOF
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch b/sci-libs/tensorflow/files/tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch
deleted file mode 100644
index fc2e1fe92cb4..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bdbe7a572ed248bf8e53df200ffa5e66bf77b16f Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 2 Aug 2019 22:22:53 +0800
-Subject: [PATCH 5/5] gen_git_source: builtins does not exist in python2
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- tensorflow/tools/git/gen_git_source.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tensorflow/tools/git/gen_git_source.py b/tensorflow/tools/git/gen_git_source.py
-index 6cefd3900b..4d52c1fccf 100755
---- a/tensorflow/tools/git/gen_git_source.py
-+++ b/tensorflow/tools/git/gen_git_source.py
-@@ -26,7 +26,6 @@ NOTE: this script is only used in opensource.
- from __future__ import absolute_import
- from __future__ import division
- from __future__ import print_function
--from builtins import bytes  # pylint: disable=redefined-builtin
- import argparse
- import json
- import os
--- 
-2.21.0
-
diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch
deleted file mode 100644
index 39fc269b73bc..000000000000
--- a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
-index fec08f66d7..9d5d1f2a3f 100644
---- a/tensorflow/tools/pip_package/setup.py
-+++ b/tensorflow/tools/pip_package/setup.py
-@@ -62,8 +62,8 @@ REQUIRED_PACKAGES = [
-     'opt_einsum >= 2.3.2',
-     'six >= 1.10.0',
-     'protobuf >= 3.6.1',
--    'tb-nightly >= 1.15.0a20190821, < 1.15.0a20190822',
--    'tf-estimator-nightly >= 1.14.0.dev2019090401, < 1.14.0.dev2019090402',
-+    'tensorboard >= 1.15.0',
-+    'tensorflow_estimator >= 1.15.0',
-     'termcolor >= 1.1.0',
-     'wrapt >= 1.11.1',
- ]
diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch
new file mode 100644
index 000000000000..4cc2f608d5dc
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch
@@ -0,0 +1,12 @@
+diff --git a/third_party/nccl/build_defs.bzl.tpl b/third_party/nccl/build_defs.bzl.tpl
+index 5719139855..5f5c3a1008 100644
+--- a/third_party/nccl/build_defs.bzl.tpl
++++ b/third_party/nccl/build_defs.bzl.tpl
+@@ -113,7 +113,6 @@ def _device_link_impl(ctx):
+             "--cmdline=--compile-only",
+             "--link",
+             "--compress-all",
+-            "--bin2c-path=%s" % bin2c.dirname,
+             "--create=%s" % tmp_fatbin.path,
+             "--embedded-fatbin=%s" % fatbin_h.path,
+         ] + images,
diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
new file mode 100644
index 000000000000..194cdc166510
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
@@ -0,0 +1,26 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index babb14b509..bcdd4f46e2 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -67,7 +67,7 @@ http_archive(
+ http_archive(
+     name = "bazel_skylib",
+     sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0",
+-    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel-skylib.0.9.0.tar.gz"],
++    urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz"],
+ )  # https://github.com/bazelbuild/bazel-skylib/releases
+ http_archive(
+     name = "com_github_apple_swift_swift_protobuf",
+diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
+index 8619cddfdd..4b57df0cbe 100644
+--- a/third_party/systemlibs/syslibs_configure.bzl
++++ b/third_party/systemlibs/syslibs_configure.bzl
+@@ -27,7 +27,7 @@ VALID_LIBS = [
+     "grpc",
+     "hwloc",
+     "icu",
+-    "jpeg",
++    "libjpeg_turbo",
+     "jsoncpp_git",
+     "keras_applications_archive",
+     "lmdb",