commit: 83575c9121bcefb785967e5bfe7a8a12ff6d3ba1 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Sun Jun 2 19:31:28 2019 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Tue Jun 4 16:32:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83575c91
sci-libs/tensorflow: bump 1.14.0_rc0 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 sci-libs/tensorflow/Manifest | 10 ++++ ...-1.14_rc0-0001-systemlibs-unbundle-enum34.patch | 60 ++++++++++++++++++++++ sci-libs/tensorflow/tensorflow-1.13.1.ebuild | 2 +- ...-1.13.1.ebuild => tensorflow-1.14.0_rc0.ebuild} | 55 +++++++++++--------- 4 files changed, 102 insertions(+), 25 deletions(-) diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest index c862a1696cc..2d9fb90edac 100644 --- a/sci-libs/tensorflow/Manifest +++ b/sci-libs/tensorflow/Manifest @@ -1,16 +1,26 @@ DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9 DIST abseil-cpp-389ec3f906f018661a5308458d623d01f96d7b23.tar.gz 1180190 BLAKE2B beec1338bf8cfa99d0de3bdb1631da5385317e68bf87f5da154ceab9455af7221f140838e41f4087d7d0064c22f93dce5860c484a8e4026b46efa103a52db307 SHA512 20d2cc8d23eb729607692d861049dccbd6b4af56fc4ed7733492348e3fe879d7acc6316f0d6e1c683f98188f028d460a40cab35667856cf334aa5f00fc830911 +DIST abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz 1275955 BLAKE2B eb6e0f9d55458a4ae6e8b86be89add9b0cc44d1ff5a11f6fa1ec93e2f46885c8ff87b8c1e674e1ba5ac13556ed303963864057f0e258fce41fa753d891846996 SHA512 56a827296e2948b90922766369f2040e04abd03320375240ad32fcc2925cdd1ffea312edcef1009a0c8abd79f521a61e433b7651dd4c2721d2b1ad13f48256de DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826 +DIST bazel-skylib-0.6.0.tar.gz 29330 BLAKE2B 53d23a81203c08cb5ab4adbd308bb6c9875df0f2d27c6f8832a27397578e9214ebcd95f63bd6c539d534ecb5f2316116063e3e5d1a36986cf94d167d7823234d SHA512 14ce6782509be7d3cb0fe438aaad579ad23bf328d566cab06a2008990041ee098b4602542cb67961d757573a8c272e5dddb143efd756cd6ec40486159329fa91 DIST bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz 416360 BLAKE2B 4d7960302cb70247f8166647b991d74aa0514d218c9de4c97fe267ecb789e9966cfd8e546fe11661c92034df7a8de72596c5c5ddea10d145d6783cdc5aba2f9b SHA512 9a810b0a70f81fe3b9a1f23b2d171bbe723f7a33374b2caf7ce398572965f21b9de00791122c32b36e68a572b1b8982be378730f1c9f22bc375ae5f5c1c32873 +DIST bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz 505681 BLAKE2B f16225eb11859f487335bddca115c9c2a05731f4bfe4240609a47e17b706d9a25b6b363b61404b4d5df0471e4dd9b4b9befbf78dbcb1c7c11e3f590039ff92b2 SHA512 7723baf2c710adb063375a33fd64e3941fae7e98c824764c266d5554cc0b0cbb1c91a5c2a9058bb4c8766ec404ca556199ce22965a6de4baee09cb740b7671c9 +DIST bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz 462798 BLAKE2B f461635702cd881828cf401c78fe0e64398c015d7f7824b369b0808d54224c633b6d8b699000e9e481ba094a93e01c33cc4360a541b2d520db10d3e9ef81007e SHA512 e85b13a50cbec60e4e574de9a3d3b646ca4bf045c55afcb41f2fd671202aac9e6d3e91c618f8923986ae142e615624718f3df0d1edb33a90e334f29667888d39 DIST bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz 435984 BLAKE2B 1ec325861e5e5292b2153119beff3b3be743b4833adf3571eab1a066fef06a61131ef0a761e6f8ba4bf978e7c1c073f197f48a507cd1259ee346d4209129211d SHA512 13991822624e5bdcc2424299acb1b9ce12880f46ebbf2065d7d19a66c77f1a6802862a7ea96334fc91a1c85cff516fd32a493320f0a4d98f19e9d33e5f887986 +DIST bazelbuild-rules_swift.0.9.0.tar.gz 105918 BLAKE2B 8f1bd8f5a468e3b37c614cf498a6cd8ceca55b255d6f096ebf88cd77e95148eab3fb5a128ed93b40f6d1ee8988b8dfd300fdf7061fc4ed4f1fb4ab25446ebe58 SHA512 68e985fa30b865317ccf59473cb52873d65159b866a54e35b3fbf83c135f3c750752663e962decbc8ebcd17b5784867d4d4767dd0b706f1182d4715291d8268b DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed DIST double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip 7071029 BLAKE2B 722c190c941b169a3292ce2141c59b8eb1bcc5edd2ed09669592dddb9354e4c6c094dafe02e5a154f215aec776f9f7cebae36b9b0317b10b707282b1ca9449a5 SHA512 1db0d4805c80e9a08d9a581051d8708ddbfe1d74fd820dccde2c2405c45c06a861bd5b535b25d191cd01064e268f3fe71e58bef16fd39471812aea6c2f97da43 DIST eigen-9f48e814419e.tar.gz 2430237 BLAKE2B 2d9df1a23ae049e57366fa6838ee8d4b3cecf2d859ec5ffa07bf18878976a2bd99d7dd94bb08f484a8941b5cf8ac091f837a533f081232c70a45ee0583143ba3 SHA512 ee6d8773d910dbf6798cb849ef7611f0f7aaef9ed68216e91c65bd996b8a92b6c107454f6d8599d83bfa6dede7144c83924de8479a9138c7b456b086cd527ebf +DIST eigen-a0d250e79c79.tar.gz 2468318 BLAKE2B 8799adc1a13612820251cd22a7ddc347ee4711d583561a5df9735bd22ab727c0d8e7fdc894cd7e83b3b972d5adcb86f033bc089e1a4de5fe4e6257f78df88957 SHA512 864646a0b3fd8287fbf6943f4cc7f692a883e6164add21c97e98372641b32e5ceffadc825178b9d11e9504377b837d0e54a264b7a53b28e4f9fc2a23c616d2b3 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00 +DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951 DIST gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip 916632 BLAKE2B 0bde9faf0e185fc69999173eb0b5a2e106d252ee1bc6caf38b1adc27bde96e4e2b52a3d723c8b1af922386c0e933bfcc674be974cee059c1d9b16ff6ac631c3e SHA512 eb141182dff058048c559723e6aa7127244dcc6a5a0bfd1250bbb262f34378dccf15b1b930cf46dcb6ac22ac16e3fa2781cca63cd93865506a36ab7e463aa537 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f DIST nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz 95617 BLAKE2B 023788db444b1a50f01ab16f126c920f530a6ff5bf2a9327626db45f985b4093c1024d16d43cdee9f0b3ee5c8b7d104f2a6b1dab0460c6b1998b42a0354f6f27 SHA512 d6b4dd4d6c7c9ca2dcf0699055c9193d4b46c0c5155e0108db38094577c92f954f604b2e83ca320873288e0010eaa3c5812f05f7fafe5112bebbca78e56cb279 DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240 DIST rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz 446437 BLAKE2B 070e1028625c74e6fbd092a3f8c6cf6de3b98d8999fdd69527674cfc55f00bd7638f7cb1eba41d496d1de3307b81b9dfd832d7d4bc65f9d98cd53714cb24bb02 SHA512 e43c013027a7235e85c263d8cfc40f9af77f54d054665116bb8641ed7f60d077b9107aa97da5b7e102077b68be7d2cbe401091016bd46f8828ae159659ce9608 +DIST rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz 460121 BLAKE2B bca31bbdd9069647fa9560002e63a404e2bd4d4ebd19d90e28d08f797f8f63157cc127dab26b996bb976e50f099928a91c1d6343427cb85048c6ca2b47c0c7e2 SHA512 461a663189e5995e31ee8175ee260e1ad06b00ee8a7548b9d3a946a2de693311031ec6eba89e3bad527f5d8f76ed25626ef4ea05a8d6e7579932dc1be3b0a6ba DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb +DIST tensorflow-1.14.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856 +DIST tensorflow-1.14.0_rc0.tar.gz 41329600 BLAKE2B 97c85ad9b7cb6e3bdc54fa176070106853ab4f3c30e93220e028627edf55deda7a7d675d42e8ea1c2d030ed1bf3e697e9016ef9ce629d3a98055c4e88c0db9ba SHA512 27be21cdef1bde50c58fffb28ce0b9dd142e2c24506c5042da2b334d46fbf9db06a420450716d93a5806eab8feca3cd03ae7330d3444af07ad561fe0fffd681f DIST tensorflow-python-license.rst.txt 45132 BLAKE2B 770ddd87adc745a021daac01a284131825a33f176002a28b20a2251246183bf7ab4686305620678285e4a216a37f01b3ad953fe7864fa79611cccde156d69ab6 SHA512 2d5a3783ec340f24797e89c78007ee95ab753eb5ee8198c739544f9e1159895f7abe816d6b3c66620f8d7b64641d2a7f44ff0a5b4f2f941928f4733157c7995e diff --git a/sci-libs/tensorflow/files/tensorflow-1.14_rc0-0001-systemlibs-unbundle-enum34.patch b/sci-libs/tensorflow/files/tensorflow-1.14_rc0-0001-systemlibs-unbundle-enum34.patch new file mode 100644 index 00000000000..b34eefd2665 --- /dev/null +++ b/sci-libs/tensorflow/files/tensorflow-1.14_rc0-0001-systemlibs-unbundle-enum34.patch @@ -0,0 +1,60 @@ +From 6339084d186e518136e13b761220423d6b5c849a Mon Sep 17 00:00:00 2001 +From: Jason Zaman <[email protected]> +Date: Wed, 29 May 2019 19:27:11 +0800 +Subject: [PATCH] systemlibs: unbundle enum34 + +Signed-off-by: Jason Zaman <[email protected]> +--- + 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/tensorflow-1.13.1.ebuild b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild index b0bb0fafaa3..319886a15f1 100644 --- a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild @@ -289,7 +289,7 @@ src_install() { # libtensorflow_framework.so is in /usr/lib already python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR - rm -f "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die + rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die python_optimize } diff --git a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild b/sci-libs/tensorflow/tensorflow-1.14.0_rc0.ebuild similarity index 80% copy from sci-libs/tensorflow/tensorflow-1.13.1.ebuild copy to sci-libs/tensorflow/tensorflow-1.14.0_rc0.ebuild index b0bb0fafaa3..3403ae52fdb 100644 --- a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.14.0_rc0.ebuild @@ -25,29 +25,29 @@ done # distfiles that bazel uses for the workspace, will be copied to basel-distdir bazel_external_uris=" http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz - https://bitbucket.org/eigen/eigen/get/9f48e814419e.tar.gz -> eigen-9f48e814419e.tar.gz - https://github.com/abseil/abseil-cpp/archive/389ec3f906f018661a5308458d623d01f96d7b23.tar.gz -> abseil-cpp-389ec3f906f018661a5308458d623d01f96d7b23.tar.gz - https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz - https://github.com/bazelbuild/rules_docker/archive/a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz -> rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz - https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip + https://bitbucket.org/eigen/eigen/get/a0d250e79c79.tar.gz -> eigen-a0d250e79c79.tar.gz + https://github.com/abseil/abseil-cpp/archive/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz -> abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz + https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz -> bazel-skylib-0.6.0.tar.gz + https://github.com/bazelbuild/rules_closure/archive/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz -> bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz + https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/rules_swift.0.9.0.tar.gz -> bazelbuild-rules_swift.0.9.0.tar.gz + https://github.com/bazelbuild/rules_docker/archive/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz -> rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz - https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip + https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz - https://github.com/nlopezgi/bazel-toolchains/archive/3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz -> bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz + https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz - https://mirror.bazel.build/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-python-license.rst.txt + http://mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.14.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )" SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz ${bazel_external_uris}" -# cuda-10.1 / cudnn 7.5 is not supported yet RDEPEND=" app-arch/snappy dev-db/lmdb @@ -65,12 +65,11 @@ RDEPEND=" >=net-libs/grpc-1.16.0 net-misc/curl sys-libs/zlib + dev-python/wrapt + >=sys-apps/hwloc-2 cuda? ( - || ( - ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* ) - ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* ) - ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* ) - ) + >=dev-util/nvidia-cuda-toolkit-9.1[profiler] + dev-libs/cudnn ) mpi? ( virtual/mpi ) python? ( @@ -85,7 +84,7 @@ RDEPEND=" dev-python/six[${PYTHON_USEDEP}] dev-python/termcolor[${PYTHON_USEDEP}] dev-python/grpcio[${PYTHON_USEDEP}] - net-libs/google-cloud-cpp + >=net-libs/google-cloud-cpp-0.9.0 >=sci-libs/keras-applications-1.0.6[${PYTHON_USEDEP}] >=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}] >=sci-visualization/tensorboard-1.13.0[${PYTHON_USEDEP}] @@ -103,9 +102,8 @@ BDEPEND=" dev-python/mock dev-lang/swig dev-python/cython - <=dev-util/bazel-0.22.0 cuda? ( - >=dev-util/nvidia-cuda-toolkit-8.0[profiler] + >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( @@ -115,6 +113,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/tensorflow-1.14_rc0-0001-systemlibs-unbundle-enum34.patch" +) DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) CHECKREQS_MEMORY="5G" CHECKREQS_DISK_BUILD="5G" @@ -187,10 +188,8 @@ src_configure() { export TF_CUDA_CLANG=0 export TF_NEED_TENSORRT=0 if use cuda; then - export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda" - export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda" + export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda" export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" - export TF_NCCL_VERSION="1" export TF_CUDA_VERSION="$(cuda_toolkit_version)" export TF_CUDNN_VERSION="$(cuda_cudnn_version)" einfo "Setting CUDA version: $TF_CUDA_VERSION" @@ -208,10 +207,13 @@ src_configure() { com_googlesource_code_re2 curl cython + double_conversion + enum34_archive flatbuffers gast_archive gif_archive grpc + hwloc icu jpeg jsoncpp_git @@ -220,6 +222,7 @@ src_configure() { nasm nsync org_sqlite + pasta pcre png_archive protobuf_archive @@ -227,6 +230,7 @@ src_configure() { snappy swig termcolor_archive + wrapt zlib_archive ) @@ -237,6 +241,7 @@ src_configure() { ./configure || die echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die + echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die } if use python; then python_foreach_impl run_in_build_dir do_configure @@ -289,7 +294,7 @@ src_install() { # libtensorflow_framework.so is in /usr/lib already python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR - rm -f "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die + rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die python_optimize } @@ -319,9 +324,11 @@ src_install() { insinto /usr/$(get_libdir)/pkgconfig doins ${PN}.pc - dolib.so bazel-bin/tensorflow/lib${PN}_framework.so - dolib.so bazel-bin/tensorflow/lib${PN}.so - dolib.so bazel-bin/tensorflow/lib${PN}_cc.so + for l in libtensorflow{,_framework,_cc}.so; do + dolib.so bazel-bin/tensorflow/${l} + dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1) + dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3) + done einstalldocs }
