commit: 441ee7c85cabc9f36c87fd303b305efd0cb520bd
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 04:38:49 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 05:27:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=441ee7c8
sci-libs/tensorflow: Install missing generated header files
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-libs/tensorflow/Manifest | 1 -
sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild | 361 ---------------------
...0_rc1.ebuild => tensorflow-1.9.0_rc1-r1.ebuild} | 26 +-
3 files changed, 21 insertions(+), 367 deletions(-)
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index e12b57b0739..fbb145dc3c0 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -47,7 +47,6 @@ DIST sqlite-amalgamation-3200000.zip 2069628 BLAKE2B
97b641fdd143af8bd1f4b7b733f
DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B
af25542f81ac0592d143695466de785779dc8002ebc5b6cf20cb2d56a66cf12b9d4f73392b6ac696b8107beca0e5c3a3e03efb703fa49fc380355d1e9302e78a
SHA512
5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1
DIST swig-3.0.8.tar.gz 7937213 BLAKE2B
38f17631a36f178a478bf77f1a7ea77b50b91ed95ca0363f0f75d86bf7da6d855db314c1b7e67634b0e6e1438a0d141d0241595987142154ee356d60955248bc
SHA512
85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906
DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B
7384c2cf742fb5a8b4e266e95080ae2513c1b112ab97f74839fa8e81bd91bd24645be8afb02e4447ad5fba9f47c4d146f59aa12085937cd3a364ec34c99590f3
SHA512
7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d
-DIST tensorflow-1.9.0_rc0.tar.gz 23632522 BLAKE2B
2049f97edb18fe34963c2706dc7249102204bacbd568c7a1ae880d9d94ba2a24b47f577ef71b6bf40e55b4c42537a2184e0ab2ad8e27cdbfcc9508cfa70515a8
SHA512
55b165882ce965c8b46ebb91e26b5828c3b71d6c07b8d5a321e890e9b5c00e896de511fc1d9e9b2f7f4f33311da6add32c7f7b55631eab8fedcc2167186649e3
DIST tensorflow-1.9.0_rc1.tar.gz 23639406 BLAKE2B
94f7254b67ebbcf7a6c46f194bf00ecb4e386cf90b74ef436febdbe1f4e9b4e206aeaabd9392f1023d8486ffd91b9e7814a64f8c7275a198a3040a76181d282e
SHA512
3354738c6f6e3c8336bd7186379dc8ef02e12aa83db4b65a93a644f5435254fc253f897dfd2b307b2fe77b1dbe6f506f1fccc4d0ea6e04cdf3e3eb9a52ca81fd
DIST tensorflow-python-license.txt 45132 BLAKE2B
1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa
SHA512
1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B
8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb
SHA512
4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
b/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
deleted file mode 100644
index 77831fe2862..00000000000
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit distutils-r1 multiprocessing 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 jemalloc 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://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
-
http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
- http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
- https://bitbucket.org/eigen/eigen/get/6913f0cf7d06.tar.gz ->
eigen-6913f0cf7d06.tar.gz
- https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz
-
https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz
-> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz
-
https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
-> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
- https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz ->
libpng-v1.6.34.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/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz
-> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz
-
https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz
-> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz
-
https://github.com/google/re2/archive/26cd968b735e227361c9703683266f01e5df7857.tar.gz
-> re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz
- https://github.com/google/snappy/archive/1.1.7.tar.gz ->
snappy-1.1.7.tar.gz
-
https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
-> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
- https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz ->
libjpeg_turbo-1.5.3.tar.gz
-
https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz
-> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz
- https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
- https://zlib.net/zlib-1.2.11.tar.gz
- https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz ->
jemalloc-4.4.0.tar.gz
- python? (
- http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz
-
http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
- https://curl.haxx.se/download/curl-7.49.1.tar.gz
- https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
-
https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz
-> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz
- https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz ->
aws_sdk_cpp-1.3.15.tar.gz
-
https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
-> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
- https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz
-> librdkafka-v0.11.1.tar.gz
-
https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
-> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
-
https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz
-> flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz
- https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz ->
libxsmm-1.8.1.tar.gz
-
https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
-> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
- https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz ->
mkl_dnn-v0.12.tar.gz
-
https://github.com/llvm-mirror/llvm/archive/7e78daafdd22f3f17720a103d29d89590534004e.tar.gz
-> llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz
-
https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt ->
tensorflow-python-license.txt
-
https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
-
https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
-
https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-
https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
- https://pypi.python.org/packages/source/s/six/six-1.10.0.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/libpcre
- dev-libs/protobuf
- dev-libs/protobuf-c
- >=dev-libs/re2-0.2018.04.01
- media-libs/giflib
- media-libs/libpng:0
- net-libs/grpc[${PYTHON_USEDEP}]
- net-misc/curl
- sys-libs/zlib
- virtual/jpeg:0
- cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0.61[profiler]
>=dev-libs/cudnn-6.0 )
- jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
- mpi? ( virtual/mpi )
- python? (
- ${PYTHON_DEPS}
- dev-python/absl-py[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/termcolor[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- !python? ( dev-lang/python )
- app-arch/unzip
- >=dev-util/bazel-0.14.0
- dev-java/java-config
- dev-lang/nasm
- dev-lang/swig
- dev-python/cython
- dev-python/mock"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-PATCHES=(
-)
-
-bazel-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[*]}"
-}
-
-bazel-get-flags() {
- local i fs=()
- for i in ${CFLAGS} $(bazel-get-cpu-flags); do
- fs+=( "--copt=${i}" "--host_copt=${i}" )
- done
- for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
- fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
- done
- for i in ${CPPFLAGS}; do
- fs+=( "--copt=${i}" "--host_copt=${i}" )
- fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
- done
- for i in ${LDFLAGS}; do
- fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
- done
- echo "${fs[*]}"
-}
-
-setup_bazelrc() {
- if [[ -f "${T}/bazelrc" ]]; then
- return
- fi
-
- # F: fopen_wr
- # P: /proc/self/setgroups
- # Even with standalone enabled, the Bazel sandbox binary is run for
feature test:
- #
https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
- #
https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
- addpredict /proc
-
- mkdir -p "${T}/bazel-cache" || die
- mkdir -p "${T}/bazel-distdir" || die
-
- cat > "${T}/bazelrc" <<-EOF
- startup --batch
-
- # dont strip HOME, portage sets a temp per-package dir
- build --action_env HOME
-
- # make bazel respect MAKEOPTS
- build --jobs=$(makeopts_jobs) $(bazel-get-flags)
- build --compilation_mode=opt --host_compilation_mode=opt
-
- # Use standalone strategy to deactivate the bazel sandbox, since it
- # conflicts with FEATURES=sandbox.
- build --spawn_strategy=standalone --genrule_strategy=standalone
- test --spawn_strategy=standalone --genrule_strategy=standalone
-
- build --strip=never
- build --verbose_failures --noshow_loading_progress
- test --verbose_test_summary --verbose_failures --noshow_loading_progress
-
- # make bazel only fetch distfiles from the cache
- fetch --repository_cache=${T}/bazel-cache/
--experimental_distdir=${T}/bazel-distdir/
- build --repository_cache=${T}/bazel-cache/
--experimental_distdir=${T}/bazel-distdir/
- EOF
-}
-
-ebazel() {
- setup_bazelrc
-
- # Use different build folders for each multibuild variant.
- local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
- local output_base="${WORKDIR}/bazel-base${base_suffix}"
- mkdir -p "${output_base}" || die
-
- einfo Running: bazel --output_base="${output_base}" "$@"
- bazel --output_base="${output_base}" $@ || die
-}
-
-load_distfiles() {
- # Populate the bazel distdir to fetch from since it cannot use the
network
- local src dst uri rename
-
- while read uri rename dst; do
- src="${uri##*/}"
- [[ -z $src ]] && continue
- if [[ "$rename" != "->" ]]; then
- dst="${src}"
- fi
-
- [[ ${A} =~ ${dst} ]] || continue
-
- if [[ "$dst" == "$src" ]]; then
- einfo "Copying $dst to bazel distdir $src ..."
- else
- einfo "Copying $dst to bazel distdir ..."
- fi
- cp "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
- done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//' <<<
"${bazel_external_uris}")"
-}
-
-pkg_setup() {
- export JAVA_HOME=$(java-config --jre-home)
-}
-
-src_unpack() {
- # Only unpack the main distfile
- unpack "${P}.tar.gz"
-}
-
-src_prepare() {
- BAZEL_OUTPUT_BASE="${WORKDIR}/bazel-base"
- mkdir -p "${BAZEL_OUTPUT_BASE}" || die
- setup_bazelrc
- load_distfiles
-
- default
- use python && python_copy_sources
-}
-
-src_configure() {
- do_configure() {
- export CC_OPT_FLAGS=""
- export GCC_HOST_COMPILER_PATH=$(which $(tc-getCC))
- export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
- export TF_NEED_GCP=0
- export TF_NEED_HDFS=0
- export TF_NEED_S3=0
- export TF_NEED_KAFKA=0
- export TF_ENABLE_XLA=0
- export TF_NEED_GDR=0
- export TF_NEED_VERBS=0
- export TF_NEED_OPENCL_SYCL=0
- export TF_NEED_OPENCL=0
- export TF_NEED_COMPUTECPP=0
- export TF_NEED_MKL=0
- export TF_NEED_MPI=$(usex mpi 1 0)
- export TF_DOWNLOAD_CLANG=0
- export TF_NEED_CUDA=$(usex cuda 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
-
- # Only one bazelrc is read, import our one before configure
sets its options
- echo "import ${T}/bazelrc" >> ./.bazelrc
-
- # This is not autoconf
- ./configure || die
-
- sed -i '/strip=always/d' .tf_configure.bazelrc || die
- }
- if use python; then
- python_foreach_impl run_in_build_dir do_configure
- else
- do_configure
- fi
-}
-
-src_compile() {
- if use python; then
- python_setup
- local MULTIBUILD_VARIANT="${EPYTHON/./_}"
- cd "${S}-${MULTIBUILD_VARIANT}" || die
- fi
-
- ebazel build \
- $(usex cuda --config=cuda '') \
- //tensorflow:libtensorflow_framework.so \
- //tensorflow:libtensorflow.so \
- //tensorflow:libtensorflow_cc.so
-
- do_compile() {
- ebazel build \
- $(usex cuda --config=cuda '') \
- //tensorflow/tools/pip_package:build_pip_package
- }
- use python && python_foreach_impl run_in_build_dir do_compile
-}
-
-src_install() {
- do_install() {
- einfo "Installing ${EPYTHON} files"
- local srcdir="${T}/src-${EPYTHON/./_}"
- mkdir -p "${srcdir}" || die
- bazel-bin/tensorflow/tools/pip_package/build_pip_package --src
"${srcdir}" || die
- cd "${srcdir}" || die
- esetup.py install
-
- # It installs site-packages/external but shouldnt
- python_export PYTHON_SITEDIR
- rm -rf "${D}/${PYTHON_SITEDIR}/external" || die
- sed -i '/^external/d'
"${D}/${PYTHON_SITEDIR}"/${P/_rc/rc}-*.egg-info/{SOURCES,top_level}.txt || die
-
- # Symlink to the main .so file
- rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" ||
die
- dosym "../../../lib${PN}_framework.so"
"${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 "${D}"/usr/lib/python-exec/*/*; do
- n="${i##*/}"
- [[ -e "${D}/usr/bin/${n}" ]] || dosym
../lib/python-exec/python-exec2 "/usr/bin/$n"
- done
-
- python_setup
- local MULTIBUILD_VARIANT="${EPYTHON/./_}"
- cd "${S}-${MULTIBUILD_VARIANT}" || die
- fi
-
- einfo "Installing headers"
- # Install c c++ and core header files
- for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
- insinto /usr/include/${PN}/${i%/*}
- doins ${i}
- done
-
- # Eigen headers
- insinto /usr/include/${PN}/third_party/eigen3/Eigen/
- doins third_party/eigen3/Eigen/*
-
- einfo "Installing libs"
- # Generate pkg-config file
- ${PN}/c/generate-pc.sh --prefix=/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
-}
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
similarity index 94%
rename from sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
rename to sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
index 207901b8834..cdd7f2db180 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
@@ -111,8 +111,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S="${WORKDIR}/${MY_P}"
DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-PATCHES=(
-)
bazel-get-cpu-flags() {
local i f=()
@@ -304,6 +302,7 @@ src_compile() {
}
src_install() {
+ local i j
do_install() {
einfo "Installing ${EPYTHON} files"
local srcdir="${T}/src-${EPYTHON/./_}"
@@ -338,6 +337,9 @@ src_install() {
cd "${S}-${MULTIBUILD_VARIANT}" || die
fi
+ local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+ local output_base="${WORKDIR}/bazel-base${base_suffix}"
+
einfo "Installing headers"
# Install c c++ and core header files
for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
@@ -345,9 +347,23 @@ src_install() {
doins ${i}
done
- # Eigen headers
- insinto /usr/include/${PN}/third_party/eigen3/Eigen/
- doins third_party/eigen3/Eigen/*
+ einfo "Installing generated headers"
+ for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+ j=${i#bazel-genfiles/}
+ insinto /usr/include/${PN}/${j%/*}
+ doins ${i}
+ done
+
+ einfo "Installing Eigen headers"
+ insinto /usr/include/${PN}/third_party/eigen3/
+ doins -r third_party/eigen3/Eigen
+ insinto /usr/include/${PN}/third_party/eigen3/unsupported/
+ doins -r third_party/eigen3/unsupported/Eigen
+
+ insinto /usr/include/${PN}/
+ doins -r "$output_base"/external/eigen_archive/Eigen
+ insinto /usr/include/${PN}/unsupported/
+ doins -r "$output_base"/external/eigen_archive/unsupported/Eigen
einfo "Installing libs"
# Generate pkg-config file
