commit: e1363dc72b1043a9dc4efd210cac385d6bad3ca5
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 23 08:12:54 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Mar 23 08:15:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1363dc7
sci-ml/*: pytorch -> multiple python
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
...ccelerate-1.5.2.ebuild => accelerate-1.5.2-r1.ebuild} | 4 +++-
...tasets-2.21.0-r3.ebuild => datasets-2.21.0-r4.ebuild} | 2 +-
.../{pytorch-2.4.1-r1.ebuild => pytorch-2.4.1-r2.ebuild} | 15 +++++----------
.../{pytorch-2.5.1-r2.ebuild => pytorch-2.5.1-r3.ebuild} | 16 +++++-----------
.../{pytorch-2.6.0-r1.ebuild => pytorch-2.6.0-r2.ebuild} | 13 ++++---------
...vision-0.20.0.ebuild => torchvision-0.20.0-r1.ebuild} | 4 +++-
...rs-4.49.0-r3.ebuild => transformers-4.49.0-r4.ebuild} | 2 +-
7 files changed, 22 insertions(+), 34 deletions(-)
diff --git a/sci-ml/accelerate/accelerate-1.5.2.ebuild
b/sci-ml/accelerate/accelerate-1.5.2-r1.ebuild
similarity index 94%
rename from sci-ml/accelerate/accelerate-1.5.2.ebuild
rename to sci-ml/accelerate/accelerate-1.5.2-r1.ebuild
index e8ef0adaf4d4..a2477d5f2425 100644
--- a/sci-ml/accelerate/accelerate-1.5.2.ebuild
+++ b/sci-ml/accelerate/accelerate-1.5.2-r1.ebuild
@@ -17,7 +17,9 @@ SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
- sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ sci-ml/pytorch[${PYTHON_USEDEP}]
+ ')
"
DEPEND="${RDEPEND}"
BDEPEND="test? (
diff --git a/sci-ml/datasets/datasets-2.21.0-r3.ebuild
b/sci-ml/datasets/datasets-2.21.0-r4.ebuild
similarity index 99%
rename from sci-ml/datasets/datasets-2.21.0-r3.ebuild
rename to sci-ml/datasets/datasets-2.21.0-r4.ebuild
index 187cf2641545..a315c6c8e2ad 100644
--- a/sci-ml/datasets/datasets-2.21.0-r3.ebuild
+++ b/sci-ml/datasets/datasets-2.21.0-r4.ebuild
@@ -21,7 +21,6 @@ IUSE="test"
RDEPEND="
${PYTHON_DEPS}
- sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
dev-python/aiohttp[${PYTHON_USEDEP}]
dev-python/dill[${PYTHON_USEDEP}]
@@ -38,6 +37,7 @@ RDEPEND="
dev-python/xxhash[${PYTHON_USEDEP}]
sci-ml/caffe2[${PYTHON_USEDEP},numpy]
sci-ml/huggingface_hub[${PYTHON_USEDEP}]
+ sci-ml/pytorch[${PYTHON_USEDEP}]
')
"
DEPEND="${RDEPEND}"
diff --git a/sci-ml/pytorch/pytorch-2.4.1-r1.ebuild
b/sci-ml/pytorch/pytorch-2.4.1-r2.ebuild
similarity index 82%
rename from sci-ml/pytorch/pytorch-2.4.1-r1.ebuild
rename to sci-ml/pytorch/pytorch-2.4.1-r2.ebuild
index e3357c048f0b..6d38d99c6100 100644
--- a/sci-ml/pytorch/pytorch-2.4.1-r1.ebuild
+++ b/sci-ml/pytorch/pytorch-2.4.1-r2.ebuild
@@ -4,8 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..13} )
DISTUTILS_EXT=1
inherit distutils-r1 prefix
@@ -22,16 +21,12 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/sympy[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ~sci-ml/caffe2-2.4.1[${PYTHON_USEDEP}]
- ')
+ dev-python/sympy[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ~sci-ml/caffe2-${PV}[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
+ dev-python/pyyaml[${PYTHON_USEDEP}]
"
src_prepare() {
diff --git a/sci-ml/pytorch/pytorch-2.5.1-r2.ebuild
b/sci-ml/pytorch/pytorch-2.5.1-r3.ebuild
similarity index 79%
rename from sci-ml/pytorch/pytorch-2.5.1-r2.ebuild
rename to sci-ml/pytorch/pytorch-2.5.1-r3.ebuild
index 32e2d690bc95..29ed0285ad17 100644
--- a/sci-ml/pytorch/pytorch-2.5.1-r2.ebuild
+++ b/sci-ml/pytorch/pytorch-2.5.1-r3.ebuild
@@ -4,8 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..13} )
DISTUTILS_EXT=1
inherit distutils-r1 prefix
@@ -22,17 +21,12 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- >=sci-ml/caffe2-2.5.1-r5
- $(python_gen_cond_dep '
- dev-python/sympy[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ~sci-ml/caffe2-2.5.1[${PYTHON_USEDEP}]
- ')
+ dev-python/sympy[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ~sci-ml/caffe2-${PV}[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
+ dev-python/pyyaml[${PYTHON_USEDEP}]
"
src_prepare() {
diff --git a/sci-ml/pytorch/pytorch-2.6.0-r1.ebuild
b/sci-ml/pytorch/pytorch-2.6.0-r2.ebuild
similarity index 82%
rename from sci-ml/pytorch/pytorch-2.6.0-r1.ebuild
rename to sci-ml/pytorch/pytorch-2.6.0-r2.ebuild
index e2561c190f30..f0379ee5854d 100644
--- a/sci-ml/pytorch/pytorch-2.6.0-r1.ebuild
+++ b/sci-ml/pytorch/pytorch-2.6.0-r2.ebuild
@@ -5,7 +5,6 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_SINGLE_IMPL=1
DISTUTILS_EXT=1
inherit distutils-r1 prefix
@@ -22,16 +21,12 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/sympy[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ~sci-ml/caffe2-2.6.0[${PYTHON_USEDEP}]
- ')
+ dev-python/sympy[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ~sci-ml/caffe2-${PV}[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
+ dev-python/pyyaml[${PYTHON_USEDEP}]
"
src_prepare() {
diff --git a/sci-ml/torchvision/torchvision-0.20.0.ebuild
b/sci-ml/torchvision/torchvision-0.20.0-r1.ebuild
similarity index 96%
rename from sci-ml/torchvision/torchvision-0.20.0.ebuild
rename to sci-ml/torchvision/torchvision-0.20.0-r1.ebuild
index 1839680abc83..e8347c6df132 100644
--- a/sci-ml/torchvision/torchvision-0.20.0.ebuild
+++ b/sci-ml/torchvision/torchvision-0.20.0-r1.ebuild
@@ -22,12 +22,14 @@ KEYWORDS="~amd64"
IUSE="cuda"
RDEPEND="
- =sci-ml/pytorch-2.5*[${PYTHON_SINGLE_USEDEP}]
=sci-ml/caffe2-2.5*[cuda?]
dev-python/numpy
dev-python/pillow
media-libs/libjpeg-turbo:=
media-libs/libpng:=
+ $(python_gen_cond_dep '
+ =sci-ml/pytorch-2.5*[${PYTHON_USEDEP}]
+ ')
"
BDEPEND="
test? (
diff --git a/sci-ml/transformers/transformers-4.49.0-r3.ebuild
b/sci-ml/transformers/transformers-4.49.0-r4.ebuild
similarity index 99%
rename from sci-ml/transformers/transformers-4.49.0-r3.ebuild
rename to sci-ml/transformers/transformers-4.49.0-r4.ebuild
index 459836a29059..05a17cbabe6d 100644
--- a/sci-ml/transformers/transformers-4.49.0-r3.ebuild
+++ b/sci-ml/transformers/transformers-4.49.0-r4.ebuild
@@ -36,10 +36,10 @@ RDEPEND="
>=sci-ml/safetensors-0.4.1[${PYTHON_USEDEP}]
torch? (
sci-ml/caffe2[${PYTHON_USEDEP}]
+ sci-ml/pytorch[${PYTHON_USEDEP}]
)
')
torch? (
- sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
sci-ml/accelerate[${PYTHON_SINGLE_USEDEP}]
)
"
