From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- sci-libs/tensorflow/Manifest | 7 +- .../files/tensorflow-2.1.0-external_libs.patch | 26 -- .../tensorflow-2.1.0-python3.8-pywrap_tensor.patch | 11 - sci-libs/tensorflow/tensorflow-2.1.0.ebuild | 368 ++++++++++++++++++++ sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild | 372 --------------------- 5 files changed, 371 insertions(+), 413 deletions(-) delete mode 100644 sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch delete mode 100644 sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch create mode 100644 sci-libs/tensorflow/tensorflow-2.1.0.ebuild delete mode 100644 sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild (limited to 'sci-libs/tensorflow') diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest index 18144a86e375..1148129c7740 100644 --- a/sci-libs/tensorflow/Manifest +++ b/sci-libs/tensorflow/Manifest @@ -1,8 +1,6 @@ AUX tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch 1188 BLAKE2B dcebed9a89be6ff70f073c432e5e02ab80c0fc9e69cea2b1255a5620d456eec39f717fef3dec062a7dee5d33ce2eb45712d578de9f5ecb00360bb26004cc949c SHA512 d47a98015c424fd61adea6c8f5ed5115ca35c807636530e737963f002f02380d80d30e0f0cf3c6cf3e00914157fce62739da60ae30a4fb533321822a4fa45b2d AUX tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch 2370 BLAKE2B 87c60e70e929ade64cae24ae6f6d2d9168b0f5b93093206755fb66033b198e7226b7157a6aa15cb051cd9cd42bec8743ec7b96334ea3b9184445afff5e61c257 SHA512 2469fc0f9c9365c2e1191c68b61ba9ed54f0d240e34bb431ba6efadb9a4a63ae5b579e22b693df41fbbee55e4119bf8dcbdcdec6d7be81e36d1b48da8ff88c7b AUX tensorflow-2.1.0-cuda_10.2_support_bin2c.patch 518 BLAKE2B 945a7e2a4b0379c05a274bbc2582fabf37b3447282d14dc28725b8d3b4e8d0a17bada117775e22697f9c2ba5549223a89c4849c49cf007e10ab9da3933255051 SHA512 01f4e5a02b2c68bc39b5be251257a2a484aa66aabaeca33a3e4ab9d434928cb63fb3846fa8870c565a40706acc686d3522e953ae3cc9fbd41d49d27c27838d8d -AUX tensorflow-2.1.0-external_libs.patch 1024 BLAKE2B ab7bbe1f041f25f3d7cf29140d19e07d3c5af83d556895f01cf022c0191dd4fe7ae0e181f01cb94dbf69bb7e6e4a4dfb3765ce7c62d54746189a5e01b7dba460 SHA512 81118b3478925cb163ed3b1b5395247c0528b349a6f0d78535f09ce693e64bb776ddf94a33b4d959bed9c91a030bcf9084bd5b07d2aa4a72b8d4bacc72d93cfb -AUX tensorflow-2.1.0-python3.8-pywrap_tensor.patch 666 BLAKE2B 7d261c297e800872030bbaf279b50ba854464c1d90babd10a1baadd2a19a33192bcb77718abe4fdd11829ea657f0e061ca0b2d19ac0bbbb68fe1d7274eb39bff SHA512 4e5ac3b6cb4be5de2a21f5cd1dfb84c04ceb1046b7aefd200a2326469c256abe3f0f3514463658b3be902a146145017874c0ba150df9d6e711e2e9cca21934c2 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9 DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826 @@ -33,8 +31,9 @@ DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856 DIST tensorflow-1.15.0.tar.gz 46183168 BLAKE2B 5ccd87d5b53d6c543728e9c7ef96f12149bd8729620838b07a28f752fd5c57ef88350c2b62e8c44ec3561469eda38d8a64cbfca5e1ac7850674e1dd2c4d605d6 SHA512 f8683a950be6a3fa234d42e0f46bd9e049280e0c1d203c5c00ad44cf4728d894f2c301939d6d71203f815130a1ead53127adcc7565009589ff5aafc878b4dba7 DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a76c2cc3eaf7c371684849cb7365b94fb3743ab8de9adffe64bef0f70da2bb0b7e6426a3f402e436eff841d3edefe8d SHA512 c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc -DIST tensorflow-2.1.0_rc2.tar.gz 41641498 BLAKE2B 1ab001f6804cd6b2b3122cd5bf84905d81b1632f363134dc30aee92869077da2420799d0e70ea050004ac854a7e887a44176806b8cdfab5f12b9c8f7440d22be SHA512 7b8c9a83b5c25b36f680cfdaeefdc932cab93ecfc25622cd46ac14b2f5582eea4f04c6bdd5d63058266d5e0bf2cd9e1fb7a0647be62fb4ec4b910b0e7b4214e0 +DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6 +DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed EBUILD tensorflow-1.15.0.ebuild 11926 BLAKE2B db5054d61568b6b3f1843d553c5957ad8ec30a08aca20b134dd62c8fc9978823eaae41e8ae6118c7899693fb591cdce536d67b6cd197ebb4fe528f5bd407b243 SHA512 b47db814bde146455cbede7516b7aeb972d32e557c62684aa33be1a01f3a5e09f8eee6107ca151aab93f296ad3042778c71e1a1590e697bacdd42f1447890e93 EBUILD tensorflow-2.0.0.ebuild 11982 BLAKE2B 1cf285381b1c9a90abd4880cb1d2a370fa16ab668597e2cc13bfb97237a8585d61774b2b97e39cab7d0dddb1b02b9b476a9ca6ffaa28557d822758c12f08f2ed SHA512 a02758690fd3aaef021dba985f714d584b16920c6226e8adc504c69ca2d04646495550a00166a8e3b408074baed08959cf4ac5e16a5917c1e09ac99e0805b06e -EBUILD tensorflow-2.1.0_rc2.ebuild 12622 BLAKE2B 62628804cb269e13b6f45e480fc41a07d2fa5beb40ab389e4f7dce1347d90686a0531c7c674cfd92cefa58950b00d196bdbf52716ce5965adfc3e23f2e031d73 SHA512 2eb32be0f01ca0d623c95f797194f72c20d7b6587fd117eda690c2d84306b54f5c96bafbf24b7fc77598e13b89fec6daec53435cc81c8c3be32eedfcca22b5d8 +EBUILD tensorflow-2.1.0.ebuild 12435 BLAKE2B 12688e6060086531910518a2a13d706181757ac022061b71cde2da690d6e3ba3c6d55d485034db36c627803e292a7343b3ecab8ede704c6525299d16474e5edc SHA512 da9cdb6678f80d918d266610cdf907e45ccc335ab861b9c272b83106f1c56b142a0adf58098810573b639c8602b5c46ef40fa4840a92840d1a11f9afd0e58ffb MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30 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 deleted file mode 100644 index 194cdc166510..000000000000 --- a/sci-libs/tensorflow/files/tensorflow-2.1.0-external_libs.patch +++ /dev/null @@ -1,26 +0,0 @@ -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", diff --git a/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch b/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch deleted file mode 100644 index bc53750b0701..000000000000 --- a/sci-libs/tensorflow/files/tensorflow-2.1.0-python3.8-pywrap_tensor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tensorflow/python/eager/pywrap_tensor.cc.ORIG 2019-09-27 23:56:33.000000000 +0200 -+++ b/tensorflow/python/eager/pywrap_tensor.cc 2019-11-27 16:39:00.996713385 +0100 -@@ -839,7 +839,7 @@ - sizeof(EagerTensor), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)EagerTensor_dealloc, /* tp_dealloc */ -- nullptr, /* tp_print */ -+ 0, /* tp_vectorcall_offset */ - nullptr, /* tp_getattr */ - nullptr, /* tp_setattr */ - nullptr, /* tp_compare */ diff --git a/sci-libs/tensorflow/tensorflow-2.1.0.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild new file mode 100644 index 000000000000..5a87c8ff00d5 --- /dev/null +++ b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild @@ -0,0 +1,368 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python{3_6,3_7} ) +MY_PV=${PV/_rc/-rc} +MY_P=${PN}-${MY_PV} + +inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs + +DESCRIPTION="Computation framework using data flow graphs for scalable machine learning" +HOMEPAGE="https://www.tensorflow.org/" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda mpi +python xla" +CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4" +for i in $CPU_USE_FLAGS_X86; do + IUSE+=" cpu_flags_x86_$i" +done + +# distfiles that bazel uses for the workspace, will be copied to basel-distdir +bazel_external_uris=" + https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz + https://gitlab.com/libeigen/eigen/-/archive/4e696901f873a2347f76d931cf2f701e31e15d05/eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz -> eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz + https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz + https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz + https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz + https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz + https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip + https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz + 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 + 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 + https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz + 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/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz + https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz + https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz + https://github.com/llvm/llvm-project/archive/ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz -> llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz + cuda? ( + https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.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://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.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 + https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2 + ${bazel_external_uris}" + +RDEPEND=" + app-arch/snappy + dev-db/lmdb + dev-db/sqlite + dev-libs/double-conversion + dev-libs/icu + >=dev-libs/jsoncpp-1.9.2 + dev-libs/libpcre + dev-libs/nsync + dev-libs/openssl:0= + >=dev-libs/protobuf-3.8.0:= + >=dev-libs/re2-0.2019.06.01 + media-libs/giflib + media-libs/libjpeg-turbo + media-libs/libpng:0 + >=net-libs/grpc-1.22.0 + net-misc/curl + sys-libs/zlib + >=sys-apps/hwloc-2 + cuda? ( + >=dev-util/nvidia-cuda-toolkit-9.1[profiler] + dev-libs/cudnn + ) + mpi? ( virtual/mpi ) + python? ( + ${PYTHON_DEPS} + >=dev-libs/flatbuffers-1.8.0 + dev-python/absl-py[${PYTHON_USEDEP}] + >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] + dev-python/gast[${PYTHON_USEDEP}] + >=dev-python/numpy-1.16[${PYTHON_USEDEP}] + dev-python/google-pasta[${PYTHON_USEDEP}] + dev-python/opt-einsum[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/termcolor[${PYTHON_USEDEP}] + >=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}] + >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}] + >=net-libs/google-cloud-cpp-0.10.0 + >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] + >=sci-libs/keras-preprocessing-1.1.0[${PYTHON_USEDEP}] + >=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} + python? ( + dev-python/mock + dev-python/setuptools + )" +PDEPEND="python? ( + >=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}] + )" +BDEPEND=" + app-arch/unzip + >=dev-libs/protobuf-3.8.0 + dev-java/java-config + dev-lang/swig + || ( + =dev-util/bazel-0.27* + =dev-util/bazel-0.29* + ) + cuda? ( + >=dev-util/nvidia-cuda-toolkit-9.1[profiler] + ) + !python? ( dev-lang/python ) + python? ( + dev-python/cython + dev-python/mock + >=dev-python/grpcio-tools-1.22.0 + )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S="${WORKDIR}/${MY_P}" + +DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) +CHECKREQS_MEMORY="5G" +CHECKREQS_DISK_BUILD="10G" + +get-cpu-flags() { + local i f=() + # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc. + for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do + use cpu_flags_x86_${i} && f+=( -m${i/_/.} ) + done + use cpu_flags_x86_fma3 && f+=( -mfma ) + echo "${f[*]}" +} + +pkg_setup() { + ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities" + ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:" + ewarn "https://www.tensorflow.org/guide/migrate" + + local num_pythons_enabled + num_pythons_enabled=0 + count_impls(){ + num_pythons_enabled=$((${num_pythons_enabled} + 1)) + } + use python && python_foreach_impl count_impls + + # 10G to build C/C++ libs, 5G per python impl + CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G" + check-reqs_pkg_setup +} + +src_unpack() { + # Only unpack the main distfile + unpack "${P}.tar.gz" + unpack tensorflow-patches-${PVR}.tar.bz2 + bazel_load_distfiles "${bazel_external_uris}" +} + +src_prepare() { + export JAVA_HOME=$(java-config --jre-home) # so keepwork works + + append-flags $(get-cpu-flags) + bazel_setup_bazelrc + + eapply "${WORKDIR}"/patches/*.patch + + default + use python && python_copy_sources + + use cuda && cuda_add_sandbox +} + +src_configure() { + export JAVA_HOME=$(java-config --jre-home) # so keepwork works + + do_configure() { + export CC_OPT_FLAGS=" " + export TF_ENABLE_XLA=$(usex xla 1 0) + export TF_NEED_OPENCL_SYCL=0 + export TF_NEED_OPENCL=0 + export TF_NEED_COMPUTECPP=0 + export TF_NEED_ROCM=0 + export TF_NEED_MPI=$(usex mpi 1 0) + export TF_SET_ANDROID_WORKSPACE=0 + + if use python; then + python_export PYTHON_SITEDIR + export PYTHON_BIN_PATH="${PYTHON}" + export PYTHON_LIB_PATH="${PYTHON_SITEDIR}" + else + export PYTHON_BIN_PATH="$(which python)" + export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" + fi + + export TF_NEED_CUDA=$(usex cuda 1 0) + export TF_DOWNLOAD_CLANG=0 + export TF_CUDA_CLANG=0 + export TF_NEED_TENSORRT=0 + if use cuda; then + export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda" + export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" + export TF_CUDA_VERSION="$(cuda_toolkit_version)" + export TF_CUDNN_VERSION="$(cuda_cudnn_version)" + einfo "Setting CUDA version: $TF_CUDA_VERSION" + einfo "Setting CUDNN version: $TF_CUDNN_VERSION" + + if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then + ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0." + ewarn "These may not be optimal for your GPU." + ewarn "" + ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU," + ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow." + ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5" + ewarn "" + ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" + ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" + fi + fi + + # com_googlesource_code_re2 weird branch using absl, doesnt work with released re2 + local SYSLIBS=( + absl_py + astor_archive + boringssl + com_github_googleapis_googleapis + com_github_googlecloudplatform_google_cloud_cpp + com_google_protobuf + curl + cython + double_conversion + enum34_archive + flatbuffers + functools32_archive + gast_archive + gif + grpc + hwloc + icu + libjpeg_turbo + jsoncpp_git + keras_applications_archive + lmdb + nasm + nsync + opt_einsum_archive + org_sqlite + pasta + pcre + png + pybind11 + six_archive + snappy + swig + termcolor_archive + wrapt + zlib_archive + ) + + export TF_SYSTEM_LIBS="${SYSLIBS[@]}" + export TF_IGNORE_MAX_BAZEL_VERSION=1 + + # This is not autoconf + ./configure || die + + echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die + echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die + echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die + } + if use python; then + python_foreach_impl run_in_build_dir do_configure + else + do_configure + fi +} + +src_compile() { + export JAVA_HOME=$(java-config --jre-home) # so keepwork works + + if use python; then + python_setup + BUILD_DIR="${S}-${EPYTHON/./_}" + cd "${BUILD_DIR}" + fi + + # fail early if any deps are missing + ebazel build --nobuild \ + //tensorflow:libtensorflow_framework.so \ + //tensorflow:libtensorflow.so \ + //tensorflow:libtensorflow_cc.so \ + $(usex python '//tensorflow/tools/pip_package:build_pip_package' '') + + ebazel build \ + //tensorflow:libtensorflow_framework.so \ + //tensorflow:libtensorflow.so + ebazel build //tensorflow:libtensorflow_cc.so + + do_compile() { + ebazel build //tensorflow/tools/pip_package:build_pip_package + } + BUILD_DIR="${S}" + cd "${BUILD_DIR}" + use python && python_foreach_impl run_in_build_dir do_compile + ebazel shutdown +} + +src_install() { + local i j + export JAVA_HOME=$(java-config --jre-home) # so keepwork works + + do_install() { + einfo "Installing ${EPYTHON} files" + local srcdir="${T}/src-${MULTIBUILD_VARIANT}" + mkdir -p "${srcdir}" || die + bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die + cd "${srcdir}" || die + esetup.py 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}_core/lib${PN}_framework.so* || die + python_optimize + } + + if use python; then + python_foreach_impl run_in_build_dir do_install + + # Symlink to python-exec scripts + for i in "${ED}"/usr/lib/python-exec/*/*; do + n="${i##*/}" + [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}" + done + + python_setup + local BUILD_DIR="${S}-${EPYTHON/./_}" + cd "${BUILD_DIR}" || die + fi + + einfo "Installing headers" + ebazel build //tensorflow:install_headers + ebazel shutdown + insinto /usr/include/${PN}/ + doins -r bazel-genfiles/tensorflow/include/* + + einfo "Installing libs" + # Generate pkg-config file + ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die + insinto /usr/$(get_libdir)/pkgconfig + doins ${PN}.pc ${PN}_cc.pc + + 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 +} diff --git a/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild deleted file mode 100644 index 8ae81ea41a8b..000000000000 --- a/sci-libs/tensorflow/tensorflow-2.1.0_rc2.ebuild +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{3_6,3_7} ) -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs - -DESCRIPTION="Computation framework using data flow graphs for scalable machine learning" -HOMEPAGE="https://www.tensorflow.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda mpi +python xla" -CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4" -for i in $CPU_USE_FLAGS_X86; do - IUSE+=" cpu_flags_x86_$i" -done - -# distfiles that bazel uses for the workspace, will be copied to basel-distdir -bazel_external_uris=" - https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz - https://gitlab.com/libeigen/eigen/-/archive/4e696901f873a2347f76d931cf2f701e31e15d05/eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz -> eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz - https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz - https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz - https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz - https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip - https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz - 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 - 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 - https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz - 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/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz - https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz - https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz - https://github.com/llvm/llvm-project/archive/ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz -> llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz - cuda? ( - https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.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://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.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}" - -RDEPEND=" - app-arch/snappy - dev-db/lmdb - dev-db/sqlite - dev-libs/double-conversion - dev-libs/icu - ~dev-libs/jsoncpp-1.9.1 - dev-libs/libpcre - dev-libs/nsync - dev-libs/openssl:0= - >=dev-libs/protobuf-3.8.0:= - >=dev-libs/re2-0.2019.06.01 - media-libs/giflib - media-libs/libjpeg-turbo - media-libs/libpng:0 - >=net-libs/grpc-1.22.0 - net-misc/curl - sys-libs/zlib - >=sys-apps/hwloc-2 - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - dev-libs/cudnn - ) - mpi? ( virtual/mpi ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/flatbuffers-1.8.0 - dev-python/absl-py[${PYTHON_USEDEP}] - >=dev-python/astor-0.7.1[${PYTHON_USEDEP}] - dev-python/gast[${PYTHON_USEDEP}] - >=dev-python/numpy-1.16[${PYTHON_USEDEP}] - dev-python/google-pasta[${PYTHON_USEDEP}] - dev-python/opt-einsum[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/termcolor[${PYTHON_USEDEP}] - >=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}] - >=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}] - >=net-libs/google-cloud-cpp-0.10.0 - >=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}] - >=sci-libs/keras-preprocessing-1.1.0[${PYTHON_USEDEP}] - >=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - python? ( - dev-python/mock - dev-python/setuptools - )" -PDEPEND="python? ( - >=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}] - )" -BDEPEND=" - app-arch/unzip - >=dev-libs/protobuf-3.8.0 - dev-java/java-config - dev-lang/swig - || ( - =dev-util/bazel-0.27* - =dev-util/bazel-0.29* - ) - cuda? ( - >=dev-util/nvidia-cuda-toolkit-9.1[profiler] - ) - !python? ( dev-lang/python ) - python? ( - dev-python/cython - dev-python/mock - >=dev-python/grpcio-tools-1.22.0 - )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch" - "${FILESDIR}/tensorflow-2.1.0-external_libs.patch" - "${FILESDIR}/tensorflow-2.1.0-python3.8-pywrap_tensor.patch" -) -DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) -CHECKREQS_MEMORY="5G" -CHECKREQS_DISK_BUILD="10G" - -get-cpu-flags() { - local i f=() - # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc. - for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do - use cpu_flags_x86_${i} && f+=( -m${i/_/.} ) - done - use cpu_flags_x86_fma3 && f+=( -mfma ) - echo "${f[*]}" -} - -pkg_setup() { - ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities" - ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:" - ewarn "https://www.tensorflow.org/guide/migrate" - - local num_pythons_enabled - num_pythons_enabled=0 - count_impls(){ - num_pythons_enabled=$((${num_pythons_enabled} + 1)) - } - use python && python_foreach_impl count_impls - - # 10G to build C/C++ libs, 5G per python impl - CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G" - check-reqs_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack "${P}.tar.gz" - bazel_load_distfiles "${bazel_external_uris}" -} - -src_prepare() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - append-flags $(get-cpu-flags) - bazel_setup_bazelrc - - if ver_test "$(cuda_toolkit_version)" -ge "10.2"; then - eapply "${FILESDIR}/tensorflow-2.1.0-cuda_10.2_support_bin2c.patch" - fi - - default - use python && python_copy_sources - - use cuda && cuda_add_sandbox -} - -src_configure() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - do_configure() { - export CC_OPT_FLAGS=" " - export TF_ENABLE_XLA=$(usex xla 1 0) - export TF_NEED_OPENCL_SYCL=0 - export TF_NEED_OPENCL=0 - export TF_NEED_COMPUTECPP=0 - export TF_NEED_ROCM=0 - export TF_NEED_MPI=$(usex mpi 1 0) - export TF_SET_ANDROID_WORKSPACE=0 - - if use python; then - python_export PYTHON_SITEDIR - export PYTHON_BIN_PATH="${PYTHON}" - export PYTHON_LIB_PATH="${PYTHON_SITEDIR}" - else - export PYTHON_BIN_PATH="$(which python)" - export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')" - fi - - export TF_NEED_CUDA=$(usex cuda 1 0) - export TF_DOWNLOAD_CLANG=0 - export TF_CUDA_CLANG=0 - export TF_NEED_TENSORRT=0 - if use cuda; then - export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda" - export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" - export TF_CUDA_VERSION="$(cuda_toolkit_version)" - export TF_CUDNN_VERSION="$(cuda_cudnn_version)" - einfo "Setting CUDA version: $TF_CUDA_VERSION" - einfo "Setting CUDNN version: $TF_CUDNN_VERSION" - - if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then - ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0." - ewarn "These may not be optimal for your GPU." - ewarn "" - ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU," - ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5" - ewarn "" - ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" - ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" - fi - fi - - # com_googlesource_code_re2 weird branch using absl, doesnt work with released re2 - local SYSLIBS=( - absl_py - astor_archive - boringssl - com_github_googleapis_googleapis - com_github_googlecloudplatform_google_cloud_cpp - com_google_protobuf - curl - cython - double_conversion - enum34_archive - flatbuffers - functools32_archive - gast_archive - gif - grpc - hwloc - icu - libjpeg_turbo - jsoncpp_git - keras_applications_archive - lmdb - nasm - nsync - opt_einsum_archive - org_sqlite - pasta - pcre - png - six_archive - snappy - swig - termcolor_archive - wrapt - zlib_archive - ) - - export TF_SYSTEM_LIBS="${SYSLIBS[@]}" - export TF_IGNORE_MAX_BAZEL_VERSION=1 - - # This is not autoconf - ./configure || die - - echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die - echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die - echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die - } - if use python; then - python_foreach_impl run_in_build_dir do_configure - else - do_configure - fi -} - -src_compile() { - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - if use python; then - python_setup - BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" - fi - - # fail early if any deps are missing - ebazel build --nobuild \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so \ - //tensorflow:libtensorflow_cc.so \ - $(usex python '//tensorflow/tools/pip_package:build_pip_package' '') - - ebazel build \ - //tensorflow:libtensorflow_framework.so \ - //tensorflow:libtensorflow.so - ebazel build //tensorflow:libtensorflow_cc.so - - do_compile() { - ebazel build //tensorflow/tools/pip_package:build_pip_package - } - BUILD_DIR="${S}" - cd "${BUILD_DIR}" - use python && python_foreach_impl run_in_build_dir do_compile - ebazel shutdown -} - -src_install() { - local i j - export JAVA_HOME=$(java-config --jre-home) # so keepwork works - - do_install() { - einfo "Installing ${EPYTHON} files" - local srcdir="${T}/src-${MULTIBUILD_VARIANT}" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die - cd "${srcdir}" || die - esetup.py 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}_core/lib${PN}_framework.so* || die - python_optimize - } - - if use python; then - python_foreach_impl run_in_build_dir do_install - - # Symlink to python-exec scripts - for i in "${ED}"/usr/lib/python-exec/*/*; do - n="${i##*/}" - [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}" - done - - python_setup - local BUILD_DIR="${S}-${EPYTHON/./_}" - cd "${BUILD_DIR}" || die - fi - - einfo "Installing headers" - ebazel build //tensorflow:install_headers - ebazel shutdown - insinto /usr/include/${PN}/ - doins -r bazel-genfiles/tensorflow/include/* - - einfo "Installing libs" - # Generate pkg-config file - ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc ${PN}_cc.pc - - 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 -} -- cgit v1.2.3