From b0b85e141f6a9a74d9d6bdce989a626ff5e92523 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Mar 2023 00:48:54 +0000 Subject: gentoo auto-resync : 25:03:2023 - 00:48:54 --- sci-libs/Manifest.gz | Bin 43590 -> 43592 bytes sci-libs/pytorch/Manifest | 3 +- .../pytorch/files/pytorch-1.13.1-emptyso.patch | 15 +++++ sci-libs/pytorch/pytorch-1.13.1-r1.ebuild | 62 -------------------- sci-libs/pytorch/pytorch-1.13.1-r2.ebuild | 63 +++++++++++++++++++++ 5 files changed, 80 insertions(+), 63 deletions(-) create mode 100644 sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch delete mode 100644 sci-libs/pytorch/pytorch-1.13.1-r1.ebuild create mode 100644 sci-libs/pytorch/pytorch-1.13.1-r2.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index c691809d942b..eabcb7e04c32 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 83a6a9df7dc3..66e4b986b07f 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -1,8 +1,9 @@ AUX 0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch 599 BLAKE2B 4ad99f05d69f53336e6c874b7783c5fb9e800808c6adf588263af215eda865ddf215df8fa803e48220b879fd2f90d71139a6e38bbdc947abc7854cab88a756ad SHA512 fd0e3db9cb68e14d3d90a613d91511acc752c1d764bada85e6dace59b45fe2cf42bca6b77c281084bd04de88d5fefbb5d81be165d288ed3da251e7b0d4c6e86e AUX pytorch-1.13.0-setup.patch 357 BLAKE2B 9741c5285353ac09581f54a823e77b069afbe5d9165a6545bd50a2b020298a358783d61fc5923188ddf7fec0929ec92eabeefc8c3be329793f12326aef5f89c5 SHA512 4632b0ea06704122e86dd27836d96ee59fc1ea236e69031fc65a21b2c9eafae21fc9344e55f17ee0c6374e3368f7ad1e3cec3b2be1af5e21bd10902684c72161 +AUX pytorch-1.13.1-emptyso.patch 490 BLAKE2B 97de7ab941aaf1d21714654a26ddd52247b7ab57f18364ef85a7086628c0cb7f36f681bc4f54a832462c24ac0b96c33773d3843203c64fde93cde63e7784f8a2 SHA512 e4795fcc870f5968370ec00dcee7b474059d8f1a0de468daf01edcc417bbdbc6af7d1c945e70d6a00f3c709e62f474b80792fe30baed66e49b198b893ad92998 AUX pytorch-1.13.1-global-dlopen.patch 961 BLAKE2B 215e85440efef71df0e96c1014c8922237016e433c639ae3b002266a43e01da8686bd89d1e50ed0164ac29bbde902ff3df9abdfff304cfede856ebd125bb1c58 SHA512 b924ec573f8225bd2655f7c6c5e344909754a5330ce0a78d5cf00620884e15b23698ca99125fd74bcb12f300161aa3dd881a921fd51b2caa974709a81e8a2ee9 AUX pytorch-1.7.1-torch_shm_manager.patch 441 BLAKE2B 28b87353a0afa0ef25c8ab00e204998b4fb3472fbbb5bb2b300a3fb22d864846d51ccef652ce331484c7a522f7d74e6674c1ceaf26d0a4956d1c8b57b29a7428 SHA512 08f2e5f35768e70713a1432797d9fbe0b133a80ae7dff2898e4b9b51ab398f88bce90a0698b3c9f77bf8a4c5c054911c22931d0684276a0b6d4f2afb69633088 AUX pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch 1063 BLAKE2B c93cb4c1ff40ef332cd518474a397e9b61d310f4cbdb8701c18749f103533a69e4a3e892f1e3613113cc97ae320951dacb956025ba6be694c5275448d2af3a78 SHA512 7931a220068a36b15ee0f282161f23422acdbef32990bd1eafeab55e06131748f5b4ad93e6a0dc7a4f92e7ebd0595a97835c768b46dd7139f626df666642ce18 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 -EBUILD pytorch-1.13.1-r1.ebuild 1475 BLAKE2B 1305fcc491dcc4a92923e60cd44396f82b1d6ef7d1aa70ed95d8a9cb1a5af667dff01ea1c5d361182671b74909ee265e6b4c05cc8fb552e7e65f81cb84628772 SHA512 cbe7c1bc7f53b74312c55c370290a0b507ca01f7883fd6a97c3711fe942e155968bd9e4a2d54e7dfd833b4f98513c7752e8a787b377ee303866c3db2d7bdc677 +EBUILD pytorch-1.13.1-r2.ebuild 1512 BLAKE2B a83a2846755b3ad3dc62329f77b04e73be1f5a79a3c3e2311a61c0965c50a17a83deac89c22ce26470be415c0c48a760f1b74c207e6864a16aead25e42896867 SHA512 55a6ed013855c4d20fad0bb213e51b2881d0b7c3e456055800b16658f92460d998294148d041dba642a11be1a60d5d830edf8613cc09cdf9ce6eef7ecc809976 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 diff --git a/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch b/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch new file mode 100644 index 000000000000..1479354b7f7a --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch @@ -0,0 +1,15 @@ +--- a/setup.py 2023-03-24 22:36:50.361860100 +0100 ++++ b/setup.py 2023-03-24 22:36:57.384752383 +0100 +@@ -922,12 +922,6 @@ + name=str('caffe2.python.caffe2_pybind11_state_hip'), + sources=[]), + ) +- if cmake_cache_vars['BUILD_FUNCTORCH']: +- extensions.append( +- Extension( +- name=str('functorch._C'), +- sources=[]), +- ) + + cmdclass = { + 'bdist_wheel': wheel_concatenate, diff --git a/sci-libs/pytorch/pytorch-1.13.1-r1.ebuild b/sci-libs/pytorch/pytorch-1.13.1-r1.ebuild deleted file mode 100644 index 956c5e89cbc8..000000000000 --- a/sci-libs/pytorch/pytorch-1.13.1-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 - -DESCRIPTION="Tensors and Dynamic neural networks in Python" -HOMEPAGE="https://pytorch.org/" -SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} -RDEPEND=" - ${PYTHON_DEPS} - ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/typing-extensions[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND} - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" - -src_prepare() { - eapply \ - "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \ - "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ - "${FILESDIR}"/${P}-global-dlopen.patch \ - "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ - "${FILESDIR}"/${PN}-1.13.0-setup.patch \ - - # Set build dir for pytorch's setup - sed -i \ - -e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \ - tools/setup_helpers/env.py \ - || die - distutils-r1_src_prepare -} - -src_compile() { - PYTORCH_BUILD_VERSION=${PV} \ - PYTORCH_BUILD_NUMBER=0 \ - USE_SYSTEM_LIBS=ON \ - CMAKE_BUILD_DIR="${BUILD_DIR}" \ - BUILD_DIR= \ - distutils-r1_src_compile -} - -src_install() { - USE_SYSTEM_LIBS=ON distutils-r1_src_install -} diff --git a/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild b/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild new file mode 100644 index 000000000000..f93b9a108820 --- /dev/null +++ b/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 + +DESCRIPTION="Tensors and Dynamic neural networks in Python" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} +RDEPEND=" + ${PYTHON_DEPS} + ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/typing-extensions[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND} + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + ') +" + +src_prepare() { + eapply \ + "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \ + "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ + "${FILESDIR}"/${P}-global-dlopen.patch \ + "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ + "${FILESDIR}"/${PN}-1.13.0-setup.patch \ + "${FILESDIR}"/${P}-emptyso.patch \ + + # Set build dir for pytorch's setup + sed -i \ + -e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \ + tools/setup_helpers/env.py \ + || die + distutils-r1_src_prepare +} + +src_compile() { + PYTORCH_BUILD_VERSION=${PV} \ + PYTORCH_BUILD_NUMBER=0 \ + USE_SYSTEM_LIBS=ON \ + CMAKE_BUILD_DIR="${BUILD_DIR}" \ + BUILD_DIR= \ + distutils-r1_src_compile +} + +src_install() { + USE_SYSTEM_LIBS=ON distutils-r1_src_install +} -- cgit v1.2.3