| 1 |
commit: 1c845e66f1f35f54b72789fa8e787c59ccbed19f |
| 2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 2 04:55:44 2018 +0000 |
| 4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 2 04:55:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1c845e66 |
| 7 |
|
| 8 |
sci-libs/tensorflow: Use CPPFLAGS, CXXFLAGS, LDFLAGS. |
| 9 |
|
| 10 |
Setting CPPFLAGS should help #861 sci-libs/tensorflow: respect EPREFIX. |
| 11 |
|
| 12 |
Require [${PYTHON_USEDEP}] on Python deps, which should help the |
| 13 |
dev-python/wheel not working in #849 sci-libs/tensorflow: new package, |
| 14 |
ebuilds with IUSE="cuda mpi" need improvements. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 17 |
|
| 18 |
sci-libs/tensorflow/tensorflow-1.8.0.ebuild | 40 ++++++++++++++++++++++++----- |
| 19 |
1 file changed, 33 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild |
| 22 |
index 15e09b50b..cfef9ea2a 100644 |
| 23 |
--- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild |
| 24 |
+++ b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild |
| 25 |
@@ -37,13 +37,13 @@ IUSE="cuda cxx mpi" |
| 26 |
# dev-python/gast |
| 27 |
DEPEND=" |
| 28 |
cxx? ( dev-libs/protobuf ) |
| 29 |
- dev-python/absl-py |
| 30 |
- dev-python/astor |
| 31 |
- dev-python/numpy |
| 32 |
- dev-python/protobuf-python |
| 33 |
- dev-python/six |
| 34 |
- dev-python/termcolor |
| 35 |
- dev-python/wheel |
| 36 |
+ dev-python/absl-py[${PYTHON_USEDEP}] |
| 37 |
+ dev-python/astor[${PYTHON_USEDEP}] |
| 38 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
| 39 |
+ dev-python/protobuf-python[${PYTHON_USEDEP}] |
| 40 |
+ dev-python/six[${PYTHON_USEDEP}] |
| 41 |
+ dev-python/termcolor[${PYTHON_USEDEP}] |
| 42 |
+ dev-python/wheel[${PYTHON_USEDEP}] |
| 43 |
dev-libs/jemalloc |
| 44 |
dev-libs/protobuf-c |
| 45 |
dev-util/bazel |
| 46 |
@@ -109,17 +109,43 @@ src_compile() { |
| 47 |
addpredict /proc |
| 48 |
|
| 49 |
local opt=$(usex cuda "--config=cuda" "") |
| 50 |
+ local fs="" |
| 51 |
+ for i in ${CXXFLAGS}; do |
| 52 |
+ [[ -n "${fs}" ]] && fs+=" " |
| 53 |
+ fs+="--cxxopt=${i}" |
| 54 |
+ done |
| 55 |
+ for i in ${CPPFLAGS}; do |
| 56 |
+ [[ -n "${fs}" ]] && fs+=" " |
| 57 |
+ fs+="--copt=${i}" |
| 58 |
+ fs+="--cxxopt=${i}" |
| 59 |
+ done |
| 60 |
+ for i in ${LDFLAGS}; do |
| 61 |
+ [[ -n "${fs}" ]] && fs+=" " |
| 62 |
+ fs+="--linkopt=${i}" |
| 63 |
+ done |
| 64 |
einfo ">>> Compiling ${PN} C"$(usex cxx " and C++" "") |
| 65 |
+ einfo " bazel build \\" |
| 66 |
+ einfo " --config=opt ${opt} \\" |
| 67 |
+ einfo " ${fs} \\" |
| 68 |
+ einfo " //tensorflow:libtensorflow.so \\" |
| 69 |
+ einfo " //tensorflow:libtensorflow_framework.so \\" |
| 70 |
+ einfo " "$(usex cxx "//tensorflow:libtensorflow_cc.so" "") |
| 71 |
bazel build \ |
| 72 |
--config=opt ${opt} \ |
| 73 |
+ ${fs} \ |
| 74 |
//tensorflow:libtensorflow.so \ |
| 75 |
//tensorflow:libtensorflow_framework.so \ |
| 76 |
$(usex cxx "//tensorflow:libtensorflow_cc.so" "") || die |
| 77 |
|
| 78 |
python_compile() { |
| 79 |
einfo ">>> Compiling ${PN} ${MULTIBUILD_VARIANT}" |
| 80 |
+ einfo " bazel build \\" |
| 81 |
+ einfo " --config=opt ${opt} \\" |
| 82 |
+ einfo " ${fs} \\" |
| 83 |
+ einfo " //tensorflow/tools/pip_package:build_pip_package" |
| 84 |
bazel build \ |
| 85 |
--config=opt ${opt} \ |
| 86 |
+ ${fs} \ |
| 87 |
//tensorflow/tools/pip_package:build_pip_package || die |
| 88 |
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg || die |
| 89 |
unzip -o -d ${PN}_pkg_${MULTIBUILD_VARIANT} ${PN}_pkg/${P}-*.whl || die |
Archives