From 5181ced3f3566a9610b85922b083c8f84f20d78f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 May 2024 00:00:57 +0100 Subject: gentoo auto-resync : 08:05:2024 - 00:00:57 --- sci-libs/Manifest.gz | Bin 44672 -> 44664 bytes sci-libs/branca/Manifest | 2 + sci-libs/branca/branca-0.7.2.ebuild | 36 ++++ sci-libs/caffe2/Manifest | 4 +- sci-libs/caffe2/caffe2-2.2.2-r1.ebuild | 1 + sci-libs/caffe2/caffe2-2.3.0-r1.ebuild | 269 ------------------------ sci-libs/caffe2/caffe2-2.3.0-r2.ebuild | 270 +++++++++++++++++++++++++ sci-libs/netcdf-cxx/Manifest | 2 +- sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild | 2 +- sci-libs/onnx/Manifest | 4 +- sci-libs/onnx/metadata.xml | 3 + sci-libs/onnx/onnx-1.16.0.ebuild | 3 + 12 files changed, 321 insertions(+), 275 deletions(-) create mode 100644 sci-libs/branca/branca-0.7.2.ebuild delete mode 100644 sci-libs/caffe2/caffe2-2.3.0-r1.ebuild create mode 100644 sci-libs/caffe2/caffe2-2.3.0-r2.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 95144687e683..86bc41e5aa10 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest index 4c38f67ba2e6..e0990fc9793c 100644 --- a/sci-libs/branca/Manifest +++ b/sci-libs/branca/Manifest @@ -1,6 +1,8 @@ AUX branca-0.6.0-test.patch 333 BLAKE2B bdf1a556ff4b2e8b023a216a84af4b97cefe1c86177504f93882f1f68d66647de120ca58c8a40322a908e7fd03ea5ca96933fb8618457bb6b2fc18dd2983825b SHA512 eeb8c56922a5e35cb092d5362bec3fdf4f516ba38e7febdb37d672686f21165bcb5213d739ca52494eca2d5017736bb4a3495d91aa80612413fd86d900ffe0dd DIST branca-0.7.0.tar.gz 42990 BLAKE2B b8de083b0b94d35dbb6df5d230e388832fe027d756767d24ae8091f25d9846ac1f2ae72799aa83583c99ec02d955c7f8cb80183f1543e503d0a802ce051acac5 SHA512 bfe6afd93752dda57e55ba7bdd433e079b51798056b2be8d9c19d4ccc4ed94cc95b733cabf0981c908887c1f8a96e16bd11cb1b495243ac91df4c1c1c1253282 DIST branca-0.7.1.tar.gz 43005 BLAKE2B 2f2834d87e32ef5507273b14b1b8fcebc33d7eae49e0ffb8e834c540b1a329d177805ccbc1441cd522092d396ba98f69f3c8ab95254068d7b352e6f7df52c60d SHA512 70b6e361e93a01c319928890a40e3aa1e887e718b0736afe0a65bc45fe56fe6ca24a4c50db099066d84876cc8efd540a5cc14aa48607671ac068df3ae5124d29 +DIST branca-0.7.2.tar.gz 42586 BLAKE2B 3bb6a1f93babb80788fbc1cbd37d8b0c2d5c975c9a98c5816298e37a447bcffb7742a768a0ad2fbb58af5ce0650ef28fdef42e8e4d505bbf29ab10c87ed388d6 SHA512 ad62e4496b43405dbc54b2cca35ee9d0265b8deeeb3df3b0868e63e6890fe491bfc4987318d74c1e78d83f05bdf56bfd570609699860ab1af9d189357bf00107 EBUILD branca-0.7.0-r2.ebuild 901 BLAKE2B 79cc3f6889f428a007bfd905338753520660c38dc32d00cad2f9587ae633c67793e66af2a005f58acefc749b84ecde32fa94848651f0e7f2874b966952c36eaf SHA512 90289c6cf1ab22f0e77939c2984c98834a3fcddbca5fe2930c3fa35bf5e2d74d18caecca32f9c537c8a4f0b72555fd7ed2f4ab828ff5ab999eacd6b242375209 EBUILD branca-0.7.1.ebuild 901 BLAKE2B 79cc3f6889f428a007bfd905338753520660c38dc32d00cad2f9587ae633c67793e66af2a005f58acefc749b84ecde32fa94848651f0e7f2874b966952c36eaf SHA512 90289c6cf1ab22f0e77939c2984c98834a3fcddbca5fe2930c3fa35bf5e2d74d18caecca32f9c537c8a4f0b72555fd7ed2f4ab828ff5ab999eacd6b242375209 +EBUILD branca-0.7.2.ebuild 902 BLAKE2B 4eac358501ca18426d9aca169caa360c194bebc401bc2f870ad5fc606ef2f0699157b00f342f811a08db79a8cec62707d7106d269c0d18d4f540698fe1f92c62 SHA512 b0a8133fad3418a79afa9c9ca0b88231c680a5131a2375ac095db0937ef8973221a25cba6c1f9b65302385e6b29b6700f8ffa8f7588ea8aa57b8412086a93c3e MISC metadata.xml 567 BLAKE2B a65dec67ea324de3bd665152174cd5d8ca121d2775e9e6db7d15f2c1a2b60058f8788769d2cd4ae54d454b667b9581fe84006b2eebfde99ccdb63ed5d015ff6c SHA512 9cff06968cb58902bc68dab33859310746e7fba3420a53f04c6fa45c5aeda061a68c41343b71240670b21d116d80fe9e6d40c7ba281e2910b7a95caebfcd5dd8 diff --git a/sci-libs/branca/branca-0.7.2.ebuild b/sci-libs/branca/branca-0.7.2.ebuild new file mode 100644 index 000000000000..6fbc4495a341 --- /dev/null +++ b/sci-libs/branca/branca-0.7.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +inherit distutils-r1 + +DESCRIPTION="spinoff from folium, host the non-map-specific features" +HOMEPAGE="https://github.com/python-visualization/branca" +SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( "${FILESDIR}"/${PN}-0.6.0-test.patch ) + +RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/setuptools-scm + test? ( + dev-python/selenium[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +distutils_enable_sphinx docs/source \ + dev-python/nbsphinx + +python_test() { + epytest -m 'not headless' +} diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 2551dee4dd95..74ad4651268f 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -17,6 +17,6 @@ DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B c5a55ee264bc3477d3556ba6376b5591117e DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c EBUILD caffe2-2.1.2-r7.ebuild 7930 BLAKE2B 4fd832a61e952491d3825b6e1faf7a12c17ffdcb24c125b8da470831a5dc9f6afb7afe162be07ade4faec5d2cc77c40a7afc755cd8e1eea066b76181d68a90f1 SHA512 e0f94a21539aef4dba8208a14c42342f72a6ec63cc7aa59ce7dd49aa92d6c2adb876d0ce13416a437c9ace7628e81bfb31c2ab65c4cdcb19989163ad3fb7cc03 -EBUILD caffe2-2.2.2-r1.ebuild 7421 BLAKE2B 3a98caf956d0c398f46231b6f6ab14827aa694d3eb3760818e79a48160126ba574bce07a7a7c1e9987be2b3f8a4a31917a8d9c5b4e86b58cbc244900556b0481 SHA512 b47f10555e2bd132f4e16bd33407541af86b553b3c7ffc5fd2df2c25e3e7e80a9d13db1f4a1c55730691b0dd4a47a5f6d8a981375ecafb003ed50f2a4d12e7c5 -EBUILD caffe2-2.3.0-r1.ebuild 7437 BLAKE2B 585dc4242736d4f46d43151fa237a70041b7699a41a146760417488efad95d8386318266eed8f281ebc63a6f84e379ed04ac20f68c98f45376b8d29be8acd88a SHA512 20f444afde672d186c29c4c2781c0c19270b62eb3b1e9f1bb0d5c5ee504292a9d2df2ceb3d473c99b3be1fef3e3b5d5e55983e981e1ff607d4c4e1c438fe3db4 +EBUILD caffe2-2.2.2-r1.ebuild 7452 BLAKE2B 6b4c14a8304ef36349f6442616bb1e2a9563596293ea507ffd1d9083fc01c251dd237db3babbdc9841273b7c31b8ac4b420e3047e6ffd128763ca9afc4b6aa16 SHA512 cfa525d40f3dfbcd4dcf7e31cb772dcd809d528981925b50239961e91ae2147723d261b71f433e5a22e73f59b0bd156a97d84b385d1d5bfffd51db9fc6db2b57 +EBUILD caffe2-2.3.0-r2.ebuild 7486 BLAKE2B 9366765f5a8075e23004ff6103f921d5974512c881771c659bab16677318818f5b0c0bd17a909e2dff693fd31305b40f40feb02e6a3afeff29f5b600056c5c87 SHA512 e57bf3a7d46bebc062ed7abc4006947f8abf5f92beedd0b31502c7a641958a617d66245affd8a12d816bfc2e74e672b517478ef7b83225e746bf26f33000a901 MISC metadata.xml 1222 BLAKE2B f7224dcb5025c7979dc9060a6fcf26d1f5b724a266cec61b8244c9b7c5f223abc5f00d89ffef1011096c754e418b0ff041b67306b8b68b58c38ea9da56fb5a3c SHA512 7d2d04905fd85d3a5857327f9f9274fee9d262ea2cba4eabd42716a231abd1207118c141df65b3fe86956ef77c55440625d660a0a4b27cdaa573d25d2931d1de diff --git a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild index 60112b1a722e..cd3d8757daa6 100644 --- a/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild +++ b/sci-libs/caffe2/caffe2-2.2.2-r1.ebuild @@ -106,6 +106,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch "${FILESDIR}"/${PN}-2.1.2-rocm-fix-std-cpp17.patch + "${FILESDIR}"/${P}-musl.patch ) src_prepare() { diff --git a/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild deleted file mode 100644 index 749359d26e11..000000000000 --- a/sci-libs/caffe2/caffe2-2.3.0-r1.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -ROCM_VERSION=5.7 -inherit python-single-r1 cmake cuda flag-o-matic prefix rocm - -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" - -S="${WORKDIR}"/${MYP} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" -RESTRICT="test" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ffmpeg? ( opencv ) - mpi? ( distributed ) - gloo? ( distributed ) - ?? ( cuda rocm ) - rocm? ( || ( ${ROCM_REQUIRED_USE} ) ) -" - -# 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 - virtual/lapack - sci-libs/onnx - sci-libs/foxi - cuda? ( - dev-libs/cudnn - >=dev-libs/cudnn-frontend-1.0.3:0/8 - =dev-libs/FBGEMM-2023.12.01 ) - ffmpeg? ( media-video/ffmpeg:= ) - gloo? ( sci-libs/gloo[cuda?] ) - mpi? ( virtual/mpi ) - nnpack? ( sci-libs/NNPACK ) - numpy? ( $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') ) - onednn? ( dev-libs/oneDNN ) - opencl? ( virtual/opencl ) - opencv? ( media-libs/opencv:= ) - qnnpack? ( sci-libs/QNNPACK ) - rocm? ( - >=dev-util/hip-5.7 - >=dev-libs/rccl-5.7[${ROCM_USEDEP}] - >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}] - >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}] - >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}] - >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}] - >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}] - >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}] - >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}] - >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}] - >=sci-libs/miopen-5.7[${ROCM_USEDEP}] - >=dev-util/roctracer-5.7[${ROCM_USEDEP}] - ) - distributed? ( sci-libs/tensorpipe[cuda?] ) - xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) - mkl? ( sci-libs/mkl ) - openblas? ( sci-libs/openblas ) -" -DEPEND=" - ${RDEPEND} - cuda? ( >=dev-libs/cutlass-3.4.1 ) - onednn? ( sci-libs/ideep ) - dev-libs/psimd - dev-libs/FP16 - dev-libs/FXdiv - dev-libs/pocketfft - dev-libs/flatbuffers - >=sci-libs/kineto-0.4.0_p20231031 - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2.1-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 - "${FILESDIR}"/${P}-cudnn_include_fix.patch - "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch - "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch - "${FILESDIR}"/${P}-rocm-fix-std-cpp17.patch - "${FILESDIR}"/${PN}-2.2.2-musl.patch - "${FILESDIR}"/${P}-CMakeFix.patch -) - -src_prepare() { - filter-lto #bug 862672 - sed -i \ - -e "/third_party\/gloo/d" \ - cmake/Dependencies.cmake \ - || die - cmake_src_prepare - pushd torch/csrc/jit/serialization || die - flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die - popd - # prefixify the hardcoded paths, after all patches are applied - hprefixify \ - aten/CMakeLists.txt \ - caffe2/CMakeLists.txt \ - cmake/Metal.cmake \ - cmake/Modules/*.cmake \ - cmake/Modules_CUDA_fix/FindCUDNN.cmake \ - cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \ - cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \ - cmake/public/LoadHIP.cmake \ - cmake/public/cuda.cmake \ - cmake/Dependencies.cmake \ - torch/CMakeLists.txt \ - CMakeLists.txt - - if use rocm; then - sed -e "s:/opt/rocm:/usr:" \ - -e "s:lib/cmake:$(get_libdir)/cmake:g" \ - -e "s/HIP 1.0/HIP 1.0 REQUIRED/" \ - -i cmake/public/LoadHIP.cmake || die - - ebegin "HIPifying cuda sources" - ${EPYTHON} tools/amd_build/build_amd.py || die - eend $? - fi -} - -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_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=$(usex gloo) - -DUSE_KINETO=OFF # TODO - -DUSE_LEVELDB=OFF - -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma - -DUSE_MKLDNN=$(usex onednn) - -DUSE_NNPACK=$(usex nnpack) - -DUSE_QNNPACK=$(usex qnnpack) - -DUSE_XNNPACK=$(usex xnnpack) - -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex distributed) - -DUSE_PYTORCH_QNNPACK=OFF - -DUSE_NUMPY=$(usex numpy) - -DUSE_OPENCL=$(usex opencl) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENMP=$(usex openmp) - -DUSE_ROCM=$(usex rocm) - -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 - -DUSE_SYSTEM_PTHREADPOOL=ON - -DUSE_SYSTEM_FXDIV=ON - -DUSE_SYSTEM_FP16=ON - -DUSE_SYSTEM_GLOO=ON - -DUSE_SYSTEM_ONNX=ON - -DUSE_SYSTEM_SLEEF=ON - -DUSE_METAL=OFF - - -Wno-dev - -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) - -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) - ) - - if use mkl; then - mycmakeargs+=(-DBLAS=MKL) - elif use openblas; then - mycmakeargs+=(-DBLAS=OpenBLAS) - else - mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=) - fi - - if use cuda; then - addpredict "/dev/nvidiactl" # bug 867706 - addpredict "/dev/char" - addpredict "/proc/self/task" # bug 926116 - - mycmakeargs+=( - -DUSE_CUDNN=ON - -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" - -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library - -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" - ) - elif use rocm; then - export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)" - - mycmakeargs+=( - -DUSE_NCCL=ON - -DUSE_SYSTEM_NCCL=ON - ) - fi - - if use onednn; then - mycmakeargs+=( - -DUSE_MKLDNN=ON - -DMKLDNN_FOUND=ON - -DMKLDNN_LIBRARIES=dnnl - -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl" - ) - fi - - cmake_src_configure - - # do not rerun cmake and the build process in src_install - sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die -} - -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 - cp torch/version.py python/torch/ || die - python_domodule python/caffe2 - python_domodule python/torch - ln -s ../../../../../include/torch \ - "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269 -} diff --git a/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild b/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild new file mode 100644 index 000000000000..41630a00aa19 --- /dev/null +++ b/sci-libs/caffe2/caffe2-2.3.0-r2.ebuild @@ -0,0 +1,270 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +ROCM_VERSION=5.7 +inherit python-single-r1 cmake cuda flag-o-matic prefix rocm + +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" + +S="${WORKDIR}"/${MYP} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda distributed fbgemm ffmpeg gloo mkl mpi nnpack +numpy onednn openblas opencl opencv openmp qnnpack rocm xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( opencv ) + mpi? ( distributed ) + gloo? ( distributed ) + ?? ( cuda rocm ) + rocm? ( || ( ${ROCM_REQUIRED_USE} ) ) +" + +# 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 + virtual/lapack + sci-libs/onnx + sci-libs/foxi + cuda? ( + dev-libs/cudnn + >=dev-libs/cudnn-frontend-1.0.3:0/8 + =dev-libs/FBGEMM-2023.12.01 ) + ffmpeg? ( media-video/ffmpeg:= ) + gloo? ( sci-libs/gloo[cuda?] ) + mpi? ( virtual/mpi ) + nnpack? ( sci-libs/NNPACK ) + numpy? ( $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') ) + onednn? ( dev-libs/oneDNN ) + opencl? ( virtual/opencl ) + opencv? ( media-libs/opencv:= ) + qnnpack? ( sci-libs/QNNPACK ) + rocm? ( + >=dev-util/hip-5.7 + >=dev-libs/rccl-5.7[${ROCM_USEDEP}] + >=sci-libs/rocThrust-5.7[${ROCM_USEDEP}] + >=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}] + >=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}] + >=sci-libs/hipFFT-5.7[${ROCM_USEDEP}] + >=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}] + >=sci-libs/hipRAND-5.7[${ROCM_USEDEP}] + >=sci-libs/hipCUB-5.7[${ROCM_USEDEP}] + >=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}] + >=sci-libs/miopen-5.7[${ROCM_USEDEP}] + >=dev-util/roctracer-5.7[${ROCM_USEDEP}] + ) + distributed? ( sci-libs/tensorpipe[cuda?] ) + xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 ) + mkl? ( sci-libs/mkl ) + openblas? ( sci-libs/openblas ) +" +DEPEND=" + ${RDEPEND} + cuda? ( >=dev-libs/cutlass-3.4.1 ) + onednn? ( sci-libs/ideep ) + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + >=sci-libs/kineto-0.4.0_p20231031 + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + ') +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.1-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 + "${FILESDIR}"/${P}-cudnn_include_fix.patch + "${FILESDIR}"/${PN}-2.1.2-fix-rpath.patch + "${FILESDIR}"/${PN}-2.1.2-fix-openmp-link.patch + "${FILESDIR}"/${P}-rocm-fix-std-cpp17.patch + "${FILESDIR}"/${PN}-2.2.2-musl.patch + "${FILESDIR}"/${P}-CMakeFix.patch +) + +src_prepare() { + filter-lto #bug 862672 + sed -i \ + -e "/third_party\/gloo/d" \ + cmake/Dependencies.cmake \ + || die + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd + # prefixify the hardcoded paths, after all patches are applied + hprefixify \ + aten/CMakeLists.txt \ + caffe2/CMakeLists.txt \ + cmake/Metal.cmake \ + cmake/Modules/*.cmake \ + cmake/Modules_CUDA_fix/FindCUDNN.cmake \ + cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \ + cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \ + cmake/public/LoadHIP.cmake \ + cmake/public/cuda.cmake \ + cmake/Dependencies.cmake \ + torch/CMakeLists.txt \ + CMakeLists.txt + + if use rocm; then + sed -e "s:/opt/rocm:/usr:" \ + -e "s:lib/cmake:$(get_libdir)/cmake:g" \ + -e "s/HIP 1.0/HIP 1.0 REQUIRED/" \ + -i cmake/public/LoadHIP.cmake || die + + ebegin "HIPifying cuda sources" + ${EPYTHON} tools/amd_build/build_amd.py || die + eend $? + fi +} + +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_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=$(usex gloo) + -DUSE_KINETO=OFF # TODO + -DUSE_LEVELDB=OFF + -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MKLDNN=$(usex onednn) + -DUSE_NNPACK=$(usex nnpack) + -DUSE_QNNPACK=$(usex qnnpack) + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex distributed) + -DUSE_PYTORCH_QNNPACK=OFF + -DUSE_NUMPY=$(usex numpy) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENCV=$(usex opencv) + -DUSE_OPENMP=$(usex openmp) + -DUSE_ROCM=$(usex rocm) + -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 + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_GLOO=ON + -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_SLEEF=ON + -DUSE_METAL=OFF + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + ) + + if use mkl; then + mycmakeargs+=(-DBLAS=MKL) + elif use openblas; then + mycmakeargs+=(-DBLAS=OpenBLAS) + else + mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=) + fi + + if use cuda; then + addpredict "/dev/nvidiactl" # bug 867706 + addpredict "/dev/char" + addpredict "/proc/self/task" # bug 926116 + + mycmakeargs+=( + -DUSE_CUDNN=ON + -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" + -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + ) + elif use rocm; then + export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)" + + mycmakeargs+=( + -DUSE_NCCL=ON + -DUSE_SYSTEM_NCCL=ON + ) + fi + + if use onednn; then + mycmakeargs+=( + -DUSE_MKLDNN=ON + -DMKLDNN_FOUND=ON + -DMKLDNN_LIBRARIES=dnnl + -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl" + ) + fi + + cmake_src_configure + + # do not rerun cmake and the build process in src_install + sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die +} + +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 + cp torch/version.py python/torch/ || die + python_domodule python/caffe2 + python_domodule python/torch + ln -s ../../../../../include/torch \ + "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269 +} diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest index f20f4c6d1212..9185a97a9e1c 100644 --- a/sci-libs/netcdf-cxx/Manifest +++ b/sci-libs/netcdf-cxx/Manifest @@ -3,6 +3,6 @@ DIST netcdf-cxx-4.2.tar.gz 703482 BLAKE2B a6727b7305204d2b53e6ee951c8165b03cd07f DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22 DIST netcdf-cxx4-4.3.1.tar.gz 598335 BLAKE2B e8272d9bd74cf9b814303a5b208be20228149533a9cc78cc1ef460f2cfb0086c7187afba325ab9a7b3d071e0fb9160d3b057e3bee68b679d9f504ccfecb016d8 SHA512 f5d9d26fb9f57430d0d681a9c7396bb0f03ed6446ac6fed51058dcc43690c02565da3f729f98b268b0bd923ca8b5b3cfa8340aca6a4f18f512c0c320ea20703f EBUILD netcdf-cxx-4.2-r301.ebuild 643 BLAKE2B 6404325bb919f1543755e8fdf53ef6a448a8af1e2b0c704756e6927d7ef16ef7d7fc2f697975f859f5d21fb449f54389dd75a3bd18ecd58670e9bf82849d3b6b SHA512 a1bee6457c58f7711149fa1a7be41490dd0dea2ca113b453f1618324702bd5bda9d87590e33ccf062022065acb45952d806ec6f1425d0d777d749c17165422fa -EBUILD netcdf-cxx-4.3.1-r1.ebuild 765 BLAKE2B 04735c8b41427eca274b632fa6e7901fd01e3b3729e389a9eb26aefbda51167b9ba4b8df529d2ddbc7448b78abd8c311c03641b0edbc8b23bab3ab5cbfdcaac1 SHA512 d9086eb4e32421a093c8e04535f97e79441555ad83c85850fcb932fbaeecf3fc56f9b828bda3b81f11682989714dfbe33a5c83b0041558d40f1b267d76052256 +EBUILD netcdf-cxx-4.3.1-r1.ebuild 764 BLAKE2B 1d8124b887662da77418b82287f09432b6fc79ef607c151e54643453e6c5d7471dd8283de8356a9d37c5b5546b5e2cb3bc183a559e729e946a662169058cdec1 SHA512 ad8cbe08c7aa72e1e438a60b4eb28cddc8b1cc07ac2368a907cf76139caa0bee5cfce65c1c09c6d16bc29d4690f16cfee3d2e5597f75973ce0ae45ad406531d7 EBUILD netcdf-cxx-4.3.1.ebuild 812 BLAKE2B c5219c46f45b12533ceff2fcda6bf1cec66638f776a088dd2b2bf1e66d7c930b91d5c0654ace11736aad50a6376ca7d0c1b9a59b55fdbb0d3719a0065c9a1270 SHA512 8b9064c4ce16ef2f75e9a5c26d1dfb4e5376f3a9de6c4de01644a723e10b142cbfbcc54e3533cc9ba60b8fb4c99af5f3bbd07dd257dafdf251af4106b3d39614 MISC metadata.xml 839 BLAKE2B 2cda1c652d7d7e83ebb67f70db48dc7b9a11908813739a646cb5798dd232f8eff5754c10adb0fbd206be6280fd599aacd6f63181b658623d55e17d6e73b0f4f0 SHA512 7e8f0b88ef5ad2cba94369ad26f2b27a648831b6433e05d127e4bc72ccfe6afc5eba7695f5c3cabc426a9913e599ce9b0455a087f9d606471cd351c8be5190d6 diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild index 1a1079b72566..dddb7002fbd6 100644 --- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild +++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.unidata.ucar.edu/netcdf-cxx/${PV}/${PN}4-${PV}.tar.gz LICENSE="UCAR-Unidata" SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples" # 6 out of 9 fail, reported upstream #RESTRICT="test" diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index 593b5574ce95..8983eee5da5d 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -6,5 +6,5 @@ DIST onnx-1.15.0.tar.gz 12360484 BLAKE2B 4d35b82c128a69124b9bfcb3e56b3d584b7451a DIST onnx-1.16.0.tar.gz 12428161 BLAKE2B b0d16212c527078fcbe46af8efaf8bfccb0a22825cfee3c88728314599bc90f5b43ae407cc9ec10300ed19367dff769a5d6ba29d2faa61fd8e27029e2d64e83a SHA512 ef641447d8d6c4ed9f083793fe14a8568d6aa7b9b7e7b859a4082e9b892acd801230da2027d097ceaa0d68bbd37b2422b89bb7d1d55d5c3b5955c0f9c7c657c5 EBUILD onnx-1.14.1-r2.ebuild 1287 BLAKE2B 981384a06007a6e1d0bbe602a6ab46cf856a5f6c07223599fbebfd23f2dfef4ded766367580b11e635421b0fb94ca0574fde853ee6dadb4d5f50e978a1eec1b9 SHA512 98cd76cee92bebe93192cce202fd7caf4cbb42d0afcf312acbdcb57992ccc1a7efe1f9cc3d1dc9df9cdc657b5c1ae4bfb2d6e5f86624f4bb6b5853d6a19ec952 EBUILD onnx-1.15.0-r3.ebuild 1281 BLAKE2B 05efb8be8849ab0563b15febc148e04e44e3a350d299e2bee75efc84ccb3538811db1eb4c23102ba72fbfafcdd1148733546fc4dfff49b49f9c2421df3d07aa4 SHA512 6ee2ae88935b7b583490b29c7a58239751aab008e6b928803de259691e66c73b903b39ccda0ade1187eb8fd53bb5ad1facbcc576992cefdf1e54ec9e957f4021 -EBUILD onnx-1.16.0.ebuild 1290 BLAKE2B b8d5a45eed3a10fe5f360939a1998a27d11feef8486088d174918170c220bd7ab3090793f8fb1ed1f36b2c3a4c54c2d66845ba8bf8842802d052132ef7060e75 SHA512 23dbe97165ff9bea6898c3fec881620ee116490bd5ad8dbe7255f5ca038a1dcb7317d8b1e56dcf4c3c9dfb6b141fdbd16c3dc0426c48306d6c9d6d6fe003beb3 -MISC metadata.xml 322 BLAKE2B a78b6feffba2cf354154448a0e0cef5e866ec51ff0158939e7a5be1f3c4cb9bb3b29ae88ae06540627946fc3e0f6e9a63ef4d8951385e840a7a87ada99e1d50a SHA512 9d81e8e43822232c8c8cf690b6bdb9939f04adeb9230f8225a5b0b10083f9555304768901c46cc5d29c41038397bbb3b12e0111c3d0443f4c0003e99b99fc50f +EBUILD onnx-1.16.0.ebuild 1452 BLAKE2B a3192ee85e6f19a2edaea652a3c286c5861b9610c874e0ed4f4c0d73e7754ef64e34201058b33e9517fc67db3204a9b9f2fbf59892aed44df5b1ee51b05184f5 SHA512 bb415dc0b8926a1388ebf0033af8d3f3a7ea56c004606e8754c3a237b2abcbbb84c2e406966e268c82dd849dbc568e3b5c9e9d50886f5c08b2b31cdd5127d2b4 +MISC metadata.xml 404 BLAKE2B 363f1790f0dd2eace0368d7eb1875c166ba6dd0b2514232050f2f1813ccba854b4f8e58e22a329792126188f06d21bf87436c1dcc10d68b018f7abc8eb8ec3e9 SHA512 6a80de77d763a261cafee9cd69337de5282fa39772a1d2a82c3d954d29221596036346339926a124f9df9b261050d17b58d004cdd01ff2f57347379e9df2e45f diff --git a/sci-libs/onnx/metadata.xml b/sci-libs/onnx/metadata.xml index 2a58de7a87a9..e06b5c6e88c2 100644 --- a/sci-libs/onnx/metadata.xml +++ b/sci-libs/onnx/metadata.xml @@ -5,6 +5,9 @@ tupone@gentoo.org Tupone Alfredo + + Disable Static Registration + onnx/onnx diff --git a/sci-libs/onnx/onnx-1.16.0.ebuild b/sci-libs/onnx/onnx-1.16.0.ebuild index e5a6b1c71b41..498d770d736d 100644 --- a/sci-libs/onnx/onnx-1.16.0.ebuild +++ b/sci-libs/onnx/onnx-1.16.0.ebuild @@ -15,6 +15,7 @@ SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~riscv" +IUSE="disableStaticReg" RESTRICT="test" RDEPEND=" @@ -36,6 +37,7 @@ python_configure_all() -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON -DONNX_BUILD_SHARED_LIBS=ON + -DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF) ) cmake_src_configure } @@ -49,6 +51,7 @@ src_compile() { -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON -DONNX_BUILD_SHARED_LIBS=ON + -DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF) ) CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile } -- cgit v1.2.3