commit: 61d7366d7af761835634c5f3cc9c4c89dd74c171 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Sat Mar 30 14:21:37 2019 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Fri Apr 5 15:38:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d7366d
sci-libs/tensorflow: bump 1.13.1 Closes: https://bugs.gentoo.org/682000 Closes: https://bugs.gentoo.org/678920 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 sci-libs/tensorflow/Manifest | 1 + sci-libs/tensorflow/metadata.xml | 1 - sci-libs/tensorflow/tensorflow-1.13.1.ebuild | 326 +++++++++++++++++++++++++++ 3 files changed, 327 insertions(+), 1 deletion(-) diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest index 5f40d24cfc9..edb1878c323 100644 --- a/sci-libs/tensorflow/Manifest +++ b/sci-libs/tensorflow/Manifest @@ -34,6 +34,7 @@ DIST tensorflow-1.11.0.tar.gz 25024790 BLAKE2B 74129fb1e6db0317fd45266dae7aa4fab DIST tensorflow-1.12.0.tar.gz 26341737 BLAKE2B 6b9e21a9367ec7454916af327ae21fc6c46e54885f30823784985a61193654fd1942cbd3b5688f55cbd63f890417eac812d0cdb576d0f0b8677df92c259837c0 SHA512 b145a9118856aa00a829ab6af89bff4e1e131371c96d77b07532544112803c4574d97ef224b28a64437a2af8db4286786dc0b4123efe110b2aa734b443a7e238 DIST tensorflow-1.13.0_rc0.tar.gz 31616223 BLAKE2B b4cb76cdb0e79639e8a1282835101d8a5e23a0e9d659dfbc01d8395528d05c434d0cc93df010086acbc338590d8ced3d95b4b00d6e1a7ebbe8d1df1f87265114 SHA512 0d8f88a8882ae1f69eee82fd54a836b3a0629c6a274af8ef329421445aeb446b651b90285c3ea19cb768860fd759e715dea481d5a07ec722ebd34323331e61dd DIST tensorflow-1.13.0_rc2.tar.gz 31616906 BLAKE2B 94e6ba8a56cad25e1c90950c75129d77bd6351dcd4e87721efb41cd560835ca7212d1f1a932c54c2f328756f92afe1fe299c48e9b520aea74bbb3b0928b0c356 SHA512 a0b5c961f56530cf5245d4f2f0d51642829dd348b811315eff533dae9f77d38e99f03ec0d61c40a20237758916a7173f4baf99a474717c1aefc111614f9171e0 +DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb DIST tensorflow-patches-1.10.0.tar.bz2 4032 BLAKE2B 8588deec74179d8044af631de8e651491cc713553ee15ece9dff5052bd95b10924bdbe4301453f00d0f2fccd5d595d496b48fe45b0259837653b2de9e1898ab9 SHA512 1f57995ca9b3278735636cc42c88dc45558fa6a1d656108293f8df3fd9961d75f5e979bf0a9909136134e1cdaab41a34f83e605b48b23dddf17a6b1be684117b DIST tensorflow-patches-1.11.0.tar.bz2 11013 BLAKE2B 929cb9fee5e6b63f00341351908d3050c676670d9cc2c1241bd2e3c86601704a7495ab598b992718f0b51fc369e33e7c646bc5db3ba3b86b18326b1c2d2974a8 SHA512 76a94c9444e1d984afaf080222d430032636204d05a5e3ff5530012dfa1eba78619dd2a2942343ccc2f7fc489eb8c6f51fddd0b84cb2c2db645b2b914cc61f80 DIST tensorflow-patches-1.12.0.tar.bz2 10638 BLAKE2B fc2c30f6b425390f5791df8ec409165aa4cc242eb93885845cc34e8302f781b267efaebf9e996f0cbc7558d975d742fb2e5509df9f06d85a370ea73795f92c49 SHA512 2b734e206eda58c898ad7090b3fe371b08c06dcb52d07fc0991548cec7e45c2500e797dd7b98b8a3a4416b85c8886314bd75921d0cd6d942a7cd15688954dd5d diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml index 1dca7af5e0f..fd7eed03454 100644 --- a/sci-libs/tensorflow/metadata.xml +++ b/sci-libs/tensorflow/metadata.xml @@ -10,7 +10,6 @@ </longdescription> <use> <flag name="cuda">Enable support for nVidia CUDA</flag> - <flag name="mpi">Enable support for MPI</flag> <flag name="system-libs">Link with system instead of bundled libraries</flag> </use> <upstream> diff --git a/sci-libs/tensorflow/tensorflow-1.13.1.ebuild b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild new file mode 100644 index 00000000000..22f3f9300fa --- /dev/null +++ b/sci-libs/tensorflow/tensorflow-1.13.1.ebuild @@ -0,0 +1,326 @@ +# Copyright 1999-2019 Jason Zaman +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python2_7 python{3_5,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" +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=" + 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://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/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz + https://github.com/nlopezgi/bazel-toolchains/archive/3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz -> bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.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 + 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 + dev-db/sqlite + dev-libs/icu + >=dev-libs/jsoncpp-1.8.4 + dev-libs/libpcre + dev-libs/nsync + dev-libs/openssl:0= + >=dev-libs/protobuf-3.6.0 + >=dev-libs/re2-0.2018.04.01 + media-libs/giflib + media-libs/libjpeg-turbo + media-libs/libpng:0 + >=net-libs/grpc-1.16.0 + net-misc/curl + sys-libs/zlib + 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* ) + ) + ) + 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[${PYTHON_USEDEP}] + dev-python/google-pasta[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/termcolor[${PYTHON_USEDEP}] + dev-python/grpcio[${PYTHON_USEDEP}] + net-libs/google-cloud-cpp + >=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}] + virtual/python-enum34[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} + dev-python/mock" +PDEPEND="python? ( + >=sci-libs/tensorflow-estimator-1.13.0[${PYTHON_USEDEP}] + )" +BDEPEND=" + app-arch/unzip + >=dev-libs/protobuf-3.6.0 + dev-java/java-config + dev-python/mock + dev-lang/swig + dev-python/cython + cuda? ( + >=dev-util/nvidia-cuda-toolkit-8.0[profiler] + ) + !python? ( dev-lang/python ) + python? ( + dev-python/grpcio-tools + )" +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="5G" + +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() { + local num_pythons_enabled + num_pythons_enabled=0 + count_impls(){ + num_pythons_enabled=$((${num_pythons_enabled} + 1)) + } + use python && python_foreach_impl count_impls + + # 5 G to build C/C++ libs, 5G per python impl + CHECKREQS_DISK_BUILD="$((5 + 5 * $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 + + 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=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 CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda" + export CUDNN_INSTALL_PATH="${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" + einfo "Setting CUDNN version: $TF_CUDNN_VERSION" + fi + + local SYSLIBS=( + absl_py + astor_archive + boringssl + com_github_googleapis_googleapis + com_github_googlecloudplatform_google_cloud_cpp + com_google_protobuf + com_google_protobuf_cc + com_googlesource_code_re2 + curl + cython + flatbuffers + gast_archive + gif_archive + grpc + icu + jpeg + jsoncpp_git + keras_applications_archive + lmdb + nasm + nsync + org_sqlite + pcre + png_archive + protobuf_archive + six_archive + snappy + swig + termcolor_archive + 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 --config=noignite --config=nokafka' >> .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 + 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 + + 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 + + einstalldocs +}
