diff options
Diffstat (limited to 'sci-libs/tensorflow/files')
3 files changed, 114 insertions, 0 deletions
diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch new file mode 100644 index 000000000000..08c7458f7700 --- /dev/null +++ b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch @@ -0,0 +1,38 @@ +From 9a44d8e10d726cae992e611575b9dcb1627beede Mon Sep 17 00:00:00 2001 +From: Jason Zaman <jason@perfinion.com> +Date: Wed, 11 Sep 2019 12:08:34 +0800 +Subject: [PATCH 1/2] WORKSPACE: add rules-docker http_archive, + bazel-toolchains uses git_repo + +git_repository() rules cannot pull from --distdir and fail when building +without internet access. Use http_archive instead and pin the sha256 +hash as well. + +Signed-off-by: Jason Zaman <jason@perfinion.com> +--- + WORKSPACE | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/WORKSPACE b/WORKSPACE +index 74ea14d0fd..ccff2ba30f 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -12,6 +12,15 @@ http_archive( + ], + ) + ++http_archive( ++ name = "io_bazel_rules_docker", ++ sha256 = "7d453450e1eb70e238eea6b31f4115607ec1200e91afea01c25f9804f37e39c8", ++ strip_prefix = "rules_docker-0.10.0", ++ urls = [ ++ "https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz", ++ ], ++) ++ + # Load tf_repositories() before loading dependencies for other repository so + # that dependencies like com_google_protobuf won't be overridden. + load("//tensorflow:workspace.bzl", "tf_repositories") +-- +2.21.0 + diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch new file mode 100644 index 000000000000..f8b72daddfc4 --- /dev/null +++ b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch @@ -0,0 +1,61 @@ +From 05f57f785aeb58146b3873d4a0c614d897c56293 Mon Sep 17 00:00:00 2001 +From: Jason Zaman <jason@perfinion.com> +Date: Wed, 11 Sep 2019 18:18:42 +0800 +Subject: [PATCH 2/2] systemlibs: unbundle functools32 + +Signed-off-by: Jason Zaman <jason@perfinion.com> +--- + tensorflow/workspace.bzl | 1 + + third_party/systemlibs/functools32.BUILD | 15 +++++++++++++++ + third_party/systemlibs/syslibs_configure.bzl | 1 + + 3 files changed, 17 insertions(+) + create mode 100644 third_party/systemlibs/functools32.BUILD + +diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl +index d9fadc1030..760b7cd905 100755 +--- a/tensorflow/workspace.bzl ++++ b/tensorflow/workspace.bzl +@@ -325,6 +325,7 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""): + build_file = clean_dep("//third_party:functools32.BUILD"), + sha256 = "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d", + strip_prefix = "functools32-3.2.3-2", ++ system_build_file = clean_dep("//third_party/systemlibs:functools32.BUILD"), + urls = [ + "https://storage.googleapis.com/mirror.tensorflow.org/pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz", + "https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz", +diff --git a/third_party/systemlibs/functools32.BUILD b/third_party/systemlibs/functools32.BUILD +new file mode 100644 +index 0000000000..5567ef6943 +--- /dev/null ++++ b/third_party/systemlibs/functools32.BUILD +@@ -0,0 +1,15 @@ ++# Description: ++# functools32 provides a backport of the functools module for Python 2. ++ ++licenses(["notice"]) # Python 2.0 ++ ++package(default_visibility = ["//visibility:public"]) ++ ++filegroup( ++ name = "LICENSE", ++) ++ ++py_library( ++ name = "functools32", ++ srcs_version = "PY2AND3", ++) +diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl +index f83c0dd3d5..0884be8416 100644 +--- a/third_party/systemlibs/syslibs_configure.bzl ++++ b/third_party/systemlibs/syslibs_configure.bzl +@@ -22,6 +22,7 @@ VALID_LIBS = [ + "double_conversion", + "enum34_archive", + "flatbuffers", ++ "functools32_archive", + "gast_archive", + "gif_archive", + "grpc", +-- +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 new file mode 100644 index 000000000000..39fc269b73bc --- /dev/null +++ b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch @@ -0,0 +1,15 @@ +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', + ] |