From 02f2b9c649c1687088b6ccb6d30b35f519f107cf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Apr 2023 17:32:36 +0100 Subject: gentoo auto-resync : 08:04:2023 - 17:32:35 --- sci-libs/Manifest.gz | Bin 43622 -> 43619 bytes sci-libs/caffe2/Manifest | 4 +- sci-libs/caffe2/caffe2-2.0.0-r1.ebuild | 185 +++++++++++++++++++++++++++++++++ sci-libs/caffe2/caffe2-2.0.0.ebuild | 184 -------------------------------- sci-libs/caffe2/metadata.xml | 1 + sci-libs/rtree/Manifest | 2 - sci-libs/rtree/rtree-0.9.7.ebuild | 31 ------ 7 files changed, 188 insertions(+), 219 deletions(-) create mode 100644 sci-libs/caffe2/caffe2-2.0.0-r1.ebuild delete mode 100644 sci-libs/caffe2/caffe2-2.0.0.ebuild delete mode 100644 sci-libs/rtree/rtree-0.9.7.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 71b3dc489381..5c84cb0b264d 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 6ae0809a3d4d..0ebedf64c2cd 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -7,5 +7,5 @@ AUX caffe2-2.0.0-gentoo.patch 6682 BLAKE2B 67657b1ca48ded05a6b07ce18df89c4b87590 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14 EBUILD caffe2-1.13.1-r4.ebuild 5009 BLAKE2B dd92c8d27be86d635a832e286ed2b1617e10520f02447d7aaf097cdabcd9c8ba634490ef4af59325d64048bf63f39d00a693373ab921c855e5716514c212d38c SHA512 5269a5c121b2bb9c5d4a1a07c6d1300577e4abec418625c2cae88c6d0385768fe73f380a997b5f46837eba29948c6397e4a4ac642c9d1c94f5ac0fba6e794732 -EBUILD caffe2-2.0.0.ebuild 4982 BLAKE2B 36012cf4c19f5d93084cdcd6d2d185db391d73e81e68d34eb73d7be66a2ff12ec1ee676921d663a80cf4080d2e2ef8accb15d2bbfb08eefcf94c89999b2cedb4 SHA512 b7d0b2811d11a197c9977070b2332c2a86e616bbd6c6b2dd967580a6de889853a88019ec02fd04907d759e7d493acd755938552812c3d167ce4d19f30833558f -MISC metadata.xml 1076 BLAKE2B e1128f64fe04ef1af67219ffa450f52dadf3e4062b0e9e958c41555acc390966945c431b589181101d3366f9d474605ea48f8b332a2f6ff49a9eb1a9a79a1a37 SHA512 3fc9df5640bd5239cf3e738ca248d6de4be84fac667b1a33484dd572377c02debac29aea369c048cb5bd907209071339e1ff0d2d1d1bb94c12b97a481f8b257d +EBUILD caffe2-2.0.0-r1.ebuild 5022 BLAKE2B 4c316027543fa961e45cee3f3ed13185c5fb5e4ce230d9d514d3f6a5d665d5aa1de4fa1080ed934e74ade5b124ef381deb844474b233d1d99addd9a9247f4f87 SHA512 074fd06bb307935ffc131b300f74478f01cf98bf9cf39555c2a6b0606206f5ea5e9a3af9db4e3085f252cbd9525ee62a035562d60d10b6897851e263a805f50a +MISC metadata.xml 1116 BLAKE2B ac8f5d50c8727a42ab904c5705009247b89b695b8a4e918b2a9a184c7c3e11de19dde49dce207b1eafb0a73a03198efc2efe3890a3b697c18fe86b5740ce2b4b SHA512 6060fb034c36e65279e01ff3c858f944407fbf7a47359f795a13d7fbaa26f5f26945d28d26fbf4301ba359144fc53ba4d845c9dc89669496c0830146fea34724 diff --git a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild new file mode 100644 index 000000000000..ae14175b2471 --- /dev/null +++ b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild @@ -0,0 +1,185 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit python-single-r1 cmake cuda flag-o-matic + +MYPN=pytorch +MYP=${MYPN}-${PV} + +DESCRIPTION="A deep learning framework" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz + -> ${MYP}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda distributed fbgemm ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( opencv ) + mpi? ( distributed ) + tensorpipe? ( distributed ) +" # ?? ( cuda rocm ) + +# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gflags:= + >=dev-cpp/glog-0.5.0 + dev-libs/cpuinfo + dev-libs/libfmt + dev-libs/protobuf:= + dev-libs/pthreadpool + dev-libs/sleef + sci-libs/lapack + >=sci-libs/onnx-1.12.0 + sci-libs/foxi + cuda? ( + =dev-libs/cudnn-8* + dev-libs/cudnn-frontend:0/8 + =sci-libs/XNNPACK-2022.12.22 ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen + cuda? ( dev-libs/cutlass ) + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + sci-libs/kineto + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + ') +" + +S="${WORKDIR}"/${MYP} + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch + "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch + "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch +) + +src_prepare() { + filter-lto #bug 862672 + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd +} + +src_configure() { + if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then + ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0." + ewarn "These may not be optimal for your GPU." + ewarn "" + ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU," + ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2." + ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5,3.5" + ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell" + ewarn "" + ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" + ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" + fi + + local mycmakeargs=( + -DBUILD_CUSTOM_PROTOBUF=OFF + -DBUILD_SHARED_LIBS=ON + + -DUSE_CCACHE=OFF + -DUSE_CUDA=$(usex cuda) + -DUSE_CUDNN=$(usex cuda) + -DUSE_FAST_NVCC=$(usex cuda) + -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" + -DUSE_DISTRIBUTED=$(usex distributed) + -DUSE_MPI=$(usex mpi) + -DUSE_FAKELOWP=OFF + -DUSE_FBGEMM=$(usex fbgemm) + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_GFLAGS=ON + -DUSE_GLOG=ON + -DUSE_GLOO=OFF + -DUSE_KINETO=OFF # TODO + -DUSE_LEVELDB=OFF + -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MKLDNN=OFF + -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DUSE_NNPACK=$(usex nnpack) + -DUSE_QNNPACK=$(usex qnnpack) + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex tensorpipe) + -DUSE_PYTORCH_QNNPACK=OFF + -DUSE_NUMPY=$(usex numpy) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENCV=$(usex opencv) + -DUSE_OPENMP=$(usex openmp) + -DUSE_ROCM=OFF # TODO + -DUSE_SYSTEM_CPUINFO=ON + -DUSE_SYSTEM_PYBIND11=ON + -DUSE_UCC=OFF + -DUSE_VALGRIND=OFF + -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_ITT=OFF + -DBLAS=Eigen # avoid the use of MKL, if found on the system + -DUSE_SYSTEM_EIGEN_INSTALL=ON + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_GLOO=ON + -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_SLEEF=ON + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + ) + + if use cuda; then + addpredict "/dev/nvidiactl" # bug 867706 + + mycmakeargs+=( + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + ) + fi + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto "/var/lib/${PN}" + doins "${BUILD_DIR}"/CMakeCache.txt + + rm -rf python + mkdir -p python/torch/include || die + mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die + mv "${ED}"/usr/include/torch python/torch/include || die + cp torch/version.py python/torch/ || die + rm -rf "${ED}"/var/tmp || die + python_domodule python/caffe2 + python_domodule python/torch +} diff --git a/sci-libs/caffe2/caffe2-2.0.0.ebuild b/sci-libs/caffe2/caffe2-2.0.0.ebuild deleted file mode 100644 index 9b010cdda9a9..000000000000 --- a/sci-libs/caffe2/caffe2-2.0.0.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit python-single-r1 cmake cuda flag-o-matic - -MYPN=pytorch -MYP=${MYPN}-${PV} - -DESCRIPTION="A deep learning framework" -HOMEPAGE="https://pytorch.org/" -SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz - -> ${MYP}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda distributed ffmpeg mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" -RESTRICT="test" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ffmpeg? ( opencv ) - mpi? ( distributed ) - tensorpipe? ( distributed ) -" # ?? ( cuda rocm ) - -# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags:= - >=dev-cpp/glog-0.5.0 - dev-libs/cpuinfo - dev-libs/libfmt - dev-libs/protobuf:= - dev-libs/pthreadpool - dev-libs/sleef - sci-libs/lapack - >=sci-libs/onnx-1.12.0 - sci-libs/foxi - cuda? ( - =dev-libs/cudnn-8* - dev-libs/cudnn-frontend:0/8 - =sci-libs/XNNPACK-2022.12.22 ) -" -DEPEND=" - ${RDEPEND} - dev-cpp/eigen - cuda? ( dev-libs/cutlass ) - dev-libs/psimd - dev-libs/FP16 - dev-libs/FXdiv - dev-libs/pocketfft - dev-libs/flatbuffers - sci-libs/kineto - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') -" - -S="${WORKDIR}"/${MYP} - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch - "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch - "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch -) - -src_prepare() { - filter-lto #bug 862672 - cmake_src_prepare - pushd torch/csrc/jit/serialization || die - flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die - popd -} - -src_configure() { - if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then - ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0." - ewarn "These may not be optimal for your GPU." - ewarn "" - ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU," - ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2." - ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5,3.5" - ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell" - ewarn "" - ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" - ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" - fi - - local mycmakeargs=( - -DBUILD_CUSTOM_PROTOBUF=OFF - -DBUILD_SHARED_LIBS=ON - - -DUSE_CCACHE=OFF - -DUSE_CUDA=$(usex cuda) - -DUSE_CUDNN=$(usex cuda) - -DUSE_FAST_NVCC=$(usex cuda) - -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" - -DUSE_DISTRIBUTED=$(usex distributed) - -DUSE_MPI=$(usex mpi) - -DUSE_FAKELOWP=OFF - -DUSE_FBGEMM=OFF # TODO - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_GFLAGS=ON - -DUSE_GLOG=ON - -DUSE_GLOO=OFF - -DUSE_KINETO=OFF # TODO - -DUSE_LEVELDB=OFF - -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma - -DUSE_MKLDNN=OFF - -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library - -DUSE_NNPACK=$(usex nnpack) - -DUSE_QNNPACK=$(usex qnnpack) - -DUSE_XNNPACK=$(usex xnnpack) - -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex tensorpipe) - -DUSE_PYTORCH_QNNPACK=OFF - -DUSE_NUMPY=$(usex numpy) - -DUSE_OPENCL=$(usex opencl) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENMP=$(usex openmp) - -DUSE_ROCM=OFF # TODO - -DUSE_SYSTEM_CPUINFO=ON - -DUSE_SYSTEM_PYBIND11=ON - -DUSE_UCC=OFF - -DUSE_VALGRIND=OFF - -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_ITT=OFF - -DBLAS=Eigen # avoid the use of MKL, if found on the system - -DUSE_SYSTEM_EIGEN_INSTALL=ON - -DUSE_SYSTEM_PTHREADPOOL=ON - -DUSE_SYSTEM_FXDIV=ON - -DUSE_SYSTEM_FP16=ON - -DUSE_SYSTEM_GLOO=ON - -DUSE_SYSTEM_ONNX=ON - -DUSE_SYSTEM_SLEEF=ON - - -Wno-dev - -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) - -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) - ) - - if use cuda; then - addpredict "/dev/nvidiactl" # bug 867706 - - mycmakeargs+=( - -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" - ) - fi - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto "/var/lib/${PN}" - doins "${BUILD_DIR}"/CMakeCache.txt - - rm -rf python - mkdir -p python/torch/include || die - mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die - mv "${ED}"/usr/include/torch python/torch/include || die - cp torch/version.py python/torch/ || die - rm -rf "${ED}"/var/tmp || die - python_domodule python/caffe2 - python_domodule python/torch -} diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index 531b9cbf5879..f58d3b5e97ab 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -12,6 +12,7 @@ Add support for CUDA processing Support distributed applications + Use FBGEMM Add support for video processing operators Use NNPACK Add support for math operations through numpy diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest index 5021cc657535..1479caf5cb84 100644 --- a/sci-libs/rtree/Manifest +++ b/sci-libs/rtree/Manifest @@ -1,5 +1,3 @@ -DIST Rtree-0.9.7.tar.gz 44877 BLAKE2B 4ee5ad4c478ada448a8faa5ba29bdfbb67bc2f688cb8c6f465f4637fbd890cbd997f24573b25a936b7ceb503cc0b7684a1932e6ac91a85e4c37730ee9a6d39f0 SHA512 35b39e29f6d2b9cf4e774191bed69ade515680d07213f0ba74748da11ba916b41c93dfc4f489d7320855f3722ac8b5b58bac4614ea95e6230fcffe33f4332607 DIST Rtree-1.0.0.tar.gz 48837 BLAKE2B 60e516155e7e48158494b7ea4720dc71ece2111fb94e320976a6dd691d2458b8586c2bf8109a37d86db211ac342d77877b435bdb54627a94c898642e8520a071 SHA512 9a414cd65b27ba35313dd7185dece83f5d7235867f6f0c72c2902d7ffd72808138dbf30d8fe11c8bbf0ec463072e5f6112d75b5fdd5a1dab7720c56d3632d576 -EBUILD rtree-0.9.7.ebuild 642 BLAKE2B c2952e8c4672151c395e48fc4d200ec718c1b186daa0890ff1a36bc5725738c56518e117c94fab3e2cad357c87a930c1e9abdcee78383c976b1199a7b3d42c07 SHA512 06845e7d4f28724018c0e92a93b7056a44255878664a8da4c37f30e72f5d6784fcd6cd2eb00d496152961d51dc2a0f011ea7945069d0114887218d32f508dfe7 EBUILD rtree-1.0.0.ebuild 598 BLAKE2B 1c4cb9bd3c47a5a1b87a8e5a2e2faa6d2e1a4de0ade522b821c124987ceedbd54c693d61d61b028eb0a0505649f73e4b069a153885976031e47d7636165e7a6d SHA512 8d85f519da947c5066db30bb4b15025f3e99352cdcdd273503ba7a23db51277afc101b2d95d3fafd5729f155edf6a48b111563902d8c1b2714d99d357dde427d MISC metadata.xml 839 BLAKE2B 1a948191fec4142d6c2731639ff99c4185a58231d22683f0541ec557b6b0650d2b4cb1c54238a0d5d6baf1cd7a7fe24722f832306050179b5f6c0a168ffc18ac SHA512 b63ea233bec3285bda6008728a82799c97f7ea544e1800952a53f480e4eedb8a59a2e9e77901785d93ab46eb79ea397d8829c16210bb3bd84820c87a54c7d287 diff --git a/sci-libs/rtree/rtree-0.9.7.ebuild b/sci-libs/rtree/rtree-0.9.7.ebuild deleted file mode 100644 index c6c45ca4a5ed..000000000000 --- a/sci-libs/rtree/rtree-0.9.7.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 - -MY_PN="Rtree" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="R-Tree spatial index for Python GIS" -HOMEPAGE="https://rtree.readthedocs.io" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -LICENSE="MIT" - -KEYWORDS="amd64 ~arm64 ~x86" -SLOT="0" - -S="${WORKDIR}/${MY_P}" - -BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]" -RDEPEND="sci-libs/libspatialindex" - -distutils_enable_sphinx docs/source -distutils_enable_tests pytest - -DEPEND+=" - test? ( dev-python/numpy[${PYTHON_USEDEP}] ) -" -- cgit v1.2.3