[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: e9da317aa051172dcdffc6cfa472fac67d4586d3 Author: Aisha Tammy aisha cc> AuthorDate: Sat Sep 26 17:33:38 2020 + Commit: Aisha Tammy aisha cc> CommitDate: Sat Sep 26 17:33:38 2020 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e9da317a sci-libs/tensorflow: drop package present in ::gentoo (recommended additions - pointy stick in eye) Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Aisha Tammy aisha.cc> sci-libs/tensorflow/metadata.xml| 15 --- sci-libs/tensorflow/tensorflow-1.0.1.ebuild | 28 sci-libs/tensorflow/tensorflow-1.5.0.ebuild | 43 -- sci-libs/tensorflow/tensorflow-1.7.0.ebuild | 111 --- sci-libs/tensorflow/tensorflow-1.8.0.ebuild | 200 5 files changed, 397 deletions(-) diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml deleted file mode 100644 index b94b432fa..0 --- a/sci-libs/tensorflow/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd;> - - - mmokr...@fold.natur.cuni.cz - Martin Mokrejs - - - sci-biol...@gentoo.org - Gentoo Biology Project - - - Enable CUDA support - - diff --git a/sci-libs/tensorflow/tensorflow-1.0.1.ebuild b/sci-libs/tensorflow/tensorflow-1.0.1.ebuild deleted file mode 100644 index b2e2e596a..0 --- a/sci-libs/tensorflow/tensorflow-1.0.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) - -inherit distutils-r1 eutils - -DESCRIPTION="Library for numerical computation using data flow graphs" -HOMEPAGE="https://www.tensorflow.org - https://github.com/tensorflow/tensorflow; -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="cuda mpi" - -DEPEND="dev-util/bazel - dev-python/wheel - dev-python/numpy - dev-libs/protobuf-c - cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) - mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -# TODO: seems it also support some MPI implementation diff --git a/sci-libs/tensorflow/tensorflow-1.5.0.ebuild b/sci-libs/tensorflow/tensorflow-1.5.0.ebuild deleted file mode 100644 index 0dae0c1d0..0 --- a/sci-libs/tensorflow/tensorflow-1.5.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) - -inherit distutils-r1 eutils - -DESCRIPTION="Library for numerical computation using data flow graphs" -HOMEPAGE="https://www.tensorflow.org - https://github.com/tensorflow/tensorflow; -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="cuda mpi" - -# TensorFlow 1.7 may be the last time we support Cuda versions below 8.0. -# Starting with TensorFlow 1.8 release, 8.0 will be the minimum supported -# version. -# TensorFlow 1.7 may be the last time we support cuDNN versions below 6.0. -# Starting with TensorFlow 1.8 release, 6.0 will be the minimum supported -# version. -DEPEND="dev-util/bazel - dev-python/wheel - dev-python/numpy - dev-libs/protobuf-c - cuda? ( >=dev-util/nvidia-cuda-toolkit-7.0[profiler] >=dev-libs/cudnn-3 ) - mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -# TODO: seems it also supports some MPI implementation - -src_configure(){ - # there is no setup.py but there is configure - # https://www.tensorflow.org/install/install_sources - # https://www.tensorflow.org/install/install_linux#InstallingNativePip - # - # usage: configure.py [-h] [--workspace WORKSPACE] - ./configure || die -} diff --git a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild deleted file mode 100644 index 758872b99..0 --- a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) - -inherit python-r1 distutils-r1 eutils - -DESCRIPTION="Library for numerical computation using data flow graphs" -HOMEPAGE="https://www.tensorflow.org - https://github.com/tensorflow/tensorflow; -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="cuda mpi" - -# TensorFlow 1.7 may be the last time we support Cuda versions below 8.0. -# Starting with TensorFlow 1.8 release, 8.0 will be the minimum supported -# version. -# TensorFlow 1.7 may be the last time we support cuDNN
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: 367a3e9287d0c00636a4845a55fcf97af93026df Author: Mark Wright gentoo org> AuthorDate: Wed May 2 23:19:34 2018 + Commit: Mark Wright gentoo org> CommitDate: Wed May 2 23:19:34 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=367a3e92 sci-libs/tensorflow: Move our flags to bazel-get-flags() Package-Manager: Portage-2.3.33, Repoman-2.3.9 sci-libs/tensorflow/tensorflow-1.8.0.ebuild | 32 - 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild index cfef9ea2a..557095bc7 100644 --- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild @@ -99,16 +99,7 @@ src_configure(){ python_foreach_impl python_configure } -src_compile() { - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/7712/setgroups - # C: unable to read /proc/1/cmdline - addpredict /proc - - local opt=$(usex cuda "--config=cuda" "") +bazel-get-flags() { local fs="" for i in ${CXXFLAGS}; do [[ -n "${fs}" ]] && fs+=" " @@ -123,16 +114,29 @@ src_compile() { [[ -n "${fs}" ]] && fs+=" " fs+="--linkopt=${i}" done + echo "${fs}" +} + +src_compile() { + # F: fopen_wr + # S: deny + # P: /proc/self/setgroups + # A: /proc/self/setgroups + # R: /proc/7712/setgroups + # C: unable to read /proc/1/cmdline + addpredict /proc + + local opt=$(usex cuda "--config=cuda" "") einfo ">>> Compiling ${PN} C"$(usex cxx " and C++" "") einfo " bazel build \\" einfo " --config=opt ${opt} \\" - einfo " ${fs} \\" + einfo " $(bazel-get-flags) \\" einfo " //tensorflow:libtensorflow.so \\" einfo " //tensorflow:libtensorflow_framework.so \\" einfo " "$(usex cxx "//tensorflow:libtensorflow_cc.so" "") bazel build \ --config=opt ${opt} \ - ${fs} \ + $(bazel-get-flags) \ //tensorflow:libtensorflow.so \ //tensorflow:libtensorflow_framework.so \ $(usex cxx "//tensorflow:libtensorflow_cc.so" "") || die @@ -141,11 +145,11 @@ src_compile() { einfo ">>> Compiling ${PN} ${MULTIBUILD_VARIANT}" einfo " bazel build \\" einfo " --config=opt ${opt} \\" - einfo " ${fs} \\" + einfo " $(bazel-get-flags) \\" einfo " //tensorflow/tools/pip_package:build_pip_package" bazel build \ --config=opt ${opt} \ - ${fs} \ + $(bazel-get-flags) \ //tensorflow/tools/pip_package:build_pip_package || die bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg || die unzip -o -d ${PN}_pkg_${MULTIBUILD_VARIANT} ${PN}_pkg/${P}-*.whl || die
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: 1c845e66f1f35f54b72789fa8e787c59ccbed19f Author: Mark Wright gentoo org> AuthorDate: Wed May 2 04:55:44 2018 + Commit: Mark Wright gentoo org> CommitDate: Wed May 2 04:55:44 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1c845e66 sci-libs/tensorflow: Use CPPFLAGS, CXXFLAGS, LDFLAGS. Setting CPPFLAGS should help #861 sci-libs/tensorflow: respect EPREFIX. Require [${PYTHON_USEDEP}] on Python deps, which should help the dev-python/wheel not working in #849 sci-libs/tensorflow: new package, ebuilds with IUSE="cuda mpi" need improvements. Package-Manager: Portage-2.3.31, Repoman-2.3.9 sci-libs/tensorflow/tensorflow-1.8.0.ebuild | 40 - 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild index 15e09b50b..cfef9ea2a 100644 --- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild @@ -37,13 +37,13 @@ IUSE="cuda cxx mpi" # dev-python/gast DEPEND=" cxx? ( dev-libs/protobuf ) - dev-python/absl-py - dev-python/astor - dev-python/numpy - dev-python/protobuf-python - dev-python/six - dev-python/termcolor - dev-python/wheel + dev-python/absl-py[${PYTHON_USEDEP}] + dev-python/astor[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/termcolor[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] dev-libs/jemalloc dev-libs/protobuf-c dev-util/bazel @@ -109,17 +109,43 @@ src_compile() { addpredict /proc local opt=$(usex cuda "--config=cuda" "") + local fs="" + for i in ${CXXFLAGS}; do + [[ -n "${fs}" ]] && fs+=" " + fs+="--cxxopt=${i}" + done + for i in ${CPPFLAGS}; do + [[ -n "${fs}" ]] && fs+=" " + fs+="--copt=${i}" + fs+="--cxxopt=${i}" + done + for i in ${LDFLAGS}; do + [[ -n "${fs}" ]] && fs+=" " + fs+="--linkopt=${i}" + done einfo ">>> Compiling ${PN} C"$(usex cxx " and C++" "") + einfo " bazel build \\" + einfo " --config=opt ${opt} \\" + einfo " ${fs} \\" + einfo " //tensorflow:libtensorflow.so \\" + einfo " //tensorflow:libtensorflow_framework.so \\" + einfo " "$(usex cxx "//tensorflow:libtensorflow_cc.so" "") bazel build \ --config=opt ${opt} \ + ${fs} \ //tensorflow:libtensorflow.so \ //tensorflow:libtensorflow_framework.so \ $(usex cxx "//tensorflow:libtensorflow_cc.so" "") || die python_compile() { einfo ">>> Compiling ${PN} ${MULTIBUILD_VARIANT}" + einfo " bazel build \\" + einfo " --config=opt ${opt} \\" + einfo " ${fs} \\" + einfo " //tensorflow/tools/pip_package:build_pip_package" bazel build \ --config=opt ${opt} \ + ${fs} \ //tensorflow/tools/pip_package:build_pip_package || die bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg || die unzip -o -d ${PN}_pkg_${MULTIBUILD_VARIANT} ${PN}_pkg/${P}-*.whl || die
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: 875c9dc4bf2929451a7630c479b9a6b2c3e35c99 Author: Mark Wright gentoo org> AuthorDate: Tue May 1 11:43:00 2018 + Commit: Mark Wright gentoo org> CommitDate: Tue May 1 11:43:00 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=875c9dc4 sci-libs/tensorflow: Fix the C++ header find Package-Manager: Portage-2.3.31, Repoman-2.3.9 sci-libs/tensorflow/tensorflow-1.8.0.ebuild | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild index 34d309cf4..15e09b50b 100644 --- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild @@ -141,10 +141,9 @@ src_install() { insinto /usr/include/${PN}/${PN}/c doins ${PN}/c/c_api.h if use cxx; then - for i in $(find ${PN}/cc ${PN}/core third_party/eigen3/unsupported \ - third_party/eigen3/Eigen \( -path third_party \ - -prune -o -type f -name \*.h -print \) -o \ - \( -path ${PN} -prune -o -type f -print \) ); do + for i in $(find ${PN}/cc ${PN}/core third_party/eigen3 -type f \ + \( -name \*.h -o \ + -wholename third_party/eigen3/Eigen/\* \) -print); do dodir $(dirname /usr/include/${PN}/${i}) insinto $(dirname /usr/include/${PN}/${i}) doins ${i}
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: 38fe3e1488bd82e32c16cc8d73de52cdb43149cc Author: Mark Wright gentoo org> AuthorDate: Tue May 1 10:19:44 2018 + Commit: Mark Wright gentoo org> CommitDate: Tue May 1 10:19:44 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=38fe3e14 sci-libs/tensorflow: Bump to 1.8.0, build C and C++ APIs Package-Manager: Portage-2.3.31, Repoman-2.3.9 sci-libs/tensorflow/tensorflow-1.8.0.ebuild | 171 1 file changed, 171 insertions(+) diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild new file mode 100644 index 0..34d309cf4 --- /dev/null +++ b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) + +inherit python-r1 distutils-r1 eutils versionator + +DESCRIPTION="Library for numerical computation using data flow graphs" +HOMEPAGE="https://www.tensorflow.org + https://github.com/tensorflow/tensorflow; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~gienah/snapshots/${P}-bazel-cache-repos.tar.xz; + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda cxx mpi" + +# To create the cache repo tar file, temporarilly remove the +# ${P}-bazel-cache-repos.tar.xz from SRC_URI and src_upack. Then build +# it so that bazel will download the files: +# FEATURES="noclean -network-sandbox" emerge -av sci-libs/tensorflow +# cd /var/tmp/portage/sci-libs/${P} +# tar --owner=portage --group=portage -cJvf \ +# /usr/portage/distfiles/${P}-bazel-cache-repos.tar.xz \ +# homedir/.cache/bazel/_bazel_portage/cache/repos/v1 + +# TensorFlow 1.7 may be the last time we support Cuda versions below 8.0. +# Starting with TensorFlow 1.8 release, 8.0 will be the minimum supported +# version. +# TensorFlow 1.7 may be the last time we support cuDNN versions below 6.0. +# Starting with TensorFlow 1.8 release, 6.0 will be the minimum supported +# version. +# Possibly missing deps: +# dev-python/gast +DEPEND=" + cxx? ( dev-libs/protobuf ) + dev-python/absl-py + dev-python/astor + dev-python/numpy + dev-python/protobuf-python + dev-python/six + dev-python/termcolor + dev-python/wheel + dev-libs/jemalloc + dev-libs/protobuf-c + dev-util/bazel + media-libs/giflib + virtual/jpeg:0 + cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0[profiler] >=dev-libs/cudnn-6 ) + mpi? ( virtual/mpi )" + #opencl? ( virtual/opencl )" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${P}.tar.gz + pushd .. || die + unpack distdir/${P}-bazel-cache-repos.tar.xz + popd || die +} + +# TODO: seems it also supports some MPI implementations +src_configure(){ + # there is no setup.py but there is configure + # https://www.tensorflow.org/install/install_sources + # https://www.tensorflow.org/install/install_linux#InstallingNativePip + # + # usage: configure.py [-h] [--workspace WORKSPACE] + python_configure() { + export PYTHON_BIN_PATH=${PYTHON} + export PYTHON_LIB_PATH=${PYTHON_SITEDIR} + export TF_NEED_JEMALLOC=1 + 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=0 + if use cuda; then + export TF_NEED_CUDA=1 + else + export TF_NEED_CUDA=0 + fi + if use mpi; then + export TF_NEED_MPI=1 + else + export TF_NEED_MPI=0 + fi + export TF_NEED_OPENCL_SYCL=0 + export CC_OPT_FLAGS=${CFLAGS} + export JAVA_HOME=$(java-config -O) + # TODO: protect by a USE flag test --config=mkl + ./configure || die + } + python_foreach_impl python_configure +} + +src_compile() { + # F: fopen_wr + # S: deny + # P: /proc/self/setgroups + # A: /proc/self/setgroups + # R: /proc/7712/setgroups + # C: unable to read /proc/1/cmdline + addpredict /proc + + local opt=$(usex cuda "--config=cuda" "") + einfo ">>> Compiling ${PN} C"$(usex cxx " and C++" "") + bazel build \ + --config=opt ${opt} \ + //tensorflow:libtensorflow.so \ + //tensorflow:libtensorflow_framework.so \ + $(usex cxx "//tensorflow:libtensorflow_cc.so" "") || die + + python_compile() { + einfo ">>> Compiling ${PN} ${MULTIBUILD_VARIANT}" +
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: 7a72b8eabc3bb168f4c817c301c61d3b8ebb4197 Author: Martin Mokrejs fold natur cuni cz> AuthorDate: Wed Apr 18 17:15:22 2018 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Wed Apr 18 17:15:22 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7a72b8ea sci-libs/tensorflow: try to determine site-packages path properly This could support multiple python installations, improving further changes from https://github.com/gentoo/sci/issues/862 However, still untested by me due to sandbox violations, sorry. Package-Manager: Portage-2.3.28, Repoman-2.3.9 sci-libs/tensorflow/tensorflow-1.7.0.ebuild | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild index 75f5d499d..758872b99 100644 --- a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild @@ -77,9 +77,9 @@ src_compile() { # huh, by default tensorflow links static libs? See BUILD file # set framework_shared_object=true somehow if use cuda; then - opt="--config=cuda" + local opt="--config=cuda" else - opt="" + local opt="" fi bazel build --config=opt ${opt} /tensorflow/tools/pip_package:build_pip_package || die bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg || die @@ -97,8 +97,14 @@ src_test() { src_install() { python_install() { - python_copy_sources tensorflow_pkg/${P}.data/purelib/tensorflow/ - python_copy_sources tensorflow_pkg/${P}.dist-info + # steal site-package path determination from sci-mathematics/z3 + local PYTHON_SITEDIR + python_export PYTHON_SITEDIR + cp -av tensorflow_pkg/"${P}".data/purelib/tensorflow/ "$PYTHON_SITEDIR" || die + cp -av tensorflow_pkg/"${P}".dist-info "$PYTHON_SITEDIR" || die + # mkdir -p "${D}/usr/$(get_libdir)/python3.6/site-packages" || die + # cp -av tensorflow_pkg/"${P}".data/purelib/tensorflow/ "${ED}/usr/$(get_libdir)/python3.6/site-packages/" || die + # cp -av tensorflow_pkg/"${P}".dist-info "${ED}/usr/$(get_libdir)/python3.6/site-packages/" || die } python_foreach_impl python_install einstalldocs
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: d3e2915edd509df1b98cd0fb8ef70b259af9f9a0 Author: Martin Mokrejs fold natur cuni cz> AuthorDate: Wed Apr 18 16:52:50 2018 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Wed Apr 18 16:52:50 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d3e2915e sci-libs/tensorflow: more ebuild tweaks (still not working) - partially incorporate changes from https://github.com/gentoo/sci/issues/862 - respect more USE flags: cuda mpi - similar addition of opencl use flag doe snot work for me, repoman complains with: IUSE.invalid [fatal] 1 sci-libs/tensorflow/tensorflow-1.7.0.ebuild: opencl - try to install into python's site-packages properly (cannot test it) - the ebuild does not work for me still (SANDBOX VIOLATION due to /proc/self/setgroups access) Package-Manager: Portage-2.3.28, Repoman-2.3.9 sci-libs/tensorflow/tensorflow-1.7.0.ebuild | 42 +++-- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild index d411ba0ac..75f5d499d 100644 --- a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild @@ -23,24 +23,25 @@ IUSE="cuda mpi" # TensorFlow 1.7 may be the last time we support cuDNN versions below 6.0. # Starting with TensorFlow 1.8 release, 6.0 will be the minimum supported # version. -DEPEND="dev-util/bazel +DEPEND=" + dev-util/bazel dev-python/wheel dev-python/numpy dev-libs/protobuf-c dev-python/absl-py cuda? ( >=dev-util/nvidia-cuda-toolkit-7.0[profiler] >=dev-libs/cudnn-3 ) mpi? ( virtual/mpi )" + #opencl? ( virtual/opencl )" RDEPEND="${DEPEND}" -# TODO: seems it also supports some MPI implementation - +# TODO: seems it also supports some MPI implementations src_configure(){ # there is no setup.py but there is configure # https://www.tensorflow.org/install/install_sources # https://www.tensorflow.org/install/install_linux#InstallingNativePip # # usage: configure.py [-h] [--workspace WORKSPACE] - python_configure() { + python_configure() { export PYTHON_BIN_PATH=${PYTHON} export PYTHON_LIB_PATH=${PYTHON_SITEDIR} export TF_NEED_JEMALLOC=1 @@ -52,8 +53,16 @@ src_configure(){ export TF_NEED_GDR=0 export TF_NEED_VERBS=0 export TF_NEED_OPENCL=0 - export TF_NEED_CUDA=0 - export TF_NEED_MPI=0 + if use cuda; then + export TF_NEED_CUDA=1 + else + export TF_NEED_CUDA=0 + fi + if use mpi; then + export TF_NEED_MPI=1 + else + export TF_NEED_MPI=0 + fi export TF_NEED_OPENCL_SYCL=0 export CC_OPT_FLAGS=${CFLAGS} export JAVA_HOME=$(java-config -O) @@ -63,12 +72,16 @@ src_configure(){ python_foreach_impl python_configure } - src_compile() { python_compile() { # huh, by default tensorflow links static libs? See BUILD file # set framework_shared_object=true somehow - bazel build --config=opt /tensorflow/tools/pip_package:build_pip_package || die + if use cuda; then + opt="--config=cuda" + else + opt="" + fi + bazel build --config=opt ${opt} /tensorflow/tools/pip_package:build_pip_package || die bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg || die unzip -o -d tensorflow_pkg tensorflow_pkg/${P}-cp35-cp35m-linux_x86_64.whl || die python_domodule tensorflow_pkg/${P}.data/purelib/tensorflow @@ -77,3 +90,16 @@ src_compile() { } python_foreach_impl python_compile } + +src_test() { + python_foreach_impl python_test +} + +src_install() { + python_install() { + python_copy_sources tensorflow_pkg/${P}.data/purelib/tensorflow/ + python_copy_sources tensorflow_pkg/${P}.dist-info + } + python_foreach_impl python_install + einstalldocs +}
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: d4716dbcfa408f14649ecf58d015c167cb57ded0 Author: Martin Mokrejs fold natur cuni cz> AuthorDate: Mon Apr 9 16:55:42 2018 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Mon Apr 9 16:55:42 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d4716dbc sci-libs/tensorflow: more tweaks to use bazel build system It does not build for me and later runs in sandbox violation error. Possibly the build system could respect USE=mkl too. The autogenerated? BUILD file speaks of static libs being output instead of shared libs. It also mentions how to call linker when linking 3rd-party apps against these libs. Package-Manager: Portage-2.3.27, Repoman-2.3.9 sci-libs/tensorflow/tensorflow-1.7.0.ebuild | 40 +++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild index 0dae0c1d0..d411ba0ac 100644 --- a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) -inherit distutils-r1 eutils +inherit python-r1 distutils-r1 eutils DESCRIPTION="Library for numerical computation using data flow graphs" HOMEPAGE="https://www.tensorflow.org @@ -27,6 +27,7 @@ DEPEND="dev-util/bazel dev-python/wheel dev-python/numpy dev-libs/protobuf-c + dev-python/absl-py cuda? ( >=dev-util/nvidia-cuda-toolkit-7.0[profiler] >=dev-libs/cudnn-3 ) mpi? ( virtual/mpi )" RDEPEND="${DEPEND}" @@ -39,5 +40,40 @@ src_configure(){ # https://www.tensorflow.org/install/install_linux#InstallingNativePip # # usage: configure.py [-h] [--workspace WORKSPACE] - ./configure || die + python_configure() { + export PYTHON_BIN_PATH=${PYTHON} + export PYTHON_LIB_PATH=${PYTHON_SITEDIR} + export TF_NEED_JEMALLOC=1 + 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=0 + export TF_NEED_CUDA=0 + export TF_NEED_MPI=0 + export TF_NEED_OPENCL_SYCL=0 + export CC_OPT_FLAGS=${CFLAGS} + export JAVA_HOME=$(java-config -O) + # TODO: protect by a USE flag test --config=mkl + ./configure || die + } + python_foreach_impl python_configure +} + + +src_compile() { + python_compile() { + # huh, by default tensorflow links static libs? See BUILD file + # set framework_shared_object=true somehow + bazel build --config=opt /tensorflow/tools/pip_package:build_pip_package || die + bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg || die + unzip -o -d tensorflow_pkg tensorflow_pkg/${P}-cp35-cp35m-linux_x86_64.whl || die + python_domodule tensorflow_pkg/${P}.data/purelib/tensorflow + bazel test || die + bazel shutdown || die + } + python_foreach_impl python_compile }
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: 05fb7f5eb4908941e81559aacac3c6797263c43b Author: Martin Mokrejs fold natur cuni cz> AuthorDate: Fri Apr 6 23:22:14 2018 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Fri Apr 6 23:22:14 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=05fb7f5e sci-libs/tensorflow: version bump The ebuild does not compile for me still, it needs more work. Credits: Rok Kralj Closes: https://github.com/gentoo/sci/issues/857 Package-Manager: Portage-2.3.27, Repoman-2.3.9 sci-libs/tensorflow/tensorflow-1.5.0.ebuild | 19 +++-- sci-libs/tensorflow/tensorflow-1.7.0.ebuild | 43 + 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.5.0.ebuild b/sci-libs/tensorflow/tensorflow-1.5.0.ebuild index b2e2e596a..0dae0c1d0 100644 --- a/sci-libs/tensorflow/tensorflow-1.5.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.5.0.ebuild @@ -17,12 +17,27 @@ SLOT="0" KEYWORDS="" IUSE="cuda mpi" +# TensorFlow 1.7 may be the last time we support Cuda versions below 8.0. +# Starting with TensorFlow 1.8 release, 8.0 will be the minimum supported +# version. +# TensorFlow 1.7 may be the last time we support cuDNN versions below 6.0. +# Starting with TensorFlow 1.8 release, 6.0 will be the minimum supported +# version. DEPEND="dev-util/bazel dev-python/wheel dev-python/numpy dev-libs/protobuf-c - cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-7.0[profiler] >=dev-libs/cudnn-3 ) mpi? ( virtual/mpi )" RDEPEND="${DEPEND}" -# TODO: seems it also support some MPI implementation +# TODO: seems it also supports some MPI implementation + +src_configure(){ + # there is no setup.py but there is configure + # https://www.tensorflow.org/install/install_sources + # https://www.tensorflow.org/install/install_linux#InstallingNativePip + # + # usage: configure.py [-h] [--workspace WORKSPACE] + ./configure || die +} diff --git a/sci-libs/tensorflow/tensorflow-1.7.0.ebuild b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild new file mode 100644 index 0..0dae0c1d0 --- /dev/null +++ b/sci-libs/tensorflow/tensorflow-1.7.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) + +inherit distutils-r1 eutils + +DESCRIPTION="Library for numerical computation using data flow graphs" +HOMEPAGE="https://www.tensorflow.org + https://github.com/tensorflow/tensorflow; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="" +IUSE="cuda mpi" + +# TensorFlow 1.7 may be the last time we support Cuda versions below 8.0. +# Starting with TensorFlow 1.8 release, 8.0 will be the minimum supported +# version. +# TensorFlow 1.7 may be the last time we support cuDNN versions below 6.0. +# Starting with TensorFlow 1.8 release, 6.0 will be the minimum supported +# version. +DEPEND="dev-util/bazel + dev-python/wheel + dev-python/numpy + dev-libs/protobuf-c + cuda? ( >=dev-util/nvidia-cuda-toolkit-7.0[profiler] >=dev-libs/cudnn-3 ) + mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +# TODO: seems it also supports some MPI implementation + +src_configure(){ + # there is no setup.py but there is configure + # https://www.tensorflow.org/install/install_sources + # https://www.tensorflow.org/install/install_linux#InstallingNativePip + # + # usage: configure.py [-h] [--workspace WORKSPACE] + ./configure || die +}
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: ab41f0265206d14aac727e0cf3b8fa32184d7467 Author: Justin Lecher gentoo org> AuthorDate: Mon Apr 2 12:26:17 2018 + Commit: Justin Lecher gentoo org> CommitDate: Mon Apr 2 12:26:17 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ab41f026 sci-libs/tensorflow: Update metadata.xml for USE=cuda Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.27, Repoman-2.3.9 sci-libs/tensorflow/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml index 138cb7705..b94b432fa 100644 --- a/sci-libs/tensorflow/metadata.xml +++ b/sci-libs/tensorflow/metadata.xml @@ -9,4 +9,7 @@ sci-biol...@gentoo.org Gentoo Biology Project + + Enable CUDA support +
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: 96ae55cd0496c42eb6228c5c0dac5b2c1436d122 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Mon Jan 29 15:34:01 2018 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Mon Jan 29 15:34:01 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=96ae55cd sci-libs/tensorflow: Add second homepage url Package-Manager: Portage-2.3.20, Repoman-2.3.6 RepoMan-Options: --force sci-libs/tensorflow/tensorflow-1.0.1.ebuild | 3 ++- sci-libs/tensorflow/tensorflow-1.5.0.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.0.1.ebuild b/sci-libs/tensorflow/tensorflow-1.0.1.ebuild index a62394c86..b2e2e596a 100644 --- a/sci-libs/tensorflow/tensorflow-1.0.1.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.0.1.ebuild @@ -8,7 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) inherit distutils-r1 eutils DESCRIPTION="Library for numerical computation using data flow graphs" -HOMEPAGE="https://github.com/tensorflow/tensorflow; +HOMEPAGE="https://www.tensorflow.org + https://github.com/tensorflow/tensorflow; SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" diff --git a/sci-libs/tensorflow/tensorflow-1.5.0.ebuild b/sci-libs/tensorflow/tensorflow-1.5.0.ebuild index a62394c86..b2e2e596a 100644 --- a/sci-libs/tensorflow/tensorflow-1.5.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.5.0.ebuild @@ -8,7 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) inherit distutils-r1 eutils DESCRIPTION="Library for numerical computation using data flow graphs" -HOMEPAGE="https://github.com/tensorflow/tensorflow; +HOMEPAGE="https://www.tensorflow.org + https://github.com/tensorflow/tensorflow; SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0"
[gentoo-commits] proj/sci:master commit in: sci-libs/tensorflow/
commit: 5c3a47ab0a4e38425544636e0de78a915b52878d Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Mon Jan 29 15:27:43 2018 + Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Mon Jan 29 15:27:43 2018 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5c3a47ab sci-libs/tensorflow: new package Will be needed for sci-biology/chiron, landing soon. Package-Manager: Portage-2.3.20, Repoman-2.3.6 RepoMan-Options: --force sci-libs/tensorflow/metadata.xml| 12 sci-libs/tensorflow/tensorflow-1.0.1.ebuild | 27 +++ sci-libs/tensorflow/tensorflow-1.5.0.ebuild | 27 +++ 3 files changed, 66 insertions(+) diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml new file mode 100644 index 0..138cb7705 --- /dev/null +++ b/sci-libs/tensorflow/metadata.xml @@ -0,0 +1,12 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + mmokr...@fold.natur.cuni.cz + Martin Mokrejs + + + sci-biol...@gentoo.org + Gentoo Biology Project + + diff --git a/sci-libs/tensorflow/tensorflow-1.0.1.ebuild b/sci-libs/tensorflow/tensorflow-1.0.1.ebuild new file mode 100644 index 0..a62394c86 --- /dev/null +++ b/sci-libs/tensorflow/tensorflow-1.0.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) + +inherit distutils-r1 eutils + +DESCRIPTION="Library for numerical computation using data flow graphs" +HOMEPAGE="https://github.com/tensorflow/tensorflow; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="" +IUSE="cuda mpi" + +DEPEND="dev-util/bazel + dev-python/wheel + dev-python/numpy + dev-libs/protobuf-c + cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) + mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +# TODO: seems it also support some MPI implementation diff --git a/sci-libs/tensorflow/tensorflow-1.5.0.ebuild b/sci-libs/tensorflow/tensorflow-1.5.0.ebuild new file mode 100644 index 0..a62394c86 --- /dev/null +++ b/sci-libs/tensorflow/tensorflow-1.5.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} ) + +inherit distutils-r1 eutils + +DESCRIPTION="Library for numerical computation using data flow graphs" +HOMEPAGE="https://github.com/tensorflow/tensorflow; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="" +IUSE="cuda mpi" + +DEPEND="dev-util/bazel + dev-python/wheel + dev-python/numpy + dev-libs/protobuf-c + cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) + mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +# TODO: seems it also support some MPI implementation