aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiezhiko <Miezhiko@gmail.com>2021-11-15 13:03:08 +0400
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2021-12-22 13:42:22 +0100
commite94f62bceecc242d72de315c54acc2f904f4f9a3 (patch)
tree6030775dae46282230863c294821dbd4b68a002f /sci-libs
parentsci-libs/pythorch: solve conflict with system pybind11 (diff)
downloadsci-e94f62bceecc242d72de315c54acc2f904f4f9a3.tar.gz
sci-e94f62bceecc242d72de315c54acc2f904f4f9a3.tar.bz2
sci-e94f62bceecc242d72de315c54acc2f904f4f9a3.zip
sci-libs/pytorch: use system pybind11
Signed-off-by: Miezhiko <Miezhiko@gmail.com> Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/pytorch/Manifest1
-rw-r--r--sci-libs/pytorch/pytorch-1.10.0.ebuild6
2 files changed, 1 insertions, 6 deletions
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index add8ab40c..b530dd652 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -76,7 +76,6 @@ DIST psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz 6825 BLAKE2B db255d2a6
DIST pthreadpool-029c8862.tar.gz 45970 BLAKE2B 09bd7d258f45fbe703238826b7435d8a5d013700cd734282b646420ba0854c0a386712f6bc3ed44e7496d51471b1e0a965f01ebdb09786e2020d979ecddb767a SHA512 b51099fa9d62065883cc43dcd5f9717a17be5ee2e87fc861667172a09acb3a62929c8bbc8a5c0c00885a638af0ec2ae4149adde2ba85bf3c80834f9b973c2d5b
DIST pthreadpool-029c88620.tar.gz 45970 BLAKE2B 09bd7d258f45fbe703238826b7435d8a5d013700cd734282b646420ba0854c0a386712f6bc3ed44e7496d51471b1e0a965f01ebdb09786e2020d979ecddb767a SHA512 b51099fa9d62065883cc43dcd5f9717a17be5ee2e87fc861667172a09acb3a62929c8bbc8a5c0c00885a638af0ec2ae4149adde2ba85bf3c80834f9b973c2d5b
DIST pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz 49011 BLAKE2B 7bfbca81321243e64aa53c668dfe380ce4f7b88477a1c794a4dea9062c9b0969ca745dbfe0abbb95fffbf44080763506609c387ed085d89f6c612be6804b5cc2 SHA512 5f5a1275bbcef13cea88e381010bf2654c9646d30c5fb061f1d6e9e9a0ae6398e137c5e4f7da69f7d8d8b58fb5a7e79f7a4c0c1c3bbaad8f3d0c896d21bc7691
-DIST pybind11-8de7772cc72daca8e947b79b83fea46214931604.tar.gz 648390 BLAKE2B f262eb972154b51adf27f213aab95012c5d9c27df94855fe495e264f34996d1ed0de7651cc78ecae25798b2c62a5ec150a7373858f3ce0e5497ae33674bbbc25 SHA512 9bb688209791bd5f294fa316ab9a8007f559673a733b796e76e223fe8653d048d3f01eb045b78aa1843f7eacf97f6e2ee090ac68fed2b43856eb0c4813583204
DIST pytorch-1.10.0.tar.gz 18474149 BLAKE2B 6b0dd6e92733a7e421d0ddc3f809732e66c06bc9f4538064d92f0469749ba2546b6a8c77ca09b8840b00e0d1d5d8fd439a37f8119d73fb2f734139559e69a5d8 SHA512 92b70e6170a7f173c4a9cb29f6cec6dfa598587aa9cf6a620ec861b95da6ea555cbc7285914c0dab6cfc8af320fad4999be4a788acc1f15140664a67ad9dc35d
DIST pytorch-1.6.0.tar.gz 11376568 BLAKE2B 30aac34e14837ed6942ef7577aea77752cd9c809cb751fa837693b2b60eeda9a371421c4b4678fe94763a47e434b65ea60afc56aec7863887ba12bf362b96f0a SHA512 117ff1588ed1ebd0df15fbed066c65ea026893fe9a40d14aa1f73d848fab114b1b11bd7ed083815030f7fdf13a824480521cb40865f48a24c7028f4d195f2127
DIST pytorch-1.7.1.tar.gz 13012087 BLAKE2B ff498814178281ca59ae80bfe51dde3ffb0cde1eaa762bd9b36c2ff7f07d4b5ae4d68e10c76158e5e9e4250fcb01265a3755575b761495e20cf677e9a9825454 SHA512 359e271093e7afd374202f48e40356d195f644f78377a0b88f38627ad7aeabb9201a18c12ff35fb4aaf0d731168e511504445d8b4c08e92eed50264e23d81bae
diff --git a/sci-libs/pytorch/pytorch-1.10.0.ebuild b/sci-libs/pytorch/pytorch-1.10.0.ebuild
index 1aa85911f..36d68fb14 100644
--- a/sci-libs/pytorch/pytorch-1.10.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.0.ebuild
@@ -47,7 +47,6 @@ https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072
https://github.com/pytorch/kineto/archive/879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz -> kineto-879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz
https://github.com/driazati/breakpad/archive/7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz -> breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz
https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz -> lss-e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz
-https://github.com/pybind/pybind11/archive/8de7772cc72daca8e947b79b83fea46214931604.tar.gz -> pybind11-8de7772cc72daca8e947b79b83fea46214931604.tar.gz
"
# git clone git@github.com:pytorch/pytorch.git && cd pytorch
@@ -197,8 +196,6 @@ src_prepare() {
ln -sv "${WORKDIR}"/breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848 third_party/breakpad || die
rmdir third_party/breakpad/src/third_party/lss || die
ln -sv "${WORKDIR}"/linux-syscall-support-e1e7b0ad8ee99a875b272c8e33e308472e897660 third_party/breakpad/src/third_party/lss || die
- rmdir third_party/pybind11 || die
- ln -sv "${WORKDIR}"/pybind11-8de7772cc72daca8e947b79b83fea46214931604 third_party/pybind11 || die
if use cuda; then
cd third_party/nccl/nccl || die
@@ -264,6 +261,7 @@ src_configure() {
-DUSE_MPI=$(usex mpi ON OFF)
-DUSE_GLOO=$(usex gloo ON OFF)
-DUSE_SYSTEM_EIGEN_INSTALL=ON
+ -DUSE_SYSTEM_PYBIND11=ON
-DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF)
-DBLAS=$(usex blas Generic Eigen)
-DTP_BUILD_LIBUV=OFF
@@ -321,8 +319,6 @@ src_install() {
python_foreach_impl python_optimize
fi
- rm -rfv "${ED}/usr/include/pybind11"
-
find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}