Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow/files/, sci-libs/tensorflow/
Date: Mon, 02 Dec 2019 14:50:52
Message-Id: 1575298179.9b559b8410a1de974fab323fb82fcc86024ef944.perfinion@gentoo
1 commit: 9b559b8410a1de974fab323fb82fcc86024ef944
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 29 09:56:29 2019 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 2 14:49:39 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b559b84
7
8 sci-libs/tensorflow: bump 2.1.0_rc0
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.16
11 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
12
13 sci-libs/tensorflow/Manifest | 6 +
14 .../tensorflow-2.1.0-cuda_10.2_support_bin2c.patch | 12 +
15 .../files/tensorflow-2.1.0-external_libs.patch | 26 ++
16 sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild | 358 +++++++++++++++++++++
17 4 files changed, 402 insertions(+)
18
19 diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
20 index 9645f0bf601..8d60bc809a9 100644
21 --- a/sci-libs/tensorflow/Manifest
22 +++ b/sci-libs/tensorflow/Manifest
23 @@ -8,11 +8,13 @@ DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb4
24 DIST bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz 416360 BLAKE2B 4d7960302cb70247f8166647b991d74aa0514d218c9de4c97fe267ecb789e9966cfd8e546fe11661c92034df7a8de72596c5c5ddea10d145d6783cdc5aba2f9b SHA512 9a810b0a70f81fe3b9a1f23b2d171bbe723f7a33374b2caf7ce398572965f21b9de00791122c32b36e68a572b1b8982be378730f1c9f22bc375ae5f5c1c32873
25 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
26 DIST bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz 505681 BLAKE2B f16225eb11859f487335bddca115c9c2a05731f4bfe4240609a47e17b706d9a25b6b363b61404b4d5df0471e4dd9b4b9befbf78dbcb1c7c11e3f590039ff92b2 SHA512 7723baf2c710adb063375a33fd64e3941fae7e98c824764c266d5554cc0b0cbb1c91a5c2a9058bb4c8766ec404ca556199ce22965a6de4baee09cb740b7671c9
27 +DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d
28 DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
29 DIST bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz 462798 BLAKE2B f461635702cd881828cf401c78fe0e64398c015d7f7824b369b0808d54224c633b6d8b699000e9e481ba094a93e01c33cc4360a541b2d520db10d3e9ef81007e SHA512 e85b13a50cbec60e4e574de9a3d3b646ca4bf045c55afcb41f2fd671202aac9e6d3e91c618f8923986ae142e615624718f3df0d1edb33a90e334f29667888d39
30 DIST bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz 435984 BLAKE2B 1ec325861e5e5292b2153119beff3b3be743b4833adf3571eab1a066fef06a61131ef0a761e6f8ba4bf978e7c1c073f197f48a507cd1259ee346d4209129211d SHA512 13991822624e5bdcc2424299acb1b9ce12880f46ebbf2065d7d19a66c77f1a6802862a7ea96334fc91a1c85cff516fd32a493320f0a4d98f19e9d33e5f887986
31 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
32 DIST bazelbuild-rules_swift.0.11.1.tar.gz 107453 BLAKE2B 8cd686b945b5c9de9c8bfcaca38cd7c513bb8b55b4584bc569463997e7c5abcac3be4a5a31ccf95a494d17f3078ec9b1052497dba228fa3159a0c0be2a83eb88 SHA512 3479d6d8ce9111a39b9ef2e014399abc904e432841570dd0380104d80e4d3a74b6ff5cc6d2b250bcd15b152efa29d08f9ed092f70fd8bafa6deaa6f847d7f626
33 +DIST bazelbuild-rules_swift.0.12.1.tar.gz 111674 BLAKE2B 7c116d6098aa0725034dce4c83628c31c85c36a6331b44636deb2efe0f689a5baee8081b33d65e3727a83bca865bcabedd6f8fa1fdb60e901a9b60840c52c018 SHA512 6136feb3dc0074f82500000cf5335f046f21ea3a1edcb4dcb22228c82b56ed6a334e4b03e4e26a4d25549581abcf7df22b60a2bccf823a51bf270051fe18d489
34 DIST bazelbuild-rules_swift.0.9.0.tar.gz 105918 BLAKE2B 8f1bd8f5a468e3b37c614cf498a6cd8ceca55b255d6f096ebf88cd77e95148eab3fb5a128ed93b40f6d1ee8988b8dfd300fdf7061fc4ed4f1fb4ab25446ebe58 SHA512 68e985fa30b865317ccf59473cb52873d65159b866a54e35b3fbf83c135f3c750752663e962decbc8ebcd17b5784867d4d4767dd0b706f1182d4715291d8268b
35 DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
36 DIST double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip 7071029 BLAKE2B 722c190c941b169a3292ce2141c59b8eb1bcc5edd2ed09669592dddb9354e4c6c094dafe02e5a154f215aec776f9f7cebae36b9b0317b10b707282b1ca9449a5 SHA512 1db0d4805c80e9a08d9a581051d8708ddbfe1d74fd820dccde2c2405c45c06a861bd5b535b25d191cd01064e268f3fe71e58bef16fd39471812aea6c2f97da43
37 @@ -20,6 +22,7 @@ DIST eigen-049af2f56331.tar.gz 2485848 BLAKE2B 9d8a91782c9d40b7a6df101d2f43df25b
38 DIST eigen-8071cda5714d.tar.gz 2486211 BLAKE2B d5c2bc19d66b4e8508e260ba34a7ebf64c605d0eba3363bf853baaf1329ded80511ee36d54db3e8921eb62a0eab3c3ad2a2d4eac39b5108c2415b20812d998c0 SHA512 364691a5db9d2bd4285e5d5d9b9b2326ffd2138868c33bc2b98975da2aeee03bec7b40654ecc20e0ecc34b2a6d45257c7b9f0055b7310c590cac4c951c2aa635
39 DIST eigen-9f48e814419e.tar.gz 2430237 BLAKE2B 2d9df1a23ae049e57366fa6838ee8d4b3cecf2d859ec5ffa07bf18878976a2bd99d7dd94bb08f484a8941b5cf8ac091f837a533f081232c70a45ee0583143ba3 SHA512 ee6d8773d910dbf6798cb849ef7611f0f7aaef9ed68216e91c65bd996b8a92b6c107454f6d8599d83bfa6dede7144c83924de8479a9138c7b456b086cd527ebf
40 DIST eigen-a0d250e79c79.tar.gz 2468318 BLAKE2B 8799adc1a13612820251cd22a7ddc347ee4711d583561a5df9735bd22ab727c0d8e7fdc894cd7e83b3b972d5adcb86f033bc089e1a4de5fe4e6257f78df88957 SHA512 864646a0b3fd8287fbf6943f4cc7f692a883e6164add21c97e98372641b32e5ceffadc825178b9d11e9504377b837d0e54a264b7a53b28e4f9fc2a23c616d2b3
41 +DIST eigen-afc120bc03bd.tar.gz 2546157 BLAKE2B 72e051d77cd22c26a4203cf244e87b1700b4dce664d7ee5f80d0dd86eb5557c93e57c50664f1d79b13796a77c5ccdf72203ec66e9376d383b5a3b056326c7b61 SHA512 61f57a22d2a7947c14cfde87946dc41528df696884502a13000ee5c9b964672a5a8d8c10f505f28ed7a2d39deb820c6818d191dc3ce13215b8b9775b33da2ed8
42 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
43 DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951
44 DIST gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip 916632 BLAKE2B 0bde9faf0e185fc69999173eb0b5a2e106d252ee1bc6caf38b1adc27bde96e4e2b52a3d723c8b1af922386c0e933bfcc674be974cee059c1d9b16ff6ac631c3e SHA512 eb141182dff058048c559723e6aa7127244dcc6a5a0bfd1250bbb262f34378dccf15b1b930cf46dcb6ac22ac16e3fa2781cca63cd93865506a36ab7e463aa537
45 @@ -27,11 +30,13 @@ DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B
46 DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
47 DIST llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz 50144723 BLAKE2B b744756c9782e5506fd6628531409e305bd9ce9a79f1776c4fe674cec5b01a86ab1793dc602f704d295587c3d769d622402a4fe07c0d66269c7f610178693bce SHA512 43f185c8dd38ae7cb048bb9c98fb94e1f43ce66764b43a7141a06a1a0b011389fa139f34b7eaee72c39b8f44aeeff3e7a2189c11d10f8f8a93e9792a1acf2b5f
48 DIST llvm-b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz 49997477 BLAKE2B 66cbd71a4ad65768fb39fd622efd54a7821b83eb105871e82e0b99074960cb4ebd8197ef984b0be29d5178a7ce3c0d4839d2d611c96fe1507227f7f28fd7e156 SHA512 79c6d4986cedfc132f085d2794f295fdbefa772cb53d3870963d4851ea15ce8e2863aa50c903930abaff53d818ad97acfe8acd1c923ccbe26e3a99ac2397ae9f
49 +DIST llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz 115788302 BLAKE2B ea18d6cb3cc8311a78e543996d88831e1ecf1dec58b7c890a80cd8fce86e1c52244b9cfc0d7ce0867480465c2d914555c16cf003bfdcf90056d63e8f4e0ea0c0 SHA512 5422762ffe1022ad4588bcf2bdce1a041c37b5edffed70fcefdd911b2dbf8b52cba9ec57670d48d7b69be6b71e354d333d6eaa5ac5260df56ed8ab18fd98fe88
50 DIST nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz 107044 BLAKE2B fd018b1d40977add357e98382f41e3fa6456bdc9a181e2d6cc7a3bc7fb98d242b3216b5ed0c40323bbcc006ab5221b49819ebc1dccd0c8dd700d9504f085eed1 SHA512 e66f323abb68feeec41927cc23e3a85d82fd1b7105a6232626edba95acb9eb22b3fb8b28d1a7adb536c47c936f68271fe5d8f66d3059e3128608ad826dd7622e
51 DIST nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz 95617 BLAKE2B 023788db444b1a50f01ab16f126c920f530a6ff5bf2a9327626db45f985b4093c1024d16d43cdee9f0b3ee5c8b7d104f2a6b1dab0460c6b1998b42a0354f6f27 SHA512 d6b4dd4d6c7c9ca2dcf0699055c9193d4b46c0c5155e0108db38094577c92f954f604b2e83ca320873288e0010eaa3c5812f05f7fafe5112bebbca78e56cb279
52 DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
53 DIST oourafft2d-20061228.tgz 54434 BLAKE2B 382dd5787155b877a2ad1d624596afb5dbbe146a7aedf044d7f016949deedac871a512a030b5e6ac9ea5310e216788ffb99af1dd9d2a0de3f1ad72d9e5e7a3db SHA512 af993f68e8e1eb3cb927a51e86da8f74cfafc912a7cd055515e50fe543dd19ab5a6f7b1c2be4a55d6f4a0e5d766ead34c3be4c5705be6353f78cb2a55bd5cf16
54 DIST pybind11-v2.3.0.tar.gz 564520 BLAKE2B a7c1485aa8f63a00eccd3103cf9f531a080b049be02e6182b30503ae6dd6c55fc517684ed9d92aaec244efd5f77336c68d1ea546833f7f0ae2fd7b090c19a02d SHA512 04542fe9dca2ffdb86c15698a4bbc041446a9f11970092e89a482ae0ff64c932f62fff8f437b98bdaa006c1fccabddd79f0c7e376f27daed2150b1d2f988e8aa
55 +DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
56 DIST rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz 446437 BLAKE2B 070e1028625c74e6fbd092a3f8c6cf6de3b98d8999fdd69527674cfc55f00bd7638f7cb1eba41d496d1de3307b81b9dfd832d7d4bc65f9d98cd53714cb24bb02 SHA512 e43c013027a7235e85c263d8cfc40f9af77f54d054665116bb8641ed7f60d077b9107aa97da5b7e102077b68be7d2cbe401091016bd46f8828ae159659ce9608
57 DIST rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz 460121 BLAKE2B bca31bbdd9069647fa9560002e63a404e2bd4d4ebd19d90e28d08f797f8f63157cc127dab26b996bb976e50f099928a91c1d6343427cb85048c6ca2b47c0c7e2 SHA512 461a663189e5995e31ee8175ee260e1ad06b00ee8a7548b9d3a946a2de693311031ec6eba89e3bad527f5d8f76ed25626ef4ea05a8d6e7579932dc1be3b0a6ba
58 DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb
59 @@ -40,5 +45,6 @@ DIST tensorflow-1.14.0.tar.gz 41335204 BLAKE2B d91d84c5d86c838cc659c45e28cf3c8a9
60 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
61 DIST tensorflow-1.15.0_rc0.tar.gz 46177850 BLAKE2B a4cb339018d04da26993400e99bacbe8c88dd68e17158b3effac125ee90b73d441084d530359912c40d1981c7688511ad41117067428233e9310c1fc8617f1d0 SHA512 f9ba5f2c952b7d8be0f3e2b78336513efa07d5323bc28217335391538577ba2b91687cf92f759d4ec03b02dd1c2961de4b54df205e7952c706f5b632029b7c7d
62 DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a76c2cc3eaf7c371684849cb7365b94fb3743ab8de9adffe64bef0f70da2bb0b7e6426a3f402e436eff841d3edefe8d SHA512 c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc
63 +DIST tensorflow-2.1.0_rc0.tar.gz 41625131 BLAKE2B bc286f2f8d76a38973706acf3d839a4f54843b2f37ba5485eb149beacd55c7ac13660592acbc2413f8e60242c4a34b90cea8f1d9708d3f086e7cae73cc338832 SHA512 1481af1ed43ff03f6a0eeaad9896e2ec021d763bc69bf03e33353d6188074fdfaa1b6c3bba1d4e2496207f468e6a555fe2c962ae15eddd30ef872a3d76e19911
64 DIST tensorflow-patches-1.14.0-r2.tar.bz2 7213 BLAKE2B 51719fc02049d564b7e5c00a76375af9a7e8dfc73753ba5f0d53163dc1fa00d23bb7ed03553a0bce68b8b90cd5bfe21d29e7a57a827db2c68ceef65f3cb0e925 SHA512 35e1a410060cdde99df148bfd06f042b91e021f7a692ae9c0100c67555de553bc248d73db762ed0239117296fb1147e2b67cdf0dd3dc94dee6fe9804c08a7360
65 DIST tensorflow-python-license.rst.txt 45132 BLAKE2B 770ddd87adc745a021daac01a284131825a33f176002a28b20a2251246183bf7ab4686305620678285e4a216a37f01b3ad953fe7864fa79611cccde156d69ab6 SHA512 2d5a3783ec340f24797e89c78007ee95ab753eb5ee8198c739544f9e1159895f7abe816d6b3c66620f8d7b64641d2a7f44ff0a5b4f2f941928f4733157c7995e
66
67 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
68 new file mode 100644
69 index 00000000000..4cc2f608d5d
70 --- /dev/null
71 +++ b/sci-libs/tensorflow/files/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch
72 @@ -0,0 +1,12 @@
73 +diff --git a/third_party/nccl/build_defs.bzl.tpl b/third_party/nccl/build_defs.bzl.tpl
74 +index 5719139855..5f5c3a1008 100644
75 +--- a/third_party/nccl/build_defs.bzl.tpl
76 ++++ b/third_party/nccl/build_defs.bzl.tpl
77 +@@ -113,7 +113,6 @@ def _device_link_impl(ctx):
78 + "--cmdline=--compile-only",
79 + "--link",
80 + "--compress-all",
81 +- "--bin2c-path=%s" % bin2c.dirname,
82 + "--create=%s" % tmp_fatbin.path,
83 + "--embedded-fatbin=%s" % fatbin_h.path,
84 + ] + images,
85
86 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
87 new file mode 100644
88 index 00000000000..194cdc16651
89 --- /dev/null
90 +++ b/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch
91 @@ -0,0 +1,26 @@
92 +diff --git a/WORKSPACE b/WORKSPACE
93 +index babb14b509..bcdd4f46e2 100644
94 +--- a/WORKSPACE
95 ++++ b/WORKSPACE
96 +@@ -67,7 +67,7 @@ http_archive(
97 + http_archive(
98 + name = "bazel_skylib",
99 + sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0",
100 +- urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel-skylib.0.9.0.tar.gz"],
101 ++ urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz"],
102 + ) # https://github.com/bazelbuild/bazel-skylib/releases
103 + http_archive(
104 + name = "com_github_apple_swift_swift_protobuf",
105 +diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
106 +index 8619cddfdd..4b57df0cbe 100644
107 +--- a/third_party/systemlibs/syslibs_configure.bzl
108 ++++ b/third_party/systemlibs/syslibs_configure.bzl
109 +@@ -27,7 +27,7 @@ VALID_LIBS = [
110 + "grpc",
111 + "hwloc",
112 + "icu",
113 +- "jpeg",
114 ++ "libjpeg_turbo",
115 + "jsoncpp_git",
116 + "keras_applications_archive",
117 + "lmdb",
118
119 diff --git a/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild
120 new file mode 100644
121 index 00000000000..86182bded16
122 --- /dev/null
123 +++ b/sci-libs/tensorflow/tensorflow-2.1.0_rc0.ebuild
124 @@ -0,0 +1,358 @@
125 +# Copyright 1999-2019 Gentoo Authors
126 +# Distributed under the terms of the GNU General Public License v2
127 +
128 +EAPI=7
129 +
130 +DISTUTILS_OPTIONAL=1
131 +PYTHON_COMPAT=( python{3_5,3_6,3_7} )
132 +MY_PV=${PV/_rc/-rc}
133 +MY_P=${PN}-${MY_PV}
134 +
135 +inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs
136 +
137 +DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
138 +HOMEPAGE="https://www.tensorflow.org/"
139 +
140 +LICENSE="Apache-2.0"
141 +SLOT="0"
142 +KEYWORDS="~amd64"
143 +IUSE="cuda mpi +python xla"
144 +CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
145 +for i in $CPU_USE_FLAGS_X86; do
146 + IUSE+=" cpu_flags_x86_$i"
147 +done
148 +
149 +# distfiles that bazel uses for the workspace, will be copied to basel-distdir
150 +bazel_external_uris="
151 + https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz
152 + https://bitbucket.org/eigen/eigen/get/afc120bc03bd.tar.gz -> eigen-afc120bc03bd.tar.gz
153 + https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz
154 + https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz
155 + https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz
156 + https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
157 + https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
158 + https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
159 + https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz
160 + https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
161 + https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
162 + https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
163 + https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
164 + https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
165 + https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz
166 + https://github.com/llvm/llvm-project/archive/ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz -> llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz
167 + cuda? (
168 + https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz
169 + https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
170 + )
171 + python? (
172 + https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
173 + https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
174 + https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
175 + )"
176 +
177 +SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
178 + ${bazel_external_uris}"
179 +
180 +RDEPEND="
181 + app-arch/snappy
182 + dev-db/lmdb
183 + dev-db/sqlite
184 + dev-libs/icu
185 + >=dev-libs/jsoncpp-1.9
186 + dev-libs/libpcre
187 + dev-libs/nsync
188 + dev-libs/openssl:0=
189 + >=dev-libs/protobuf-3.8.0:=
190 + >=dev-libs/re2-0.2019.06.01
191 + media-libs/giflib
192 + media-libs/libjpeg-turbo
193 + media-libs/libpng:0
194 + >=net-libs/grpc-1.22.0
195 + net-misc/curl
196 + sys-libs/zlib
197 + >=sys-apps/hwloc-2
198 + cuda? (
199 + >=dev-util/nvidia-cuda-toolkit-9.1[profiler]
200 + dev-libs/cudnn
201 + )
202 + mpi? ( virtual/mpi )
203 + python? (
204 + ${PYTHON_DEPS}
205 + >=dev-libs/flatbuffers-1.8.0
206 + dev-python/absl-py[${PYTHON_USEDEP}]
207 + >=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
208 + dev-python/gast[${PYTHON_USEDEP}]
209 + >=dev-python/numpy-1.16[${PYTHON_USEDEP}]
210 + dev-python/google-pasta[${PYTHON_USEDEP}]
211 + dev-python/opt-einsum[${PYTHON_USEDEP}]
212 + >=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}]
213 + dev-python/six[${PYTHON_USEDEP}]
214 + dev-python/termcolor[${PYTHON_USEDEP}]
215 + >=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}]
216 + >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
217 + >=net-libs/google-cloud-cpp-0.10.0
218 + >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
219 + >=sci-libs/keras-preprocessing-1.1.0[${PYTHON_USEDEP}]
220 + >=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}]
221 + )"
222 +DEPEND="${RDEPEND}
223 + python? (
224 + dev-python/mock
225 + dev-python/setuptools
226 + )"
227 +PDEPEND="python? (
228 + >=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}]
229 + )"
230 +BDEPEND="
231 + app-arch/unzip
232 + >=dev-libs/protobuf-3.8.0
233 + dev-java/java-config
234 + dev-lang/swig
235 + || (
236 + =dev-util/bazel-0.24*
237 + =dev-util/bazel-0.26*
238 + =dev-util/bazel-0.27*
239 + )
240 + cuda? (
241 + >=dev-util/nvidia-cuda-toolkit-9.1[profiler]
242 + )
243 + !python? ( dev-lang/python )
244 + python? (
245 + dev-python/cython
246 + dev-python/mock
247 + >=dev-python/grpcio-tools-1.22.0
248 + )"
249 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
250 +
251 +S="${WORKDIR}/${MY_P}"
252 +
253 +PATCHES=(
254 + "${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch"
255 + "${FILESDIR}/tensorflow-2.1.0-external_libs.patch"
256 +)
257 +DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
258 +CHECKREQS_MEMORY="5G"
259 +CHECKREQS_DISK_BUILD="10G"
260 +
261 +get-cpu-flags() {
262 + local i f=()
263 + # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
264 + for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
265 + use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
266 + done
267 + use cpu_flags_x86_fma3 && f+=( -mfma )
268 + echo "${f[*]}"
269 +}
270 +
271 +pkg_setup() {
272 + ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
273 + ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
274 + ewarn "https://www.tensorflow.org/guide/migrate"
275 +
276 + local num_pythons_enabled
277 + num_pythons_enabled=0
278 + count_impls(){
279 + num_pythons_enabled=$((${num_pythons_enabled} + 1))
280 + }
281 + use python && python_foreach_impl count_impls
282 +
283 + # 10G to build C/C++ libs, 5G per python impl
284 + CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
285 + check-reqs_pkg_setup
286 +}
287 +
288 +src_unpack() {
289 + # Only unpack the main distfile
290 + unpack "${P}.tar.gz"
291 + bazel_load_distfiles "${bazel_external_uris}"
292 +}
293 +
294 +src_prepare() {
295 + export JAVA_HOME=$(java-config --jre-home) # so keepwork works
296 +
297 + append-flags $(get-cpu-flags)
298 + bazel_setup_bazelrc
299 +
300 + if ver_test "$(cuda_toolkit_version)" -ge "10.2"; then
301 + eapply "${FILESDIR}/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch"
302 + fi
303 +
304 + default
305 + use python && python_copy_sources
306 +
307 + use cuda && cuda_add_sandbox
308 +}
309 +
310 +src_configure() {
311 + export JAVA_HOME=$(java-config --jre-home) # so keepwork works
312 +
313 + do_configure() {
314 + export CC_OPT_FLAGS=" "
315 + export TF_ENABLE_XLA=$(usex xla 1 0)
316 + export TF_NEED_OPENCL_SYCL=0
317 + export TF_NEED_OPENCL=0
318 + export TF_NEED_COMPUTECPP=0
319 + export TF_NEED_ROCM=0
320 + export TF_NEED_MPI=$(usex mpi 1 0)
321 + export TF_SET_ANDROID_WORKSPACE=0
322 +
323 + if use python; then
324 + python_export PYTHON_SITEDIR
325 + export PYTHON_BIN_PATH="${PYTHON}"
326 + export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
327 + else
328 + export PYTHON_BIN_PATH="$(which python)"
329 + export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
330 + fi
331 +
332 + export TF_NEED_CUDA=$(usex cuda 1 0)
333 + export TF_DOWNLOAD_CLANG=0
334 + export TF_CUDA_CLANG=0
335 + export TF_NEED_TENSORRT=0
336 + if use cuda; then
337 + export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda"
338 + export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
339 + export TF_CUDA_VERSION="$(cuda_toolkit_version)"
340 + export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
341 + einfo "Setting CUDA version: $TF_CUDA_VERSION"
342 + einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
343 + fi
344 +
345 + # com_googlesource_code_re2 weird branch using absl, doesnt work with released re2
346 + local SYSLIBS=(
347 + absl_py
348 + astor_archive
349 + boringssl
350 + com_github_googleapis_googleapis
351 + com_github_googlecloudplatform_google_cloud_cpp
352 + com_google_protobuf
353 + curl
354 + cython
355 + double_conversion
356 + enum34_archive
357 + flatbuffers
358 + functools32_archive
359 + gast_archive
360 + gif
361 + grpc
362 + hwloc
363 + icu
364 + libjpeg_turbo
365 + jsoncpp_git
366 + keras_applications_archive
367 + lmdb
368 + nasm
369 + nsync
370 + opt_einsum_archive
371 + org_sqlite
372 + pasta
373 + pcre
374 + png
375 + six_archive
376 + snappy
377 + swig
378 + termcolor_archive
379 + wrapt
380 + zlib_archive
381 + )
382 +
383 + export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
384 + export TF_IGNORE_MAX_BAZEL_VERSION=1
385 +
386 + # This is not autoconf
387 + ./configure || die
388 +
389 + echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
390 + echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
391 + echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die
392 + }
393 + if use python; then
394 + python_foreach_impl run_in_build_dir do_configure
395 + else
396 + do_configure
397 + fi
398 +}
399 +
400 +src_compile() {
401 + export JAVA_HOME=$(java-config --jre-home) # so keepwork works
402 +
403 + if use python; then
404 + python_setup
405 + BUILD_DIR="${S}-${EPYTHON/./_}"
406 + cd "${BUILD_DIR}"
407 + fi
408 +
409 + # fail early if any deps are missing
410 + ebazel build --nobuild \
411 + //tensorflow:libtensorflow_framework.so \
412 + //tensorflow:libtensorflow.so \
413 + //tensorflow:libtensorflow_cc.so \
414 + $(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
415 +
416 + ebazel build \
417 + //tensorflow:libtensorflow_framework.so \
418 + //tensorflow:libtensorflow.so
419 + ebazel build //tensorflow:libtensorflow_cc.so
420 +
421 + do_compile() {
422 + ebazel build //tensorflow/tools/pip_package:build_pip_package
423 + }
424 + BUILD_DIR="${S}"
425 + cd "${BUILD_DIR}"
426 + use python && python_foreach_impl run_in_build_dir do_compile
427 + ebazel shutdown
428 +}
429 +
430 +src_install() {
431 + local i j
432 + export JAVA_HOME=$(java-config --jre-home) # so keepwork works
433 +
434 + do_install() {
435 + einfo "Installing ${EPYTHON} files"
436 + local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
437 + mkdir -p "${srcdir}" || die
438 + bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
439 + cd "${srcdir}" || die
440 + esetup.py install
441 +
442 + # libtensorflow_framework.so is in /usr/lib already
443 + python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
444 + rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
445 + rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die
446 + python_optimize
447 + }
448 +
449 + if use python; then
450 + python_foreach_impl run_in_build_dir do_install
451 +
452 + # Symlink to python-exec scripts
453 + for i in "${ED}"/usr/lib/python-exec/*/*; do
454 + n="${i##*/}"
455 + [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
456 + done
457 +
458 + python_setup
459 + local BUILD_DIR="${S}-${EPYTHON/./_}"
460 + cd "${BUILD_DIR}" || die
461 + fi
462 +
463 + einfo "Installing headers"
464 + ebazel build //tensorflow:install_headers
465 + ebazel shutdown
466 + insinto /usr/include/${PN}/
467 + doins -r bazel-genfiles/tensorflow/include/*
468 +
469 + einfo "Installing libs"
470 + # Generate pkg-config file
471 + ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
472 + insinto /usr/$(get_libdir)/pkgconfig
473 + doins ${PN}.pc ${PN}_cc.pc
474 +
475 + for l in libtensorflow{,_framework,_cc}.so; do
476 + dolib.so bazel-bin/tensorflow/${l}
477 + dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
478 + dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
479 + done
480 +
481 + einstalldocs
482 +}