commit: 3969938e8e1d00781a660e7f188549070671b82c
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 20:41:31 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 20:42:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3969938e
sci-libs/pytorch: drop 1.13.1-r2, 2.0.1-r1
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-libs/pytorch/Manifest | 2 -
...-t-build-libtorch-again-for-PyTorch-1.7.1.patch | 18 ------
.../pytorch/files/pytorch-1.13.1-emptyso.patch | 15 -----
.../files/pytorch-1.13.1-global-dlopen.patch | 23 --------
sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch | 15 -----
sci-libs/pytorch/pytorch-1.13.1-r2.ebuild | 63 --------------------
sci-libs/pytorch/pytorch-2.0.1-r1.ebuild | 67 ----------------------
7 files changed, 203 deletions(-)
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index 2a63d8018442..09e1f64fbe4c 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -1,4 +1,2 @@
-DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B
75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3
SHA512
f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
-DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B
7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce
SHA512
2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B
c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747
SHA512
a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756
DIST pytorch-2.2.1.tar.gz 116370903 BLAKE2B
7d08e80f91bad76fba1751c30a34bebfe7145058b7758c0d47112702263a80666f70687a8860744725c6aa995e854f766a5bfa4644c23e5635e7e08c8d63a6e9
SHA512
f19ebcf59d183c3348946ba7cfcab2bc4ca93785863b8edc39dba5772083a7b0425ccb4f92a8df4dc0d18246c75e8ff812993161467fbf9dc48d7fb28a1e26f1
diff --git
a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
deleted file mode 100644
index 640d061fcc59..000000000000
---
a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2db381644c..2241a33015 100644
---- a/setup.py
-+++ b/setup.py
-@@ -363,13 +363,6 @@ def build_deps():
- check_submodules()
- check_pydep('yaml', 'pyyaml')
-
-- build_caffe2(version=version,
-- cmake_python_library=cmake_python_library,
-- build_python=True,
-- rerun_cmake=RERUN_CMAKE,
-- cmake_only=CMAKE_ONLY,
-- cmake=cmake)
--
- if CMAKE_ONLY:
- report('Finished running cmake. Run "ccmake build" or '
- '"cmake-gui build" to adjust build options and '
diff --git a/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch
b/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch
deleted file mode 100644
index 1479354b7f7a..000000000000
--- a/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/pytorch-1.13.1-global-dlopen.patch
b/sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch
deleted file mode 100644
index 4f414be67a29..000000000000
--- a/sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't hardcode the library path. Leave it to the dynamic loader.
-
-Index: pytorch-1.13.1/torch/__init__.py
-===================================================================
---- a/torch/__init__.py 2023-02-15 20:27:51.747853677 +0100
-+++ b/torch/__init__.py 2023-02-15 20:28:23.506341918 +0100
-@@ -169,14 +169,14 @@
- lib_path = os.path.join(os.path.dirname(here), 'lib', lib_name)
-
- try:
-- ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL)
-+ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL)
- except OSError as err:
- # Can only happen of wheel with cublas as PYPI deps
- # As PyTorch is not purelib, but nvidia-cublas-cu11 is
- if 'libcublas.so.11' not in err.args[0]:
- raise err
- _preload_cuda_deps()
-- ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL)
-+ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL)
-
-
- if (USE_RTLD_GLOBAL_WITH_LIBTORCH or os.getenv('TORCH_USE_RTLD_GLOBAL')) and \
diff --git a/sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch
b/sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch
deleted file mode 100644
index e4703894308a..000000000000
--- a/sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/setup.py 2023-04-05 11:23:00.713405789 +0200
-+++ b/setup.py 2023-04-05 11:23:36.900876249 +0200
-@@ -960,12 +960,6 @@
- name=str('caffe2.python.caffe2_pybind11_state_hip'),
- sources=[]),
- )
-- if cmake_cache_vars['BUILD_FUNCTORCH']:
-- extensions.append(
-- Extension(
-- name=str('functorch._C'),
-- sources=[]),
-- )
- if cmake_cache_vars['BUILD_NVFUSER']:
- extensions.append(
- Extension(
diff --git a/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild
b/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild
deleted file mode 100644
index 14b2e8d56547..000000000000
--- a/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2022-2024 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 multibuild
-
-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
-}
diff --git a/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild
b/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild
deleted file mode 100644
index 2ee51ce0e418..000000000000
--- a/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2022-2024 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
-DISTUTILS_EXT=1
-inherit distutils-r1 multibuild prefix
-
-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}]
- dev-python/sympy[${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}"/${PN}-2.0.0-global-dlopen.patch \
- "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \
- "${FILESDIR}"/${PN}-1.13.0-setup.patch \
- "${FILESDIR}"/${PN}-2.0.0-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
-
- hprefixify tools/setup_helpers/env.py
-}
-
-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 develop sdist
-}
-
-src_install() {
- USE_SYSTEM_LIBS=ON distutils-r1_src_install
-}
