commit: 6d588efc144dff64e7fc1d5927faf12705328147
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 14 21:21:56 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 14 21:36:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d588efc
*/*: mv sci-libs/caffe2 to sci-ml/
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
profiles/arch/arm64/package.use.mask | 2 +-
profiles/arch/riscv/package.use.mask | 2 +-
profiles/features/musl/package.use.mask | 2 +-
profiles/updates/1Q-2025 | 1 +
sci-chemistry/gromacs/gromacs-2025.0.ebuild | 2 +-
sci-chemistry/gromacs/gromacs-2025.9999.ebuild | 2 +-
sci-chemistry/gromacs/gromacs-9999.ebuild | 2 +-
sci-chemistry/gromacs/metadata.xml | 2 +-
{sci-libs => sci-ml}/caffe2/Manifest | 0
{sci-libs => sci-ml}/caffe2/caffe2-2.4.1-r4.ebuild | 2 +-
{sci-libs => sci-ml}/caffe2/caffe2-2.5.1-r8.ebuild | 0
{sci-libs => sci-ml}/caffe2/caffe2-2.6.0.ebuild | 0
{sci-libs => sci-ml}/caffe2/files/caffe2-2.4.0-cpp-httplib.patch | 0
{sci-libs => sci-ml}/caffe2/files/caffe2-2.4.0-cstdint.patch | 0
{sci-libs => sci-ml}/caffe2/files/caffe2-2.4.0-libfmt-11.patch | 0
.../caffe2/files/caffe2-2.5.1-cudnn_include_fix.patch | 0
{sci-libs => sci-ml}/caffe2/files/caffe2-2.5.1-gentoo.patch | 0
{sci-libs => sci-ml}/caffe2/files/caffe2-2.5.1-glog-0.6.0.patch | 0
.../caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch | 0
{sci-libs => sci-ml}/caffe2/files/caffe2-2.5.1-unbundle_fmt.patch | 0
{sci-libs => sci-ml}/caffe2/files/caffe2-2.5.1-unbundle_kineto.patch | 0
{sci-libs => sci-ml}/caffe2/files/caffe2-2.6.0-gentoo.patch | 0
{sci-libs => sci-ml}/caffe2/metadata.xml | 0
sci-ml/datasets/datasets-2.21.0-r2.ebuild | 2 +-
sci-ml/pytorch/pytorch-2.4.1.ebuild | 2 +-
sci-ml/pytorch/pytorch-2.5.1-r1.ebuild | 4 ++--
sci-ml/pytorch/pytorch-2.6.0.ebuild | 3 +--
sci-ml/torchvision/torchvision-0.20.0.ebuild | 2 +-
28 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/profiles/arch/arm64/package.use.mask
b/profiles/arch/arm64/package.use.mask
index a1bf2726fc8c..5783d4f0fa0a 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -51,7 +51,7 @@ dev-python/qtpy remoteobjects
>=sys-devel/gcc-11 -ada
# Alexey Shvetsov <[email protected]> (2024-11-21)
-# sci-libs/caffe2 is not keyworded on arm64
+# sci-ml/caffe2 is not keyworded on arm64
sci-chemistry/gromacs nnpot
# Joonas Niilola <[email protected]> (2024-11-16)
diff --git a/profiles/arch/riscv/package.use.mask
b/profiles/arch/riscv/package.use.mask
index 8b7df2363a59..46bdf7ed2671 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# Alexey Shvetsov <[email protected]> (2024-11-21)
-# sci-libs/caffe2 is not keyworded on riscv
+# sci-ml/caffe2 is not keyworded on riscv
sci-chemistry/gromacs nnpot
# Benda Xu <[email protected]> (2024-10-10)
diff --git a/profiles/features/musl/package.use.mask
b/profiles/features/musl/package.use.mask
index c2180ac3bcb0..1e3453caa9a0 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -187,7 +187,7 @@ net-analyzer/nagios-plugin-check_raid megaraid-sas
sys-apps/hwloc gl
sci-chemistry/gromacs mkl
sci-libs/armadillo mkl
-sci-libs/caffe2 mkl
+sci-ml/caffe2 mkl
sci-libs/dlib mkl
sci-libs/trilinos mkl
www-client/qutebrowser widevine
diff --git a/profiles/updates/1Q-2025 b/profiles/updates/1Q-2025
index ed1fc41175bf..9437606e9a55 100644
--- a/profiles/updates/1Q-2025
+++ b/profiles/updates/1Q-2025
@@ -10,3 +10,4 @@ move sci-libs/huggingface_hub sci-ml/huggingface_hub
move sci-libs/safetensors sci-ml/safetensors
move sci-libs/torchvision sci-ml/torchvision
move sci-libs/pytorch sci-ml/pytorch
+move sci-libs/caffe2 sci-ml/caffe2
diff --git a/sci-chemistry/gromacs/gromacs-2025.0.ebuild
b/sci-chemistry/gromacs/gromacs-2025.0.ebuild
index ea299e483a56..8cff5c057efa 100644
--- a/sci-chemistry/gromacs/gromacs-2025.0.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2025.0.ebuild
@@ -55,7 +55,7 @@ CDEPEND="
lapack? ( virtual/lapack )
mkl? ( sci-libs/mkl )
mpi? ( virtual/mpi[cxx] )
- nnpot? ( sci-libs/caffe2[cuda=,opencl=] )
+ nnpot? ( sci-ml/caffe2[cuda=,opencl=] )
sci-libs/lmfit:=
>=dev-cpp/muParser-2.3:=
${PYTHON_DEPS}
diff --git a/sci-chemistry/gromacs/gromacs-2025.9999.ebuild
b/sci-chemistry/gromacs/gromacs-2025.9999.ebuild
index ea299e483a56..8cff5c057efa 100644
--- a/sci-chemistry/gromacs/gromacs-2025.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2025.9999.ebuild
@@ -55,7 +55,7 @@ CDEPEND="
lapack? ( virtual/lapack )
mkl? ( sci-libs/mkl )
mpi? ( virtual/mpi[cxx] )
- nnpot? ( sci-libs/caffe2[cuda=,opencl=] )
+ nnpot? ( sci-ml/caffe2[cuda=,opencl=] )
sci-libs/lmfit:=
>=dev-cpp/muParser-2.3:=
${PYTHON_DEPS}
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild
b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 834cbde74d22..0ba977773a31 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
lapack? ( virtual/lapack )
mkl? ( sci-libs/mkl )
mpi? ( virtual/mpi[cxx] )
- nnpot? ( sci-libs/caffe2[cuda=,opencl=] )
+ nnpot? ( sci-ml/caffe2[cuda=,opencl=] )
sci-libs/lmfit:=
>=dev-cpp/muParser-2.3:=
${PYTHON_DEPS}
diff --git a/sci-chemistry/gromacs/metadata.xml
b/sci-chemistry/gromacs/metadata.xml
index 43c6b2799b5c..c9f06ca19ba2 100644
--- a/sci-chemistry/gromacs/metadata.xml
+++ b/sci-chemistry/gromacs/metadata.xml
@@ -18,7 +18,7 @@
<flag name="gmxapi">Add support for gmxapi library</flag>
<flag name="gmxapi-legacy">Enable installing lagacy
headers</flag>
<flag name="hwloc">Enable HWLoc lib support</flag>
- <flag name="nnpot">Allow to use <pkg>sci-libs/caffe2</pkg> for
NN Potentials</flag>
+ <flag name="nnpot">Allow to use <pkg>sci-ml/caffe2</pkg> for NN
Potentials</flag>
<flag name="opencl">Enable opencl non-bonded kernels</flag>
<flag name="single-precision">Single precision version of
gromacs (default)</flag>
<flag name="tng">Enable new trajectory format - tng</flag>
diff --git a/sci-libs/caffe2/Manifest b/sci-ml/caffe2/Manifest
similarity index 100%
rename from sci-libs/caffe2/Manifest
rename to sci-ml/caffe2/Manifest
diff --git a/sci-libs/caffe2/caffe2-2.4.1-r4.ebuild
b/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
similarity index 99%
rename from sci-libs/caffe2/caffe2-2.4.1-r4.ebuild
rename to sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
index d52388df3770..e50a3002c982 100644
--- a/sci-libs/caffe2/caffe2-2.4.1-r4.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/sci-libs/caffe2/caffe2-2.5.1-r8.ebuild
b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
similarity index 100%
rename from sci-libs/caffe2/caffe2-2.5.1-r8.ebuild
rename to sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
diff --git a/sci-libs/caffe2/caffe2-2.6.0.ebuild
b/sci-ml/caffe2/caffe2-2.6.0.ebuild
similarity index 100%
rename from sci-libs/caffe2/caffe2-2.6.0.ebuild
rename to sci-ml/caffe2/caffe2-2.6.0.ebuild
diff --git a/sci-libs/caffe2/files/caffe2-2.4.0-cpp-httplib.patch
b/sci-ml/caffe2/files/caffe2-2.4.0-cpp-httplib.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.4.0-cpp-httplib.patch
rename to sci-ml/caffe2/files/caffe2-2.4.0-cpp-httplib.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.4.0-cstdint.patch
b/sci-ml/caffe2/files/caffe2-2.4.0-cstdint.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.4.0-cstdint.patch
rename to sci-ml/caffe2/files/caffe2-2.4.0-cstdint.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch
b/sci-ml/caffe2/files/caffe2-2.4.0-libfmt-11.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch
rename to sci-ml/caffe2/files/caffe2-2.4.0-libfmt-11.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-cudnn_include_fix.patch
b/sci-ml/caffe2/files/caffe2-2.5.1-cudnn_include_fix.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.5.1-cudnn_include_fix.patch
rename to sci-ml/caffe2/files/caffe2-2.5.1-cudnn_include_fix.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-gentoo.patch
b/sci-ml/caffe2/files/caffe2-2.5.1-gentoo.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.5.1-gentoo.patch
rename to sci-ml/caffe2/files/caffe2-2.5.1-gentoo.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-glog-0.6.0.patch
b/sci-ml/caffe2/files/caffe2-2.5.1-glog-0.6.0.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.5.1-glog-0.6.0.patch
rename to sci-ml/caffe2/files/caffe2-2.5.1-glog-0.6.0.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch
b/sci-ml/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch
rename to sci-ml/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-unbundle_fmt.patch
b/sci-ml/caffe2/files/caffe2-2.5.1-unbundle_fmt.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.5.1-unbundle_fmt.patch
rename to sci-ml/caffe2/files/caffe2-2.5.1-unbundle_fmt.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-unbundle_kineto.patch
b/sci-ml/caffe2/files/caffe2-2.5.1-unbundle_kineto.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.5.1-unbundle_kineto.patch
rename to sci-ml/caffe2/files/caffe2-2.5.1-unbundle_kineto.patch
diff --git a/sci-libs/caffe2/files/caffe2-2.6.0-gentoo.patch
b/sci-ml/caffe2/files/caffe2-2.6.0-gentoo.patch
similarity index 100%
rename from sci-libs/caffe2/files/caffe2-2.6.0-gentoo.patch
rename to sci-ml/caffe2/files/caffe2-2.6.0-gentoo.patch
diff --git a/sci-libs/caffe2/metadata.xml b/sci-ml/caffe2/metadata.xml
similarity index 100%
rename from sci-libs/caffe2/metadata.xml
rename to sci-ml/caffe2/metadata.xml
diff --git a/sci-ml/datasets/datasets-2.21.0-r2.ebuild
b/sci-ml/datasets/datasets-2.21.0-r2.ebuild
index 57f233f9aaf9..6c7f8faeefb7 100644
--- a/sci-ml/datasets/datasets-2.21.0-r2.ebuild
+++ b/sci-ml/datasets/datasets-2.21.0-r2.ebuild
@@ -22,7 +22,7 @@ IUSE="test"
RDEPEND="
${PYTHON_DEPS}
sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
- sci-libs/caffe2[${PYTHON_SINGLE_USEDEP},numpy]
+ sci-ml/caffe2[${PYTHON_SINGLE_USEDEP},numpy]
$(python_gen_cond_dep '
dev-python/aiohttp[${PYTHON_USEDEP}]
dev-python/dill[${PYTHON_USEDEP}]
diff --git a/sci-ml/pytorch/pytorch-2.4.1.ebuild
b/sci-ml/pytorch/pytorch-2.4.1.ebuild
index 5b60c2d504b3..a728bf7bf17c 100644
--- a/sci-ml/pytorch/pytorch-2.4.1.ebuild
+++ b/sci-ml/pytorch/pytorch-2.4.1.ebuild
@@ -22,7 +22,7 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
+ ~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/sympy[${PYTHON_USEDEP}]
diff --git a/sci-ml/pytorch/pytorch-2.5.1-r1.ebuild
b/sci-ml/pytorch/pytorch-2.5.1-r1.ebuild
index 2528ee61d4f3..9a08af21caeb 100644
--- a/sci-ml/pytorch/pytorch-2.5.1-r1.ebuild
+++ b/sci-ml/pytorch/pytorch-2.5.1-r1.ebuild
@@ -22,8 +22,8 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
- >=sci-libs/caffe2-2.5.1-r5
+ ~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
+ >=sci-ml/caffe2-2.5.1-r5
$(python_gen_cond_dep '
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/sympy[${PYTHON_USEDEP}]
diff --git a/sci-ml/pytorch/pytorch-2.6.0.ebuild
b/sci-ml/pytorch/pytorch-2.6.0.ebuild
index 9cb0e5814c84..32f7131e5bdb 100644
--- a/sci-ml/pytorch/pytorch-2.6.0.ebuild
+++ b/sci-ml/pytorch/pytorch-2.6.0.ebuild
@@ -22,8 +22,7 @@ RESTRICT="test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
- >=sci-libs/caffe2-2.5.1-r5
+ ~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep '
dev-python/typing-extensions[${PYTHON_USEDEP}]
dev-python/sympy[${PYTHON_USEDEP}]
diff --git a/sci-ml/torchvision/torchvision-0.20.0.ebuild
b/sci-ml/torchvision/torchvision-0.20.0.ebuild
index 3b1627344c43..1839680abc83 100644
--- a/sci-ml/torchvision/torchvision-0.20.0.ebuild
+++ b/sci-ml/torchvision/torchvision-0.20.0.ebuild
@@ -23,7 +23,7 @@ IUSE="cuda"
RDEPEND="
=sci-ml/pytorch-2.5*[${PYTHON_SINGLE_USEDEP}]
- =sci-libs/caffe2-2.5*[cuda?]
+ =sci-ml/caffe2-2.5*[cuda?]
dev-python/numpy
dev-python/pillow
media-libs/libjpeg-turbo:=
