diff options
Diffstat (limited to 'sci-libs')
18 files changed, 816 insertions, 16 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 6f06109298d1..1f7621eb9c66 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index 7dd51a2b51a2..663fad96d6a5 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,6 +1,8 @@ AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fda416a6b61147f614670968cca13fa2b63d06673a11a2ef72b6f0d0876539ccb68134f4817975d4b796b66a716e606d SHA512 5cdffa2da3538965c0d20fb091a13124cdc301669b622ca35a131680db8abb58cf8e02f1366604a19a5cd10dd67f14861caa1c12da3154d82d576cb8052a4b87 +AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f344da6f5d1e2a012599170a412b261f6cf35d8943da7e96fd9f204991580d5ea045b43e2aa33ea5ad9fa9307d4 SHA512 0b5cad7b928319b922bdaa27d07fd38f1c359799ef9c217b6c1979f8ac9a86706e7ad1547f484aeb1db449a37693d18b2710b877483266915a869372c29ee1e4 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 EBUILD flann-1.9.1-r1.ebuild 2242 BLAKE2B c36832b645ca46e3aa622882cca34b644d8b667def8b900f1e5eea83fa0d55677f65c14c4a17134f080b4b7fe863023a71a7aeac72385bc25a9c2a4048fb33bb SHA512 08de8ba5d423999f8403104be8efbd678e6c4981790a314e717944d6f5ca714cf97219efa445894145acc47d896ce11a49867e19c654b6c403db3b55700b5ab0 +EBUILD flann-1.9.1-r2.ebuild 2306 BLAKE2B 2913821eb87a06cd7dd14bfe8562ab72496043977fd6a7a909f9c3899a65532539bce43a1298547cbefc766b4f27f00d4c27ade5dbfd1467928765ca2cc96d54 SHA512 9a94f340a95e5a2c68adba8a278211b7a655c0753cc52edc9b92ffd65629a4ac8cdb8197ddde31ec88ed6908abcb9019b77447a1e12983c0b63f1c6a47313315 EBUILD flann-1.9.1.ebuild 2183 BLAKE2B 8de25772b012bbbe70e13db8876688ee283d1dada1978bb9c982d1f1bc26f3daea9adaf7f12663d1a0590c03730e6da604f10bfa356a8728262681c7173af13a SHA512 7f5ff08c1fe83379577043d01b2c7cda91b4a44237cd65aa1e2cb36e10331238efdc40a9d1698b41d3ff493ac50cfa61cfc5ccae33d5cb9a03e47a94458dd05c -EBUILD flann-9999.ebuild 2178 BLAKE2B de6de98ab61428b3f19b8b229b5ad947a3e73478f21c45900b0752bcf6e382317d59020618d876e8a3908f2ae9ae770ef204959fff5f3f8bdd0d67825fb62256 SHA512 0ff48c8f14166bf2a4a77ec562618156b7ec7a40282ea0f61d233ff79a9fb3bb84195ac0465dd7b9dde7fc25889dae11a3f0088a0db3a51de00cb9627343d6bd +EBUILD flann-9999.ebuild 2215 BLAKE2B bb8f804a838a8c6b1702666a92cca7ce919523b7c8590a6f816ae3ec2d8b85c44ecc237f55bd498c8e6e296388c7b1cfcb6338b7a2361a5eaef869f2987b85f4 SHA512 9d2c22c2e45bc73cd982a7d75f77ec05b0533a60dc1125cd5127aec43d74f990b81690a1e47fd67cabc2ed5da500dded79c4dd8c79dc138db6c2a36d10bac0a0 MISC metadata.xml 971 BLAKE2B 5cffd393d18c3719d8b61069dbc84f4ce4e16e6746637b1203dcba3719fb672d8db082afa93add6be9ebc4203df85391d20eb824a7a9ea3550b37295186538ff SHA512 b8416b149e26ede6d3f207d7e48316a8b880436c40c4ed5610953ceda0fee4e5b97f1b99f778678514dd115c257fb419b365ed46fdd90a19d444bca8e3e0fe03 diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch new file mode 100644 index 000000000000..561c379af9ae --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch @@ -0,0 +1,22 @@ +From b9dd074526c18e7423085853518b58d602cb0b57 Mon Sep 17 00:00:00 2001 +From: "Petr A. Ermolaev" <petr.a.ermolaev@gmail.com> +Date: Fri, 4 May 2018 07:50:24 +0000 +Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include + <thrust/gather> to kdtree_cuda_3d_index.cu + +--- + src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu +index e9b05080..8465322e 100644 +--- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu ++++ b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu +@@ -32,6 +32,7 @@ + #include <flann/util/cuda/result_set.h> + // #define THRUST_DEBUG 1 + #include <cuda.h> ++#include <thrust/gather.h> + #include <thrust/copy.h> + #include <thrust/device_vector.h> + #include <vector_types.h> diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild new file mode 100644 index 000000000000..c240ca1dcf11 --- /dev/null +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils cuda flag-o-matic toolchain-funcs + +DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" +HOMEPAGE="https://www.cs.ubc.ca/research/flann/" +SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="cuda doc examples mpi openmp octave static-libs" + +BDEPEND=" + app-arch/unzip + doc? ( dev-tex/latex2html ) +" +DEPEND=" + cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) + mpi? ( + sci-libs/hdf5[mpi] + dev-libs/boost:=[mpi] + ) + !mpi? ( !sci-libs/hdf5[mpi] ) + octave? ( >=sci-mathematics/octave-3.6.4-r1 ) +" +RDEPEND="${DEPEND}" +# TODO: +# readd dependencies for test suite, +# requires multiple ruby dependencies + +PATCHES=( + "${FILESDIR}"/${P}-cmake-3.11.patch + "${FILESDIR}"/${P}-cuda-9.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + # bug #302621 + use mpi && export CXX=mpicxx + # produce pure octave files + # octave gentoo installation for .m files respected + sed -i \ + -e 's/--mex//' \ + -e 's/\.mex/\.oct/' \ + -e '/FILES/s/${MEX_FILE}//' \ + -e 's:share/flann/octave:share/octave/site/m:' \ + -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ + src/matlab/CMakeLists.txt || die + use cuda && cuda_src_prepare + + cmake-utils_src_prepare +} + +src_configure() { + append-cxxflags -std=c++11 + + # python bindings are split + # off into dev-python/pyflann + local mycmakeargs=( + -DBUILD_C_BINDINGS=ON + -DBUILD_PYTHON_BINDINGS=OFF + -DPYTHON_EXECUTABLE= + -DBUILD_CUDA_LIB=$(usex cuda) + -DBUILD_EXAMPLES=$(usex examples) + -DBUILD_DOC=$(usex doc) + -DBUILD_TESTS=OFF + -DBUILD_MATLAB_BINDINGS=$(usex octave) + -DUSE_MPI=$(usex mpi) + -DUSE_OPENMP=$(usex openmp) + ) + use cuda && mycmakeargs+=( + -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" + ) + use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + if ! use static-libs; then + find "${D}" -name 'lib*.a' -delete || die + fi +} diff --git a/sci-libs/flann/flann-9999.ebuild b/sci-libs/flann/flann-9999.ebuild index e8b80e9f855f..04b6a5770ac6 100644 --- a/sci-libs/flann/flann-9999.ebuild +++ b/sci-libs/flann/flann-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/" +HOMEPAGE="https://www.cs.ubc.ca/research/flann/" EGIT_REPO_URI="https://github.com/mariusmuja/flann.git" LICENSE="BSD" @@ -14,24 +14,25 @@ SLOT="0" KEYWORDS="" IUSE="cuda doc examples mpi openmp octave static-libs" -RDEPEND=" +BDEPEND=" + doc? ( dev-tex/latex2html ) +" +DEPEND=" + app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" + octave? ( >=sci-mathematics/octave-3.6.4-r1 ) +" +RDEPEND="${DEPEND}" # TODO: # readd dependencies for test suite, # requires multiple ruby dependencies -PATCHES=( - "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch -) +PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -67,7 +68,6 @@ src_configure() { -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF -DPYTHON_EXECUTABLE= - -DDOCDIR=share/doc/${PF} -DBUILD_CUDA_LIB=$(usex cuda) -DBUILD_EXAMPLES=$(usex examples) -DBUILD_DOC=$(usex doc) @@ -79,6 +79,8 @@ src_configure() { use cuda && mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" ) + use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) + cmake-utils_src_configure } diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest index 1cf3c19789ff..aa7fc51a1d25 100644 --- a/sci-libs/keras-applications/Manifest +++ b/sci-libs/keras-applications/Manifest @@ -1,7 +1,9 @@ DIST keras-applications-1.0.4.tar.gz 285031 BLAKE2B 7208752b45f825949eb2718e4e276f7c3e4a523b2668975d6834084c42cdc2dc3efb57fd0ef24401bc0dd35453f4798422f6afd9583249237cd35941939c25f4 SHA512 10a793a60b7084ea641035618e178d5b1261da5826292db25134f9886b191bd152dfa8fa686a6270fa56a7fc1831bda07e77d12597972b186a9354f857feb1d0 DIST keras-applications-1.0.5.tar.gz 26556 BLAKE2B 263a5917ca6aa58f47fee09849ba149cdf6742b3278ce2f2dd7ace5f1a445a9eb53f218f906ec9c1384a4e7bbe87d40e3ef0fcc22261e64805042822b14a0684 SHA512 6ac0312b8eb6781c93cb3ffad09b8b631831855f35247f939b6fccfe9ababb85e3b0e5a59f9f30f5265d96290bf4f61e1046dbcc8333f914065c566040012ddc DIST keras-applications-1.0.6.tar.gz 284862 BLAKE2B 1f1b34574dc2af3e66983334fd6fad626b810f134f17fbf4dfae161d8f0c695f52da0ef8e689513834a2c7031cff7f0c58773d834932d6db96ead4a68a8cd765 SHA512 11587ec9ab00c667d6b1e9c7c35ea6746c044986668a9f24f3ca6ec80e43d37839fa557bf531efd4c05c3518b3fd390c00806bfa672576e9b4b389412527e9e1 +DIST keras-applications-1.0.7.tar.gz 289570 BLAKE2B 5f6fe2419b2de41f718e6beae56c8c4910efe0e6c282ad32b792f50a8b9ebc88c866eed84fb8c7dcbbd1680de605036a0012458af6d14250b1f8624ead5013b7 SHA512 5f2c5fb7b7f644a881f8cc9040633a69d3a72562206dd0601c8b31bf4fd3bb2aeee07a0d7040311f0fd42f16330bc249d306cdfa01c7b60717b05726040a0b78 EBUILD keras-applications-1.0.4.ebuild 554 BLAKE2B 8492cef67af05dc39a0ed36f0afdedb568983de1c6225417ee143ed73017cc76e38307ac7e95aaeebed6494d1a8b2ccbbfe9eb1b5a86d66cb5597d9650debd43 SHA512 b0ab5268039f213cf46c88198f2153acdacf672e42e6d51bb85c6115d7ceca39fe78472a71af2a2e93b6ef176a44b0d9000fd8ef693fa967158432a98d5151a9 EBUILD keras-applications-1.0.5.ebuild 683 BLAKE2B ad47e5ec1d26eb1a03ac233ce886967bf793b0948d4cc16f82263516fc418eab7915f076c86759a9845cf7de22f3efc6e293cb6fef013b0df797b9aebf863194 SHA512 259fce92b4ba451556a34a40fa1dc2265979d24cb30cb889729a2e5d94df92a123a05c946b1483d963c02847b3a5af9b6ad52e3195beb6ed9990c866c6f1584b EBUILD keras-applications-1.0.6.ebuild 557 BLAKE2B bc2a9d22264847ad6f6ef0152cb483226f29644510a752f3c2377d6b08790dae2a44838e55ea6602a0a6c294eba5bb21d28faebc43e85118f359818ee467bb96 SHA512 3ff0ea369874778064341eca06b8aedb9d886cae1c0278b53760fb2d481981ed5a81a50496493579fc98f2aa2df1608e00cda17257dd649db9e6885a5306a917 +EBUILD keras-applications-1.0.7.ebuild 561 BLAKE2B 428e826b883af98b9e27abb6d26afffd0f6dc0c8777f0d2e4bdd70917c1448f890e81ec1281ba9c683cea8024d880ea8e21aedde5dd457b204a7ca05d1ffb1b2 SHA512 a3a2ebf399cdfaad7a8e51992171f66570f7f42025c6f60f1d101611582396e9685570d4b1cedbbec2ce5c10d8e79fd16062f6e01b4d437e2043e009759d0cd3 MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560 diff --git a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild new file mode 100644 index 000000000000..dcf6a0b2bd09 --- /dev/null +++ b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} ) +inherit distutils-r1 + +DESCRIPTION="Keras deep learning library reference implementations of deep learning models" +HOMEPAGE="https://keras.io/applications/" +SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest index 98dfab31a2f2..6bec831ef981 100644 --- a/sci-libs/keras-preprocessing/Manifest +++ b/sci-libs/keras-preprocessing/Manifest @@ -1,7 +1,9 @@ DIST keras-preprocessing-1.0.2.tar.gz 34762 BLAKE2B 3b4766aa48d6e6cfd50817af97c8f2faf9ae7e78007f7dddcbf1f4ded072657a5b94ac4b563d090dd8a8437a249b64fea61a1cd5f680767f14611fa6fe92dd3a SHA512 d5a558c3d9741c298ea3737bfb04788bd2cbecefe14aa53e0f6ccde891ad9304ec673a888dc53a2f954c0b718ce31d9d35095d3f21e15d73248acfc8105457d9 DIST keras-preprocessing-1.0.3.tar.gz 36360 BLAKE2B 4a5d8e8d1211434b212a509acd563ef38f043ffc2f856019205e5e9b6806303c824bdfd19009a38a19ca961a9ece7719dcecf41f494b19da11084d5fa733e807 SHA512 98501a96eeca29d13a50f418b8d7417911cba50f0a3097b9576684a78c60441b93296ac3fb544f951f40990f5c8b7c0a15e9da3ac336119b0234caec8d182f4c DIST keras-preprocessing-1.0.5.tar.gz 39776 BLAKE2B 459318d4bdece8176f7a268da3070c71f8fa44a2425acd6dd3d4cc2c023a4a6398c3298f29c7ea2d273353e6898eb9218043451a7817e618ecc2eb6e38bc74e9 SHA512 64b5e7f2fea0ec21bb43853b998f8e628185e82846c12320d6c60bb7bd9e508dd2497108c04040e2d8bbebc3b7b7cac3fbb08354bb31a4b155c5ed2bc5dbb98d +DIST keras-preprocessing-1.0.9.tar.gz 46476 BLAKE2B af80a6647bb56f8c4dba93120bc2b70db36d2c6a0e36c3be9a4843e5c36c9ffe50db1cd9396eecd47f6c0595c110825d70d2e6b28a29a0a199b5cfcc499e4440 SHA512 93ef9b294638bfeaea82170b323f08b261a2519f5ee8b9aac7d88e5b32c6486646d91075cea71bfbc27780c8af55125319873361f0431d48b451e574d1e7a400 EBUILD keras-preprocessing-1.0.2.ebuild 602 BLAKE2B 2e9a1d1fe5af86239dd6c28ad262506b1e6d52ca853daa89130ac536ae37de0b83954cbf3cfddf4a1e25e20c945aee9d3a28f1d5ea192eead788960294cd6410 SHA512 eab972f49c8c94d4c2a14b2f643e9ebc164657fc637605ee683eabb7eefa414245b65859dd01b60387c9b1b638bc4038bbafeb1bf2cdf643b88695bdf7f7cce1 EBUILD keras-preprocessing-1.0.3.ebuild 608 BLAKE2B 735d172d2c0b217f69cb9a8aca03f2cb6af43d6be3172bcf15e5e9aeac3deeea31622b231b30442473852b17a25f574b48c56205b1952775d1278be5acdb6ed9 SHA512 2b54605d8c1542153c0f936c250f78162b8d33dc5868a4e028d5855f7b159f0dc3c1075f9cae428943a5ef163789edc120ed0050fb9a5a30babd2376093c6379 EBUILD keras-preprocessing-1.0.5.ebuild 605 BLAKE2B 018d2bde6dacbf1b6d3e85feee58abf3f9bcab16812f00a553a3d77a02bd64c935d7e41a95d0f7d795b2926d46c2ce5b432fe22d59a84e87e59de0d555b7fe28 SHA512 660408f123b8242421a5d04ac9c4e2ec25f08120e3049c702e930f8d35b2cd85d16dcb48d82c680ccd36765125822ee00ede0f3af9e0484255f04bbb26593fae +EBUILD keras-preprocessing-1.0.9.ebuild 609 BLAKE2B 6eb32367a3e9cbfecd7c211b2378d48d68afcb8801314dacd2d168fddf285cfa5aa3d10b66f15f670947efa0f0a13c89290cb0e65c649bec257ef274ddaf5f6a SHA512 198cf1d5796e5d727abd898e8f96a8ecca2cecfd8e26cd88e22f8e04c02800601cf7ccfa7076b84e8c8dd88dacef6173a52791ae66b19efd513162ffbd76e3bc MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9 diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild new file mode 100644 index 000000000000..51974c566595 --- /dev/null +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} ) +inherit distutils-r1 + +DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models" +HOMEPAGE="https://keras.io/" +SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest index 50b129ff04ef..c31cc91894f3 100644 --- a/sci-libs/lmfit/Manifest +++ b/sci-libs/lmfit/Manifest @@ -1,11 +1,12 @@ AUX lmfit-7.0-cmake.patch 2226 BLAKE2B 317d232718c8172508d67de527161b074676bf62ff4da45d21a9444626fb2e84150c0b3fb099a6a9c5247ea2ec9b53c89b4b0f6d64f8b3d6352629e440e89ad4 SHA512 a9e95299baac18818a131ac67c82d49777e7cae6629d9f6bedc2e7f175f2d6a416888d973064df13d79315a5445d95c0e9a2e3d5fc1ac476fdb2b688dbe601e3 AUX lmfit-8.0-cmake.patch 2251 BLAKE2B 4549bfb77187c0bc1040a3d3e4e3233445536d039b0d185e4a2d160fcf4d7c0ba2584bd0d943f9527c4af141688a0940763f7c23893263f7af1e294337710e65 SHA512 d3bcb2a9aa882c8240c873a65cc4b8d198ca26990d64d87988ea09e8398b10f83aedd4367bf65cb949091a6a4c3b4d70911658e46808d852cc26c3af2f6e032f +AUX lmfit-8.2.2-cmake.patch 2769 BLAKE2B 7f67349b93cde9bf14ce5295d3a32a73301897e1643be5beea71ccb8e9d7a9a128c4160b7eb5dcbdfb1189ee6e774e151bd5f71b3af4d7ec0a00ba61f7ad79f1 SHA512 93b1f5242e1152dea4910c96b2c561a370f2e2a78fc730b5ee00257049f96a253badf5d7752a1bbac320df43e436d8f4d913fbf8d40f7b36e3579efb16147417 DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29 DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d DIST lmfit-7.0.tgz 37950 BLAKE2B a509110f70e7e863d1172b8d91f7439763f0434702f265751e9955494f4982b4c17f0baaa080af86e5cae7f535555e27b98b45ba6a529061d107e53bdb9fd698 SHA512 78f479786c6e5c417781c6d629f5a517335fac70df049fafdefd511485da4e542c988d69c998f96eaab4306160de4bb09a631ca6ffff74bba70c51428d734fc3 -DIST lmfit-8.0.tgz 42833 BLAKE2B d2ad9f5cd35997c8ce6827148e9ca748f3d14044f515a927442e9e5f57508cdfb729cd7172987a0e94284d7e93f7aafc0cb572137f201994c8d3ad9a9fb64c9b SHA512 3b4e4af6c70269f8752428d416e014d4e69df3f73b25e9ba16dd07afc03598a1dca08050cecba29a3b2651e003e703ba4412716100b1bb55b1830f74f16da676 +DIST lmfit-8.2.2.tgz 31970 BLAKE2B 67eebc0e58d3d78057afcd84f35adcfea783c8501a5f8934dd07c38eb2419b1c43bedd3401a830a993005913138bdf8d1dc73c2142983b9f881f0db9bec06b93 SHA512 5835dce914027429cb36765543cf6b872e4ef1acd8feaeca281f9edf286fda89db78fbc0713dcfea4e4f2fe55a1b05317e6428980060bc3acce579ef1fa0c271 EBUILD lmfit-5.1.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9 EBUILD lmfit-6.4.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9 EBUILD lmfit-7.0.ebuild 547 BLAKE2B ca24a9539256e249cb06d88ae1077a13a0c3ff62257d9eaa0751b3b56ecb6e4fd6bba4d8fa8553493eeefbd361b10e4fa056d807f151fce0077084d9220400e2 SHA512 1c4440f1d2a3a9ab910a740b731ae83645d7a62a38417639080cf5845880c5e498be08ac8a5a58545f6daeec963f9f784d19ed03054952ad4230ffdb7f5e1c86 -EBUILD lmfit-8.0.ebuild 543 BLAKE2B b77c765248184b82012abb73e17143784f6bacd85e72ee2d77585098294b5dcd9de00e9420d955f5ef4c32e27e93509748dcd7643b06f167c446d35fd47acd61 SHA512 5e0476aac93c71fc62c78e25e0b17b25dee340268857984c8e130bf698a5c232fbe70abfeac016e8f26e207b3f7f3ad6ab0a0baf9b4778c1559a85826e52f4cc +EBUILD lmfit-8.2.2.ebuild 543 BLAKE2B df340a25fdb763f0db342b1111757be2db5e9eaf40c34d4bf35a043feee3a073bd985080799a16dfac1d1cb1ff7b37120bb29f00757a64753cdec0b1c2f92e1d SHA512 2b34186319e98e2775f9fa9438d29fa09b8ec56b98bc7efe3ee3f2e413fe64b3eefd3cd6f83019a876cecc195c5aede3a59808e6a16e2c236af792ff0e65abae MISC metadata.xml 328 BLAKE2B fe29c76e5725821e31de0e2b14e0b975d5b8838e9907bf9ddacdb40cddc0529550fe83468226bf045fcf7ad95b2e56d31dc564dcf7e6d9a0401317313e2f0f27 SHA512 e6cf20d6c9130a16ce37c44890f928cb5dca1bb67425d8cdcc1ab7db22f7c8e2ac513b11c33b0f0495e25dd389ac926f2099d0253288eb1ed290f30e655a1c4f diff --git a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch new file mode 100644 index 000000000000..258f70a533d4 --- /dev/null +++ b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch @@ -0,0 +1,85 @@ +From 72dae8c23604288331c9a7f03f60ec792a384121 Mon Sep 17 00:00:00 2001 +From: christoph junghans <junghans@votca.org> +Date: Mon, 22 Oct 2018 21:00:00 -0600 +Subject: [PATCH] cmake: minor distribution tweaks + +- use gnuinstalldirs to allow to configure install dirs +- allow to disable injecting c flags + +signed-off-by: christoph junghans <junghans@votca.org> +Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org> +--- + CMakeLists.txt | 10 +++++++--- + lib/CMakeLists.txt | 4 ++-- + man/CMakeLists.txt | 4 ++-- + 3 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbb571e..279f06a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ cmake_policy(SET CMP0048 NEW) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + include(PreventInSourceBuilds) + +-project(lmfit VERSION 8.2.1 LANGUAGES C) ++project(lmfit VERSION 8.2.2 LANGUAGES C) + + # --- Declare project-wide user flags, and set default values --- + option(FITTEST "Build with FitTest" OFF) +@@ -23,12 +23,16 @@ else() + endif() + + include(CTest) ++include(GNUInstallDirs) + +-set(destination ${CMAKE_INSTALL_PREFIX}) ++option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON) ++if (INJECT_C_FLAGS) ++ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas") ++endif() + + configure_file("lmfit.pc.in" "lmfit.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc" +- DESTINATION "${destination}/lib/pkgconfig/") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + + add_subdirectory(lib) + add_subdirectory(demo) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index a266f4e..e071a3c 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -18,9 +18,9 @@ link_libm(${library_name}) + + install( + TARGETS ${library_name} LIBRARY +- DESTINATION ${destination}/lib ++ DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT Libraries) + install( + FILES ${inc_files} +- DESTINATION ${destination}/include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + COMPONENT Headers) +diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt +index d4595fd..5505713 100644 +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -15,11 +15,11 @@ function(one_page pname section) + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} +- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}" ++ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html +- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html" ++ DESTINATION "${CMAKE_INSTALL_DOCDIR}-${CMAKE_PROJECT_VERSION}/html" + ) + endfunction() + +-- +2.20.1 + diff --git a/sci-libs/lmfit/lmfit-8.0.ebuild b/sci-libs/lmfit/lmfit-8.2.2.ebuild index db342f68909e..6d1f6b2e4b60 100644 --- a/sci-libs/lmfit/lmfit-8.0.ebuild +++ b/sci-libs/lmfit/lmfit-8.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest new file mode 100644 index 000000000000..1ca67369b4f8 --- /dev/null +++ b/sci-libs/tensorflow-estimator/Manifest @@ -0,0 +1,4 @@ +AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 4250 BLAKE2B 79702d82e629e2159cbe33efe8dd91536d904536f4bbf3d4ad02186916a09786cde6ce29a63acaafe3169dbd7904448461f2b557f33218651351fd87d42ed613 SHA512 42bb57433f61b3a9b1a93c897202bacdf44a8277ea0e64257ac3b60c9b964a6441345c9b222fb26afb1d66a53323fe38c29811adfd6354032cb5d3f85dde0816 +DIST tensorflow-estimator-1.13.0_rc0.tar.gz 531012 BLAKE2B 1398fdec5b81a7bab7ccfb2d37b8094c4ef4b96562e2c6b8b4e565cad3c234245b5d8dfb30a79b73302fc0764b1d3503d4ee2d4363a9d2e635b36fb8e2b726b4 SHA512 c8ad78d0df294c7471f1577880905be08edcc038878e9d197b975f33f91192e9c413d13fa70e8fa1ff760ad6bf6141f199322bf2076568690e75fa38bd5a4cf4 +EBUILD tensorflow-estimator-1.13.0_rc0.ebuild 1329 BLAKE2B ed4451574acbc5067715148a5a365017d3b4b42a99aece10be94d6b3d1683f3d0cc758ff6dc89c7c4b1d9ac1974969b9ab3f320d6434014f16ef1d405d137dc1 SHA512 5db769ca08138e3fe4a696708049b96eb442c2e2484b737f821eff5da89575d671a57c156fc583819f345d53e4a800503df3517355d76cd4440af2ac6410ae61 +MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa diff --git a/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch b/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch new file mode 100644 index 000000000000..140e23c84bb5 --- /dev/null +++ b/sci-libs/tensorflow-estimator/files/0001-pip_package-modularize-build-script-to-allow-distros.patch @@ -0,0 +1,153 @@ +From 897b25418ae0f77bcee7fdd7070d5c22677dc218 Mon Sep 17 00:00:00 2001 +From: Jason Zaman <jason@perfinion.com> +Date: Sat, 2 Feb 2019 15:19:44 +0800 +Subject: [PATCH] pip_package: modularize build script to allow distros to + install more flexibly + +Gentoo Linux handles python modules slightly differently and packaging +wheels is complicated. We prefer to run setup.py directly ourselves +rather than build a wheel and then install from there. + +This modularizes build_pip_package.sh to allow running parts separately. +using --src srcdir will prepare the package in a known dir so the distro +package can take it from there. If only dstdir is given (either with +--dst or as the only argument to preserve backwards compat) then +behaviour is the same as before, the sources are prepared and the wheel +is built and placed in dstdir. + +Signed-off-by: Jason Zaman <jason@perfinion.com> +--- + .../tools/pip_package/build_pip_package.sh | 73 +++++++++++++++++-- + 1 file changed, 66 insertions(+), 7 deletions(-) + +diff --git a/tensorflow_estimator/tools/pip_package/build_pip_package.sh b/tensorflow_estimator/tools/pip_package/build_pip_package.sh +index 5d06dd6..1667169 100755 +--- a/tensorflow_estimator/tools/pip_package/build_pip_package.sh ++++ b/tensorflow_estimator/tools/pip_package/build_pip_package.sh +@@ -23,10 +23,8 @@ function real_path() { + is_absolute "$1" && echo "$1" || echo "$PWD/${1#./}" + } + +-function build_wheel() { ++function prepare_src() { + TMPDIR="$1" +- DEST="$2" +- PROJECT_NAME="$3" + + mkdir -p "$TMPDIR" + echo $(date) : "=== Preparing sources in dir: ${TMPDIR}" +@@ -67,6 +65,17 @@ function build_wheel() { + touch "${TMPDIR}/tensorflow_estimator/contrib/estimator/python/__init__.py" + touch "${TMPDIR}/tensorflow_estimator/contrib/estimator/python/estimator/__init__.py" + fi ++} ++ ++function build_wheel() { ++ if [ $# -lt 2 ] ; then ++ echo "No src and dest dir provided" ++ exit 1 ++ fi ++ ++ TMPDIR="$1" ++ DEST="$2" ++ PROJECT_NAME="$3" + + pushd ${TMPDIR} > /dev/null + echo $(date) : "=== Building wheel" +@@ -75,15 +84,39 @@ function build_wheel() { + cp dist/* ${DEST} + popd > /dev/null + echo $(date) : "=== Output wheel file is in: ${DEST}" +- rm -rf "${TMPDIR}" ++} ++ ++function usage() { ++ echo "Usage:" ++ echo "$0 [--src srcdir] [--dst dstdir] [options]" ++ echo "$0 dstdir [options]" ++ echo "" ++ echo " --src prepare sources in srcdir" ++ echo " will use temporary dir if not specified" ++ echo "" ++ echo " --dst build wheel in dstdir" ++ echo " if dstdir is not set do not build, only prepare sources" ++ echo "" ++ echo " Options:" ++ echo " --project_name <name> set project name to name" ++ echo " --nightly build tensorflow_estimator nightly" ++ echo "" ++ exit 1 + } + + function main() { + NIGHTLY_BUILD=0 ++ PROJECT_NAME="" ++ SRCDIR="" ++ DSTDIR="" ++ CLEANSRC=1 + + while true; do + if [[ -z "$1" ]]; then + break ++ elif [[ "$1" == "--help" ]]; then ++ usage ++ exit 1 + elif [[ "$1" == "--nightly" ]]; then + NIGHTLY_BUILD=1 + elif [[ "$1" == "--project_name" ]]; then +@@ -92,6 +125,19 @@ function main() { + break + fi + PROJECT_NAME="$1" ++ elif [[ "$1" == "--src" ]]; then ++ shift ++ if [[ -z "$1" ]]; then ++ break ++ fi ++ SRCDIR="$(real_path $1)" ++ CLEANSRC=0 ++ elif [[ "$1" == "--dst" ]]; then ++ shift ++ if [[ -z "$1" ]]; then ++ break ++ fi ++ DSTDIR="$(real_path $1)" + else + DSTDIR="$(real_path $1)" + fi +@@ -105,16 +151,29 @@ function main() { + fi + fi + +- SRCDIR="$(mktemp -d -t tmp.XXXXXXXXXX)" +- +- if [[ -z "$DSTDIR" ]]; then ++ if [[ -z "$DSTDIR" ]] && [[ -z "$SRCDIR" ]]; then + echo "No destination dir provided" ++ usage + exit 1 + fi + ++ if [[ -z "$SRCDIR" ]]; then ++ # make temp srcdir if none set ++ SRCDIR="$(mktemp -d -t tmp.XXXXXXXXXX)" ++ fi + ++ prepare_src "$SRCDIR" ++ ++ if [[ -z "$DSTDIR" ]]; then ++ # only want to prepare sources ++ exit ++ fi + + build_wheel "$SRCDIR" "$DSTDIR" "$PROJECT_NAME" ++ ++ if [[ $CLEANSRC -ne 0 ]]; then ++ rm -rf "${TMPDIR}" ++ fi + } + + main "$@" +-- +2.19.2 + diff --git a/sci-libs/tensorflow-estimator/metadata.xml b/sci-libs/tensorflow-estimator/metadata.xml new file mode 100644 index 000000000000..2d40af6762c9 --- /dev/null +++ b/sci-libs/tensorflow-estimator/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>perfinion@gentoo.org</email> + <name>Jason Zaman</name> + </maintainer> + <longdescription lang="en"> + TensorFlow Estimator is a high-level TensorFlow API that greatly + simplifies machine learning programming. Estimators encapsulate + training, evaluation, prediction, and exporting for your model. + </longdescription> + <upstream> + <remote-id type="github">tensorflow/estimator</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0_rc0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0_rc0.ebuild new file mode 100644 index 000000000000..766a3206621e --- /dev/null +++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.13.0_rc0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2019 Jason Zaman +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python{3_5,3_6} ) +MY_PN="estimator" +MY_PV=${PV/_rc/-rc} +MY_P=${MY_PN}-${MY_PV} + +inherit bazel distutils-r1 flag-o-matic toolchain-funcs + +DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming" +HOMEPAGE="https://www.tensorflow.org/" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-java/java-config" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/0001-pip_package-modularize-build-script-to-allow-distros.patch" +) +DOCS=( CONTRIBUTING.md README.md ) + +src_prepare() { + bazel_setup_bazelrc + default +} + +src_compile() { + export JAVA_HOME=$(java-config --jre-home) + + ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package + ebazel shutdown + + local srcdir="${T}/src" + mkdir -p "${srcdir}" || die + bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die +} + +src_install() { + do_install() { + cd "${T}/src" || die + esetup.py install + python_optimize + } + python_foreach_impl do_install + + cd "${S}" || die + einstalldocs +} diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest index 1c6da96bf42e..f231acbcc812 100644 --- a/sci-libs/tensorflow/Manifest +++ b/sci-libs/tensorflow/Manifest @@ -33,6 +33,7 @@ DIST tensorflow-1.10.0.tar.gz 24490786 BLAKE2B 2ecec19b2b2ebb2e292ec07fee458017a DIST tensorflow-1.11.0.tar.gz 25024790 BLAKE2B 74129fb1e6db0317fd45266dae7aa4fab811e1ebf0d093f3153684fa4465f4319cbf8fd50c6667f9c4ddbce5c100ee00151ec2873eca93ef7d5ebbc04ab6b965 SHA512 26e9542c43e11a663cbc5cf42859ae7b6dc0e92cfa88775fd4d1badba7f08c59b60c05010fd9f3ec501313be5c042f39b17323bb4753babf365ba2a48af836c2 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-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 @@ -42,4 +43,5 @@ EBUILD tensorflow-1.10.0.ebuild 13829 BLAKE2B dd99f463536047e6b5acaa9aa6341d367b EBUILD tensorflow-1.11.0.ebuild 13608 BLAKE2B ad8462cc4bc779dadde6093912940b368ba1e4abcf3996c4b570aa599d4970a5fe709d53152b4a6d35326610ae09e128fd6b674fc1176677ba60c9d3849f896d SHA512 696fd969e06a4f2390ad420d6e713a5f7b025034630593b7f8644509622fda1d766af1737ae5174dcccdff80592b5a0ae6d9f5a3ea94383c4e947688b26e8daa EBUILD tensorflow-1.12.0.ebuild 9185 BLAKE2B a2a7089074ea57d13667c205623b512aa95223c9aec0108080aa26b5cba94ce327d38710e84b60e8727a92c450ccac545d230954f3dc93a5d43bf15ab007f944 SHA512 2fea55fdb5df02ef984423ec6b1f1c9708a61edc60e282c6ac704bd296cb8eb78d124988bc30ccb598fcff3c22ab8d1103c1834b8983ba8f6a5b5c75139375c1 EBUILD tensorflow-1.13.0_rc0.ebuild 9477 BLAKE2B 0b03827922faed2c7df018dc0e20ecaa19aa06d4068a7dbe1595e62a1eaf1c31a6e9ec24587cdab0bf2bb669d2fdd30dad5ace9602e39f6d3e25702df234faca SHA512 493c62b3b31a78e22171b60e936b9c6ff965e74c2c834b1c6f6b22a492cd993db910f1f1537b438f09bbf8f784291a2551eb142656d51813957335f33e05efbe +EBUILD tensorflow-1.13.0_rc2.ebuild 9474 BLAKE2B 69c319821d5dc45b033380e03e199f0212ccf6438d2bb1ff8cf058c7551916a8764e49b04bf6c4012d002d20df78784d8944e242b28c9383c124979628e322d1 SHA512 5b7733ddfd2bd0bb0210cf075b2fe83286c79154081f57f7653dc7539d95dafc9b13da29a78b4d9763de2c5995b0b5e0e01d3e872bfb342047f52a18b847b13a MISC metadata.xml 641 BLAKE2B 6e87fea81b3a1cdbd96bc190a2b39509549a6c3fe384597c394e142e20f0005329df309edf03d7c304e8adb62876a33c8d0c54161e5fb09fbda1df7e9d774fe3 SHA512 42fe38c07d34999da7cf47b780e69b4fa65245763761a915bd35af3d4441f583f477fd84952680d736be8514a049f49ab1dad9a7d4a6963baff00f94f5efa308 diff --git a/sci-libs/tensorflow/tensorflow-1.13.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-1.13.0_rc2.ebuild new file mode 100644 index 000000000000..2cc7e2078046 --- /dev/null +++ b/sci-libs/tensorflow/tensorflow-1.13.0_rc2.ebuild @@ -0,0 +1,311 @@ +# 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} ) +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}" + +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-8.0[profiler] + >=dev-libs/cudnn-6.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-libs/tensorflow-estimator-1.13.0_rc0[${PYTHON_USEDEP}] + >=sci-visualization/tensorboard-1.12.0[${PYTHON_USEDEP}] + virtual/python-enum34[${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND} + dev-python/mock" +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() { + 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 +} |