commit: ee295a13a4a5dc9090726aef728a81431e51e71f
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 23 16:28:55 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Mar 23 16:37:21 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee295a13
sci-ml/*: back to single. (multi does not work)
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
...elerate-1.5.2-r1.ebuild => accelerate-1.5.2-r2.ebuild} | 4 +---
.../{caffe2-2.4.1-r5.ebuild => caffe2-2.4.1-r6.ebuild} | 13 +++++++------
.../{caffe2-2.5.1-r9.ebuild => caffe2-2.5.1-r10.ebuild} | 13 +++++++------
.../{caffe2-2.6.0-r1.ebuild => caffe2-2.6.0-r2.ebuild} | 13 +++++++------
...atasets-2.21.0-r4.ebuild => datasets-2.21.0-r5.ebuild} | 4 ++--
.../{pytorch-2.4.1-r2.ebuild => pytorch-2.4.1-r3.ebuild} | 15 ++++++++++-----
.../{pytorch-2.5.1-r3.ebuild => pytorch-2.5.1-r4.ebuild} | 13 +++++++++----
.../{pytorch-2.6.0-r2.ebuild => pytorch-2.6.0-r3.ebuild} | 13 +++++++++----
...sion-0.20.0-r1.ebuild => torchvision-0.20.0-r2.ebuild} | 4 +---
...ers-4.49.0-r4.ebuild => transformers-4.49.0-r5.ebuild} | 6 ++----
10 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/sci-ml/accelerate/accelerate-1.5.2-r1.ebuild
b/sci-ml/accelerate/accelerate-1.5.2-r2.ebuild
similarity index 94%
rename from sci-ml/accelerate/accelerate-1.5.2-r1.ebuild
rename to sci-ml/accelerate/accelerate-1.5.2-r2.ebuild
index a2477d5f2425..e8ef0adaf4d4 100644
--- a/sci-ml/accelerate/accelerate-1.5.2-r1.ebuild
+++ b/sci-ml/accelerate/accelerate-1.5.2-r2.ebuild
@@ -17,9 +17,7 @@ SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
- $(python_gen_cond_dep '
- sci-ml/pytorch[${PYTHON_USEDEP}]
- ')
+ sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="test? (
diff --git a/sci-ml/caffe2/caffe2-2.4.1-r5.ebuild
b/sci-ml/caffe2/caffe2-2.4.1-r6.ebuild
similarity index 97%
rename from sci-ml/caffe2/caffe2-2.4.1-r5.ebuild
rename to sci-ml/caffe2/caffe2-2.4.1-r6.ebuild
index fef92ded7db4..bc95abbd3fca 100644
--- a/sci-ml/caffe2/caffe2-2.4.1-r5.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
ROCM_VERSION=6.1
-inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
MYPN=pytorch
MYP=${MYPN}-${PV}
@@ -104,11 +104,13 @@ DEPEND="
dev-libs/FXdiv
dev-libs/pocketfft
dev-libs/flatbuffers
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
sci-ml/FP16
sci-ml/kineto
+ $(python_gen_cond_dep '
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ')
cuda? ( <=dev-libs/cutlass-3.4.1 )
onednn? ( sci-ml/ideep )
"
@@ -275,7 +277,6 @@ src_configure() {
)
fi
- python_setup
cmake_src_configure
# do not rerun cmake and the build process in src_install
@@ -300,5 +301,5 @@ src_install() {
mkdir -p python/torch/include || die
mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
cp torch/version.py python/torch/ || die
- python_foreach_impl python_install
+ python_install
}
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r9.ebuild
b/sci-ml/caffe2/caffe2-2.5.1-r10.ebuild
similarity index 97%
rename from sci-ml/caffe2/caffe2-2.5.1-r9.ebuild
rename to sci-ml/caffe2/caffe2-2.5.1-r10.ebuild
index 43cefe46218d..02c57f637949 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r9.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
ROCM_VERSION=6.1
-inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
MYPN=pytorch
MYP=${MYPN}-${PV}
@@ -102,11 +102,13 @@ DEPEND="
dev-libs/FXdiv
dev-libs/pocketfft
dev-libs/psimd
- dev-python/pybind11[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
sci-ml/FP16
sci-ml/kineto
+ $(python_gen_cond_dep '
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ')
cuda? ( <=dev-libs/cutlass-3.4.1 )
onednn? ( sci-ml/ideep )
qnnpack? ( dev-libs/clog )
@@ -292,7 +294,6 @@ src_configure() {
)
fi
- python_setup
cmake_src_configure
}
@@ -326,5 +327,5 @@ src_install() {
rm -rf python
mkdir -p python/torch || die
cp torch/version.py python/torch/ || die
- python_foreach_impl python_install
+ python_install
}
diff --git a/sci-ml/caffe2/caffe2-2.6.0-r1.ebuild
b/sci-ml/caffe2/caffe2-2.6.0-r2.ebuild
similarity index 97%
rename from sci-ml/caffe2/caffe2-2.6.0-r1.ebuild
rename to sci-ml/caffe2/caffe2-2.6.0-r2.ebuild
index f6fef0622eea..b9747ad9eed4 100644
--- a/sci-ml/caffe2/caffe2-2.6.0-r1.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
ROCM_VERSION=6.1
-inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
MYPN=pytorch
MYP=${MYPN}-${PV}
@@ -102,11 +102,13 @@ DEPEND="
dev-libs/FXdiv
dev-libs/pocketfft
dev-libs/psimd
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
sci-ml/FP16
sci-ml/kineto
+ $(python_gen_cond_dep '
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ')
cuda? ( <=dev-libs/cutlass-3.4.1 )
onednn? ( sci-ml/ideep )
qnnpack? ( dev-libs/clog )
@@ -292,7 +294,6 @@ src_configure() {
)
fi
- python_setup
cmake_src_configure
}
@@ -326,5 +327,5 @@ src_install() {
rm -rf python
mkdir -p python/torch || die
cp torch/version.py python/torch/ || die
- python_foreach_impl python_install
+ python_install
}
diff --git a/sci-ml/datasets/datasets-2.21.0-r4.ebuild
b/sci-ml/datasets/datasets-2.21.0-r5.ebuild
similarity index 98%
rename from sci-ml/datasets/datasets-2.21.0-r4.ebuild
rename to sci-ml/datasets/datasets-2.21.0-r5.ebuild
index a315c6c8e2ad..7d13d51dcea0 100644
--- a/sci-ml/datasets/datasets-2.21.0-r4.ebuild
+++ b/sci-ml/datasets/datasets-2.21.0-r5.ebuild
@@ -21,6 +21,8 @@ IUSE="test"
RDEPEND="
${PYTHON_DEPS}
+ sci-ml/caffe2[${PYTHON_SINGLE_USEDEP},numpy]
+ sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
dev-python/aiohttp[${PYTHON_USEDEP}]
dev-python/dill[${PYTHON_USEDEP}]
@@ -35,9 +37,7 @@ RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/tqdm[${PYTHON_USEDEP}]
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-r2.ebuild
b/sci-ml/pytorch/pytorch-2.4.1-r3.ebuild
similarity index 81%
rename from sci-ml/pytorch/pytorch-2.4.1-r2.ebuild
rename to sci-ml/pytorch/pytorch-2.4.1-r3.ebuild
index 6d38d99c6100..9071008bf955 100644
--- a/sci-ml/pytorch/pytorch-2.4.1-r2.ebuild
+++ b/sci-ml/pytorch/pytorch-2.4.1-r3.ebuild
@@ -5,6 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=1
DISTUTILS_EXT=1
inherit distutils-r1 prefix
@@ -21,12 +22,16 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- dev-python/sympy[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ~sci-ml/caffe2-${PV}[${PYTHON_USEDEP}]
+ ~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/sympy[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ')
"
DEPEND="${RDEPEND}
- dev-python/pyyaml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
"
src_prepare() {
@@ -36,7 +41,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-2.4.0-global-dlopen.patch \
"${FILESDIR}"/pytorch-2.4.0-torch_shm_manager.patch \
"${FILESDIR}"/${PN}-1.13.0-setup.patch \
- "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \
+ "${FILESDIR}"/${PN}-2.2.1-emptyso.patch
# Set build dir for pytorch's setup
sed -i \
diff --git a/sci-ml/pytorch/pytorch-2.5.1-r3.ebuild
b/sci-ml/pytorch/pytorch-2.5.1-r4.ebuild
similarity index 82%
rename from sci-ml/pytorch/pytorch-2.5.1-r3.ebuild
rename to sci-ml/pytorch/pytorch-2.5.1-r4.ebuild
index 29ed0285ad17..026615ba5bb8 100644
--- a/sci-ml/pytorch/pytorch-2.5.1-r3.ebuild
+++ b/sci-ml/pytorch/pytorch-2.5.1-r4.ebuild
@@ -5,6 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=1
DISTUTILS_EXT=1
inherit distutils-r1 prefix
@@ -21,12 +22,16 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- dev-python/sympy[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ~sci-ml/caffe2-${PV}[${PYTHON_USEDEP}]
+ ~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/sympy[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ')
"
DEPEND="${RDEPEND}
- dev-python/pyyaml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
"
src_prepare() {
diff --git a/sci-ml/pytorch/pytorch-2.6.0-r2.ebuild
b/sci-ml/pytorch/pytorch-2.6.0-r3.ebuild
similarity index 82%
rename from sci-ml/pytorch/pytorch-2.6.0-r2.ebuild
rename to sci-ml/pytorch/pytorch-2.6.0-r3.ebuild
index f0379ee5854d..27391724320e 100644
--- a/sci-ml/pytorch/pytorch-2.6.0-r2.ebuild
+++ b/sci-ml/pytorch/pytorch-2.6.0-r3.ebuild
@@ -5,6 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_SINGLE_IMPL=1
DISTUTILS_EXT=1
inherit distutils-r1 prefix
@@ -21,12 +22,16 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- dev-python/sympy[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- ~sci-ml/caffe2-${PV}[${PYTHON_USEDEP}]
+ ~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/sympy[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ ')
"
DEPEND="${RDEPEND}
- dev-python/pyyaml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
"
src_prepare() {
diff --git a/sci-ml/torchvision/torchvision-0.20.0-r1.ebuild
b/sci-ml/torchvision/torchvision-0.20.0-r2.ebuild
similarity index 96%
rename from sci-ml/torchvision/torchvision-0.20.0-r1.ebuild
rename to sci-ml/torchvision/torchvision-0.20.0-r2.ebuild
index e8347c6df132..42234dc97efa 100644
--- a/sci-ml/torchvision/torchvision-0.20.0-r1.ebuild
+++ b/sci-ml/torchvision/torchvision-0.20.0-r2.ebuild
@@ -23,13 +23,11 @@ IUSE="cuda"
RDEPEND="
=sci-ml/caffe2-2.5*[cuda?]
+ =sci-ml/pytorch-2.5*[${PYTHON_SINGLE_USEDEP}]
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-r4.ebuild
b/sci-ml/transformers/transformers-4.49.0-r5.ebuild
similarity index 98%
rename from sci-ml/transformers/transformers-4.49.0-r4.ebuild
rename to sci-ml/transformers/transformers-4.49.0-r5.ebuild
index 05a17cbabe6d..6ad1bdce5a43 100644
--- a/sci-ml/transformers/transformers-4.49.0-r4.ebuild
+++ b/sci-ml/transformers/transformers-4.49.0-r5.ebuild
@@ -34,13 +34,11 @@ RDEPEND="
dev-python/tqdm[${PYTHON_USEDEP}]
>=sci-ml/huggingface_hub-0.26[${PYTHON_USEDEP}]
>=sci-ml/safetensors-0.4.1[${PYTHON_USEDEP}]
- torch? (
- sci-ml/caffe2[${PYTHON_USEDEP}]
- sci-ml/pytorch[${PYTHON_USEDEP}]
- )
')
torch? (
sci-ml/accelerate[${PYTHON_SINGLE_USEDEP}]
+ sci-ml/caffe2[${PYTHON_SINGLE_USEDEP}]
+ sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
)
"
BDEPEND="
