From 3c1648a0749c1d66b300d857e6b417c1162890da Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 27 May 2024 00:07:23 +0100 Subject: gentoo auto-resync : 27:05:2024 - 00:07:23 --- sci-libs/Manifest.gz | Bin 44678 -> 44675 bytes sci-libs/caffe2/Manifest | 6 +- sci-libs/caffe2/caffe2-2.1.2-r7.ebuild | 283 --------------------- sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch | 28 -- sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch | 188 -------------- sci-libs/caffe2/metadata.xml | 1 - sci-libs/onnx/Manifest | 8 +- sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch | 11 - sci-libs/onnx/files/onnx-1.14.1-musl.patch | 11 - sci-libs/onnx/onnx-1.14.1-r2.ebuild | 64 ----- sci-libs/onnx/onnx-1.15.0-r3.ebuild | 67 ----- sci-libs/onnx/onnx-1.16.0-r1.ebuild | 71 ++++++ sci-libs/onnx/onnx-1.16.0.ebuild | 70 ----- sci-libs/pytorch/Manifest | 2 - sci-libs/pytorch/pytorch-2.1.2-r1.ebuild | 66 ----- 15 files changed, 73 insertions(+), 803 deletions(-) delete mode 100644 sci-libs/caffe2/caffe2-2.1.2-r7.ebuild delete mode 100644 sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch delete mode 100644 sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch delete mode 100644 sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch delete mode 100644 sci-libs/onnx/files/onnx-1.14.1-musl.patch delete mode 100644 sci-libs/onnx/onnx-1.14.1-r2.ebuild delete mode 100644 sci-libs/onnx/onnx-1.15.0-r3.ebuild create mode 100644 sci-libs/onnx/onnx-1.16.0-r1.ebuild delete mode 100644 sci-libs/onnx/onnx-1.16.0.ebuild delete mode 100644 sci-libs/pytorch/pytorch-2.1.2-r1.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 95ecaf55bc08..fff73b150204 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 8bc33101739b..09293913770e 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -3,8 +3,6 @@ AUX caffe2-1.13.0-install-dirs.patch 5737 BLAKE2B 10b10e3a29976344c7596e1c4e7a60 AUX caffe2-1.13.1-tensorpipe.patch 374 BLAKE2B 46d45aae88f99c213f0da039bad5aa0c470a6c505ed1d28088ecb8dd445547e52a6d2c087c52c15b20da31808cd9213c1e672880e9bf4afe9c487358b4d4cd9d SHA512 d7315408b3ad4630715c18fff853b07e589ae78f5fcc8eef7f8791202fca459a3b23481856a50a5d432aec26482eb33adf37ba0a37d45f719ceb29081449345d AUX caffe2-2.0.0-cudnn_include_fix.patch 526 BLAKE2B 63959783a94bfa2b02f78e36e754ef6c54d9f3dfb0bfdedd0fb9ef6553204b54b2dfb1676312689bbc3eace897d5f0441faf9af376f27c3c831c3ffcece31e5d SHA512 ff2ba61a4c69620bb1078aa7235b015a6165bc0df65e5e4ec04d4f3515f80dc865cc904d279fefbc90784b571f41d82441ce8045a27947ae7d3d52505e813b3c AUX caffe2-2.0.0-gcc13.patch 1203 BLAKE2B df55608c6019802da32809cb210b60cf0debf38e8d7a20135e92465be28d3537f2d0b52c67a61b264e241539b64fa02aa99eefb856686a9f9e3c45291b8d6a70 SHA512 59e933c60abef3ac97a1e3b2cd7a9935f9fdde4bc3ed1c2c53c729af6d7ed735ffd38cbdac08d32c668cd2751f3f871cc833883efd19732c04a0f67fbb49c41d -AUX caffe2-2.1.1-cudaExtra.patch 1336 BLAKE2B f12d29a624f9345452227076108b9ded4c6c60051f10645340e03694b53765cf1c892e9a8797748cfba1fc416d84782a265b961c9c5e7ab1b0f367192287c891 SHA512 9c394305f99e377c5eec6d271c9c80b3c45eb0ccaeb96ad21feba93bc13ae562843c0ae055d11ddee63b8e2b180dc2a0e7a44b9772b0044ac3cd94a0ee4c3d67 -AUX caffe2-2.1.1-gentoo.patch 6329 BLAKE2B c002f1605888ac79bed292cf1967eedd4d177193947dbafea8443958e498b371865a8f7548cc7e2c572d7fff69418344286071d64f4742691e943e81b73d811c SHA512 8eb2b2f89de809ff93e0deaa4bd6116f73bed55642904e689ba97e5bf21ba5754935a8d0c1f632b1f262400f0c809398524056f7691f7787c154a5b7f6f1b7b2 AUX caffe2-2.1.2-fix-openmp-link.patch 483 BLAKE2B dfe9ae0978b71449486d12f769c3c962001c138bc53b0605ed6f2215fe732356da90c5084488bc4d9f54c88aab2a426b8c935543f7ba0890783bb58da30a5cb4 SHA512 a9cee8ae2a8477a21e92bd4ef286af68efd90283593db7ed4641a826b19b4266bcab9c131c93be2b6c2f13d5cd545c766612791cf2e23cff9a731a03f3ad7648 AUX caffe2-2.1.2-fix-rpath.patch 510 BLAKE2B 6585e8089acc6e7fe69713ad04a64263ab2e9d2d5cf6d3a844dbbc917383e4b7a0688ebdfb3142e3c42108c8c14a6435f48ae4ce3adee8db338286d60ed7b503 SHA512 ede770559b487fff736aded0cf4b077d8308c2b85c5cd139150b04bcb8b72a0d78af6a2b74fbb153b75acff71df0832d8f139231d1c18558f5b5479af348e6a0 AUX caffe2-2.1.2-rocm-fix-std-cpp17.patch 3485 BLAKE2B 38f07fa876e1b628f1709dc35669ee62bbd5b00e23880800a0c430c72365799da86213ba76d344e9b46559ec1a4c98e1be6b46466bee8ebbf484976c597bb5ba SHA512 8dffee073c7744c3eba62f22b5f11d1f5db980fd7e9ac593ae44b489fe1eded532739db397f4599b8cda1b75c26e493dff81c2862056f62823570ab94a8f3389 @@ -13,10 +11,8 @@ AUX caffe2-2.2.2-musl.patch 363 BLAKE2B 9c62b8d93b430cec9d0e739802d5938933109369 AUX caffe2-2.3.0-CMakeFix.patch 519 BLAKE2B 0249b7c31cea647a0c82d94cd99fac3415cbd357aacde4d0cc0e5b936c27dc96afcbecdb9ae55ee464080603c9c71f6c995166ae7045e19e9d874dcf688b4a0a SHA512 a8c5200abf4f059a2c43a2fa0b2a639dde60cbf48f6bb461c133e02b7986e8bc9bb98c4a1c51478308ac13b886691c89debf0b762fc821cd52500f5648c3bd39 AUX caffe2-2.3.0-cudnn_include_fix.patch 587 BLAKE2B 8ffeb9080ee77b953e7a77c9bea9af8c078adf147c314e07cf40d6f9ce1c988ac201e282ffd67a29703ced5885329d44be013c54cf3ba870c009aed40e65fefc SHA512 b37427e35d8147e603331eb344a3542ed31d0b133df3c7ce10ebecec93b1d09d040f77c33f23f70e9835db10fa209c0318b89b70b3b91263655d160ed737d6f3 AUX caffe2-2.3.0-rocm-fix-std-cpp17.patch 3378 BLAKE2B 9e88fa1bf68c397c8122ea5b3504a22b3f6ef92c77dad8bd84ee03b4f75792b0e1281d8b1aa981ad1bf65060179fa08ef14e776e82abdec9147dfbb3bf37a7ae SHA512 7797a140abf736f2a4628cd727cf0c58ed39c9764b9ce3b67d17fc0c9b9965e647266c815e5322f96f807680120e25ccdbbc66b66c7c6cf84edb811330ad452c -DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747 SHA512 a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756 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 7452 BLAKE2B 6b4c14a8304ef36349f6442616bb1e2a9563596293ea507ffd1d9083fc01c251dd237db3babbdc9841273b7c31b8ac4b420e3047e6ffd128763ca9afc4b6aa16 SHA512 cfa525d40f3dfbcd4dcf7e31cb772dcd809d528981925b50239961e91ae2147723d261b71f433e5a22e73f59b0bd156a97d84b385d1d5bfffd51db9fc6db2b57 EBUILD caffe2-2.3.0-r3.ebuild 7542 BLAKE2B 6b230db4d2a033b5078e8c61e40955a0981aa3b6b06734145e4bec8f78719329a3825218045a8f57efce9bfddad7b252ee4447d82cc0637db8656d5f8178b9cc SHA512 d3861111081d26a883790e7a5097ddf77ef2e491eb4471a3cc95d25e659ad8c283c22bda5674cb09d575768da5b6a401ea5347febd4f194dbedd4196d1ac628d -MISC metadata.xml 1273 BLAKE2B 2021a10ffae1fb62699a965d4b88465200fee43adff9e22223d715d0f0623a60cb242d6b919f5835b933add1599f54c1abbbd557ecd60896a7c59742d17bf72f SHA512 a5bfe7df09355ac8b64df4970f2562eb52dfcb7c542b2b17297d20ce4958f2a2e8afe292051efb0766380c19593ce00cf7b3bb1b2b63c0ab95bd113dbd8792e5 +MISC metadata.xml 1225 BLAKE2B ab7fb0bf8b2d37ddaa1a9ecc815eb094e85465d20d3a30af081b42e0b60ade9858d0053b101ba0e7750a90cb48b5b79db9bdc2729bf66d0420732489da62fe54 SHA512 dfb58597fb4bcdd7df0fcc3f2514518e118e8fc9b1cd24868aab60c32a62ff419b8b72a7c294925eff4c8871cc8df606af7fa60bfa99901091d8195101ee1153 diff --git a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild b/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild deleted file mode 100644 index 8198f516b251..000000000000 --- a/sci-libs/caffe2/caffe2-2.1.2-r7.ebuild +++ /dev/null @@ -1,283 +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 tensorpipe xnnpack" -RESTRICT="test" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ffmpeg? ( opencv ) - mpi? ( distributed ) - tensorpipe? ( distributed ) - distributed? ( tensorpipe ) - 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-1.12.0 - =dev-libs/cudnn-frontend-0.9.2:0/8 - =dev-libs/FBGEMM-2023.11.02 ) - 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}] - ) - tensorpipe? ( 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.1.0 ) - 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.1.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}"/${PN}-2.0.0-gcc13.patch - "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch - "${FILESDIR}"/${PN}-2.1.1-cudaExtra.patch - "${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 -) - -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:ROCM_PATH /opt/rocm:ROCM_PATH /usr:" \ - -e "s:HIP_PATH \${ROCM_PATH}/hip:HIP_PATH /usr:" \ - -e "s:\${HIP_PATH}/cmake:/usr/$(get_libdir)/cmake/hip: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 tensorpipe) - -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" - - mycmakeargs+=( - -DUSE_CUDNN=ON - -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" - -DBUILD_NVFUSER=ON - -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+=( - -DBUILD_NVFUSER=ON - -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 - if use cuda || use rocm; then - mv "${ED}${S}"/nvfuser python/nvfuser || die - mv "${ED}"/usr/$(get_libdir)/nvfuser.so python/nvfuser/_C.so || die - fi - 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 - if use cuda || use rocm; then - python_domodule python/nvfuser - fi - rm -rf "${ED}${WORKDIR}" - find "${ED}" -empty -delete -} diff --git a/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch b/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch deleted file mode 100644 index f12623f2068a..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/third_party/nvfuser/CMakeLists.txt 2023-11-30 21:42:07.336946970 +0100 -+++ b/third_party/nvfuser/CMakeLists.txt 2023-11-30 21:46:35.101749250 +0100 -@@ -18,7 +18,7 @@ - set(NVFUSER_ROOT ${PROJECT_SOURCE_DIR}) - set(NVFUSER_SRCS_DIR "${NVFUSER_ROOT}/csrc") - set(TORCH_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../..") --set(TORCH_INSTALL_LIB_DIR ${TORCH_ROOT}/torch/lib) -+set(TORCH_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR}) - - # --- build nvfuser_codegen library - -@@ -218,7 +218,7 @@ - message(STATUS "somehow this is happening") - set_target_properties(${NVFUSER} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) - endif() -- install(TARGETS ${NVFUSER} EXPORT NvfuserTargets DESTINATION ${TORCH_ROOT}/nvfuser/) -+ install(TARGETS ${NVFUSER} EXPORT NvfuserTargets DESTINATION "${TORCH_INSTALL_LIB_DIR}") - - # install nvfuser python files - install(DIRECTORY "${NVFUSER_ROOT}/python/" ---- a/functorch/CMakeLists.txt 2023-11-30 20:30:45.805209036 +0100 -+++ b/functorch/CMakeLists.txt 2023-11-30 20:31:13.284766157 +0100 -@@ -35,4 +35,4 @@ - if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "") - set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) - endif() --install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}") -+install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch deleted file mode 100644 index 056ac9afe5b3..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch +++ /dev/null @@ -1,188 +0,0 @@ ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -487,7 +487,7 @@ endif() - list(APPEND Caffe2_DEPENDENCY_LIBS cpuinfo) - - # ---[ QNNPACK --if(USE_QNNPACK) -+if(FALSE) - set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") - - if(NOT DEFINED QNNPACK_SOURCE_DIR) -@@ -543,7 +543,7 @@ if(USE_QNNPACK) - endif() - - # ---[ Caffe2 Int8 operators (enabled by USE_QNNPACK) depend on gemmlowp and neon2sse headers --if(USE_QNNPACK) -+if(FALSE) - set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") - include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") - include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/neon2sse") -@@ -803,7 +803,7 @@ - endif() - - # ---[ FBGEMM --if(USE_FBGEMM) -+if(FALSE) - set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") - if(NOT DEFINED FBGEMM_SOURCE_DIR) - set(FBGEMM_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/fbgemm" CACHE STRING "FBGEMM source directory") -@@ -848,6 +848,7 @@ - endif() - - if(USE_FBGEMM) -+ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) - caffe2_update_option(USE_FBGEMM ON) - else() - caffe2_update_option(USE_FBGEMM OFF) -@@ -1552,7 +1553,6 @@ - set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) - endif() - endif() -- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL) - - add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) - if(NOT USE_SYSTEM_ONNX) -@@ -1831,7 +1831,6 @@ - # - set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) - set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) --add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) - - # Disable compiler feature checks for `fmt`. - # -@@ -1840,9 +1839,7 @@ - # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know - # `fmt` is compatible with a superset of the compilers that PyTorch is, it - # shouldn't be too bad to just disable the checks. --set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "") - --list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only) - set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) - - # ---[ Kineto ---- a/c10/CMakeLists.txt -+++ b/c10/CMakeLists.txt -@@ -87,7 +87,7 @@ - if(${USE_GLOG}) - target_link_libraries(c10 PUBLIC glog::glog) - endif() --target_link_libraries(c10 PRIVATE fmt::fmt-header-only) -+target_link_libraries(c10 PRIVATE fmt) - - find_package(Backtrace) - if(Backtrace_FOUND) ---- a/torch/CMakeLists.txt -+++ b/torch/CMakeLists.txt -@@ -63,15 +63,9 @@ - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/aten/src - ${CMAKE_BINARY_DIR}/caffe2/aten/src -- ${CMAKE_BINARY_DIR}/third_party -- ${CMAKE_BINARY_DIR}/third_party/onnx - -- ${TORCH_ROOT}/third_party/valgrind-headers - -- ${TORCH_ROOT}/third_party/gloo -- ${TORCH_ROOT}/third_party/onnx -- ${TORCH_ROOT}/third_party/flatbuffers/include -- ${TORCH_ROOT}/third_party/kineto/libkineto/include -+ /usr/include/kineto - - ${TORCH_SRC_DIR}/csrc - ${TORCH_SRC_DIR}/csrc/api/include -@@ -84,7 +78,6 @@ - python::python - pybind::pybind11 - shm -- fmt::fmt-header-only - ATEN_CPU_FILES_GEN_LIB) - - if(USE_ASAN AND TARGET Sanitizer::address) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -812,12 +812,11 @@ - - # ---[ Build flags - if(NOT MSVC) -- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") -+ string(APPEND CMAKE_CXX_FLAGS " -fPIC") - # Eigen fails to build with some versions, so convert this to a warning - # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 - string(APPEND CMAKE_CXX_FLAGS " -Wall") - string(APPEND CMAKE_CXX_FLAGS " -Wextra") -- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS) -@@ -917,8 +916,6 @@ - string(APPEND CMAKE_LINKER_FLAGS_DEBUG " -fno-omit-frame-pointer -O0") - append_cxx_flag_if_supported("-fno-math-errno" CMAKE_CXX_FLAGS) - append_cxx_flag_if_supported("-fno-trapping-math" CMAKE_CXX_FLAGS) -- append_cxx_flag_if_supported("-Werror=format" CMAKE_CXX_FLAGS) -- append_cxx_flag_if_supported("-Werror=cast-function-type" CMAKE_CXX_FLAGS) - else() - # skip unwanted includes from windows.h - add_compile_definitions(WIN32_LEAN_AND_MEAN) ---- a/cmake/public/utils.cmake -+++ b/cmake/public/utils.cmake -@@ -492,8 +492,6 @@ - endif() - - # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression) -- target_compile_options(${libname} PRIVATE -- $<$,$,$>>:-O2>) - - endfunction() - ---- a/cmake/Codegen.cmake -+++ b/cmake/Codegen.cmake -@@ -57,7 +57,7 @@ - if(MSVC) - set(OPT_FLAG "/fp:strict ") - else(MSVC) -- set(OPT_FLAG "-O3 ") -+ set(OPT_FLAG " ") - if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") - set(OPT_FLAG " ") - endif() ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -107,7 +107,7 @@ - # Note: the folders that are being commented out have not been properly - # addressed yet. - --if(NOT MSVC AND USE_XNNPACK) -+if(FALSE) - if(NOT TARGET fxdiv) - set(FXDIV_BUILD_TESTS OFF CACHE BOOL "") - set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") -@@ -1023,7 +1025,6 @@ - endif() - - if(NOT MSVC AND USE_XNNPACK) -- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) - endif() - - # ========================================================== -@@ -1143,8 +1146,7 @@ - target_include_directories(torch_cpu PRIVATE - ${TORCH_ROOT}/third_party/miniz-2.1.0) - --target_include_directories(torch_cpu PRIVATE -- ${TORCH_ROOT}/third_party/kineto/libkineto/include) -+target_include_directories(torch_cpu PRIVATE /usr/include/kineto) - - if(USE_KINETO) - target_include_directories(torch_cpu PRIVATE ---- a/cmake/External/nnpack.cmake -+++ b/cmake/External/nnpack.cmake -@@ -58,7 +58,7 @@ - set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory") - set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory") - -- if(NOT TARGET nnpack) -+ if(FALSE) - if(NOT USE_SYSTEM_PTHREADPOOL AND USE_INTERNAL_PTHREADPOOL_IMPL) - set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "") - endif() diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml index 43aee37ffc47..e99253402e7a 100644 --- a/sci-libs/caffe2/metadata.xml +++ b/sci-libs/caffe2/metadata.xml @@ -20,7 +20,6 @@ Use OpenMP for parallel code Use QNNPACK Enable ROCm gpu computing support - Use tensorpipe Use XNNPACK diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index 8983eee5da5d..6978beae5e2f 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -1,10 +1,4 @@ -AUX onnx-1.14.0-cxx_14.patch 390 BLAKE2B adae69890eec31f16de501ef3b2fc88e5dff2d0fb561d470955daa6830e7a818d35c80789cbbedd874e11776a59f07fafe9576ee11e6a0fb45fc8635fb6ef81f SHA512 7a89e24067909b1106753bd2853fc51da3d8a567c452d72d53ea321c13c78c46dbca356e3fbe78d98e301a360b93090644861c3a0d8ab6022f9666c0ee788be1 -AUX onnx-1.14.1-musl.patch 518 BLAKE2B 540d5c81d43a515ca6c4598057b80ad2157ba528dd976306175ff68e9fb0e8d05d1a92a2d6c706470017750f86ae48f30c91ae21e44627679e7b3ec8cf6e1a43 SHA512 6e198ee14da82c0fe0512d587de5da0831fbc40ac546407dc27b2ed5c75e9aa87bb0d732c6ebd6099f26ac926ad7afaed131a914352e58f9956697ab55cbf933 AUX onnx-1.15.0-hidden.patch 511 BLAKE2B 857a4ff9597a25430e2236c2d9de47c1203e630a4adfe8e4cdb72ddfb928f0327e2a625ad91e936e4d3f71bc4aa135bbd15abcf348958238075d356d47d3291b SHA512 a4dbcbae79af1ef1edc8ec8aa27eb0303c1a52baf7db74e70f2d1e6a35db7d5ed2205f7f10f34fdcd3ac536b029edf749b9eb8f7926ac2b620ac7a4b59884182 -DIST onnx-1.14.1.tar.gz 11570627 BLAKE2B df478219b5d557ad7e0717377996eefc02baa88a89d9681b17e00670e42fa3c8e47db0f5c5fdfab682fa7d80032559da8276c5106a91a7599d190427e2b6e4a8 SHA512 f846fffb286c4aeadc01462f220515f0a5c2ce1cbec849da7092a08c2676f8308af7315318a2866e9182f9aed719984ef95a9ddc69ffe0e62e40664395df5efd -DIST onnx-1.15.0.tar.gz 12360484 BLAKE2B 4d35b82c128a69124b9bfcb3e56b3d584b7451ae739a91039e201dd485efa3e90e34e6cf135993317622f8f524160a38556231b2b0561e93d8cd0487abf35c1b SHA512 b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd 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 1452 BLAKE2B a3192ee85e6f19a2edaea652a3c286c5861b9610c874e0ed4f4c0d73e7754ef64e34201058b33e9517fc67db3204a9b9f2fbf59892aed44df5b1ee51b05184f5 SHA512 bb415dc0b8926a1388ebf0033af8d3f3a7ea56c004606e8754c3a237b2abcbbb84c2e406966e268c82dd849dbc568e3b5c9e9d50886f5c08b2b31cdd5127d2b4 +EBUILD onnx-1.16.0-r1.ebuild 1472 BLAKE2B 9ad73dba0ab42f4befaea9e49b497fae33b642ee350e3612bd830e4ab9e30452a82905f8fd9cb6bfde28663b2c173b1b8cea93e38cde264d99d259bd7fb82868 SHA512 3e7f0caae489f2cd95db713f5d30de754069679dbb8fdd7d1ce3ae7d1a031cb041b507acaeb1dd1322fc45405ef0588a1aad13f140b5ba1b472035b71824296f MISC metadata.xml 404 BLAKE2B 363f1790f0dd2eace0368d7eb1875c166ba6dd0b2514232050f2f1813ccba854b4f8e58e22a329792126188f06d21bf87436c1dcc10d68b018f7abc8eb8ec3e9 SHA512 6a80de77d763a261cafee9cd69337de5282fa39772a1d2a82c3d954d29221596036346339926a124f9df9b261050d17b58d004cdd01ff2f57347379e9df2e45f diff --git a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch b/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch deleted file mode 100644 index 239e0bd3a56a..000000000000 --- a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2023-09-01 12:19:40.772172388 +0200 -+++ b/CMakeLists.txt 2023-09-01 12:19:53.422188861 +0200 -@@ -58,7 +58,7 @@ - # Required to use /std:c++17 or higher on Windows - # For other platforms, set C++11 as standard for the whole project - if(NOT MSVC) -- set(CMAKE_CXX_STANDARD 11) -+ set(CMAKE_CXX_STANDARD 14) - else() - string(APPEND CMAKE_CXX_FLAGS " /std:c++17") - endif() diff --git a/sci-libs/onnx/files/onnx-1.14.1-musl.patch b/sci-libs/onnx/files/onnx-1.14.1-musl.patch deleted file mode 100644 index 04748ed67e6a..000000000000 --- a/sci-libs/onnx/files/onnx-1.14.1-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/onnx/checker.cc 2024-02-18 15:30:03.316320035 +0100 -+++ b/onnx/checker.cc 2024-02-18 15:31:05.715473732 +0100 -@@ -184,7 +184,7 @@ - } - std::string data_path = path_join(ctx.get_model_dir(), relative_path); - // use stat64 to check whether the file exists --#if defined(__APPLE__) || defined(__wasm__) -+#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__) - struct stat buffer; // APPLE does not have stat64 - if (stat((data_path).c_str(), &buffer) != 0) { - #else diff --git a/sci-libs/onnx/onnx-1.14.1-r2.ebuild b/sci-libs/onnx/onnx-1.14.1-r2.ebuild deleted file mode 100644 index e6ecbfd239bc..000000000000 --- a/sci-libs/onnx/onnx-1.14.1-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{9..12} ) -inherit distutils-r1 cmake - -DESCRIPTION="Open Neural Network Exchange (ONNX)" -HOMEPAGE="https://github.com/onnx/onnx" -SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="python" -RESTRICT="test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - python? ( - ${PYTHON_DEPS} - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ) - dev-libs/protobuf:= -" -DEPEND="${RDEPEND}" - -BDEPEND="python? ( - ${DISTUTILS_DEPS} -)" - -PATCHES=( - "${FILESDIR}"/${PN}-1.14.0-cxx_14.patch - "${FILESDIR}"/${P}-musl.patch -) - -src_prepare() { - cmake_src_prepare - use python && distutils-r1_src_prepare -} - -src_configure() { - mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - -DONNX_USE_LITE_PROTO=ON - ) - cmake_src_configure - use python && distutils-r1_src_configure -} - -src_compile() { - cmake_src_compile - use python && CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile -} - -src_install() { - cmake_src_install - use python && distutils-r1_src_install -} diff --git a/sci-libs/onnx/onnx-1.15.0-r3.ebuild b/sci-libs/onnx/onnx-1.15.0-r3.ebuild deleted file mode 100644 index cd9731d69130..000000000000 --- a/sci-libs/onnx/onnx-1.15.0-r3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{9..12} ) -inherit distutils-r1 cmake - -DESCRIPTION="Open Neural Network Exchange (ONNX)" -HOMEPAGE="https://github.com/onnx/onnx" -SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -RESTRICT="test" - -RDEPEND=" - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-libs/protobuf:= -" -DEPEND="${RDEPEND}" - -src_prepare() { - eapply "${FILESDIR}"/${P}-hidden.patch - cmake_src_prepare - distutils-r1_src_prepare -} - -python_configure_all() -{ - mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - -DONNX_USE_LITE_PROTO=ON - -DONNX_BUILD_SHARED_LIBS=ON - ) - cmake_src_configure -} - -src_configure() { - distutils-r1_src_configure -} - -src_compile() { - mycmakeargs=( - -DONNX_USE_PROTOBUF_SHARED_LIBS=ON - -DONNX_USE_LITE_PROTO=ON - -DONNX_BUILD_SHARED_LIBS=ON - ) - CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile -} - -python_compile_all() { - cmake_src_compile -} - -python_install_all() { - cmake_src_install - distutils-r1_python_install_all -} - -src_install() { - distutils-r1_src_install -} diff --git a/sci-libs/onnx/onnx-1.16.0-r1.ebuild b/sci-libs/onnx/onnx-1.16.0-r1.ebuild new file mode 100644 index 000000000000..16f073d9b4d3 --- /dev/null +++ b/sci-libs/onnx/onnx-1.16.0-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 cmake + +DESCRIPTION="Open Neural Network Exchange (ONNX)" +HOMEPAGE="https://github.com/onnx/onnx" +SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="disableStaticReg" +RESTRICT="test" + +RDEPEND=" + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-libs/protobuf:= +" +DEPEND="${RDEPEND} + dev-cpp/abseil-cpp" + +src_prepare() { + eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch + cmake_src_prepare + distutils-r1_src_prepare +} + +python_configure_all() +{ + mycmakeargs=( + -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 +} + +src_configure() { + distutils-r1_src_configure +} + +src_compile() { + mycmakeargs=( + -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 +} + +python_compile_all() { + cmake_src_compile +} + +python_install_all() { + cmake_src_install + distutils-r1_python_install_all +} + +src_install() { + distutils-r1_src_install +} diff --git a/sci-libs/onnx/onnx-1.16.0.ebuild b/sci-libs/onnx/onnx-1.16.0.ebuild deleted file mode 100644 index 498d770d736d..000000000000 --- a/sci-libs/onnx/onnx-1.16.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 cmake - -DESCRIPTION="Open Neural Network Exchange (ONNX)" -HOMEPAGE="https://github.com/onnx/onnx" -SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="disableStaticReg" -RESTRICT="test" - -RDEPEND=" - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-libs/protobuf:= -" -DEPEND="${RDEPEND}" - -src_prepare() { - eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch - cmake_src_prepare - distutils-r1_src_prepare -} - -python_configure_all() -{ - mycmakeargs=( - -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 -} - -src_configure() { - distutils-r1_src_configure -} - -src_compile() { - mycmakeargs=( - -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 -} - -python_compile_all() { - cmake_src_compile -} - -python_install_all() { - cmake_src_install - distutils-r1_python_install_all -} - -src_install() { - distutils-r1_src_install -} diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 7d8a57731568..515a626a7f69 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -5,10 +5,8 @@ AUX pytorch-2.0.0-global-dlopen.patch 834 BLAKE2B da3ddd29124ab345e50acd4b42cb31 AUX pytorch-2.1.1-dontbuildagain.patch 443 BLAKE2B 67cc940ae5be4d3a0a5ef6670a72de4f3419582b59bb7e905d4ee704c928c353f1ef03a446ac97f0718d24e5a88fc656c8e58e26f869c6eeef5d21b918308f36 SHA512 4acf9dfca8e998a5ec1f6eebb7ffd5833f065dd995ef735c50ce34fb2553bbacc974c13eeaf07962d00de0f795fd4366a1866d1bb834ed93098217400db9dc6c AUX pytorch-2.1.1-emptyso.patch 527 BLAKE2B 104352b254b1f6a2e7b842265f9796d93c7fb23d4681961aad53ebcea8a7068a2ea9799d466555fa00db52db0136cb74d87853835e25f678c5ba641f8a76b8a0 SHA512 35aae74a0c95e9967909756af5c486e4c3555536016c2d4a37b9048e503c70f490cbf75c1d7814adcbbfeb3ba08a1e8ffac5507d8c964b28c0452f6eab03ca5b AUX pytorch-2.2.1-emptyso.patch 464 BLAKE2B 8c93245f36218a63a910ddf41e1181c83306485ae788cc47ad191641dfed13b2f0ce8b492c9e377279a2ee8ed83c2aaac25e1ba8b4cad3d5a07c7bbc95d60063 SHA512 1f5cbd5937d20411a74812347a2a02111d80fcc73453717eb136d8e3ffc94f839234713b77c2c89b07f87404a132fd0a1d345666df8d6a3ba01284cc0b752fc2 -DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747 SHA512 a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756 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 pytorch-2.1.2-r1.ebuild 1616 BLAKE2B 5dc0bf21d5dde0c7f47afa6502ac550e84679f22a7030749e83e9ee145d96d4cc3a2779a063613674df43b6f186a6c09bdbead2bed10b564694913bb492717da SHA512 0936ee5f59dac44a9547be6bc3a20706f565016f7b6965de4d5b8f73c9e533b788851f8a5260a633ac0dec90d16f12f3e3212620336986ee10fe42645381f27c EBUILD pytorch-2.2.2.ebuild 1616 BLAKE2B 3817dd668463c3393fc6227809644cc7409cdcb099b009571dde0760f67bcf0bb36da6d8c24e1d99be57899db9d6fb57c34e07ac63248f471ff780d2f8164b65 SHA512 97530019b0f973fad14bcfc878669f4f8a1de3f4b2d65a8909a53d3ca32b0ba099a7ffccb9317eeb8d7d8e9bae1495d36dec3896f1f54ee260ad6af89796c86c EBUILD pytorch-2.3.0.ebuild 1616 BLAKE2B 3817dd668463c3393fc6227809644cc7409cdcb099b009571dde0760f67bcf0bb36da6d8c24e1d99be57899db9d6fb57c34e07ac63248f471ff780d2f8164b65 SHA512 97530019b0f973fad14bcfc878669f4f8a1de3f4b2d65a8909a53d3ca32b0ba099a7ffccb9317eeb8d7d8e9bae1495d36dec3896f1f54ee260ad6af89796c86c MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 diff --git a/sci-libs/pytorch/pytorch-2.1.2-r1.ebuild b/sci-libs/pytorch/pytorch-2.1.2-r1.ebuild deleted file mode 100644 index 40a5e8ab3df1..000000000000 --- a/sci-libs/pytorch/pytorch-2.1.2-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_EXT=1 -inherit distutils-r1 prefix - -DESCRIPTION="Tensors and Dynamic neural networks in Python" -HOMEPAGE="https://pytorch.org/" -SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} -RDEPEND=" - ${PYTHON_DEPS} - ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/sympy[${PYTHON_USEDEP}] - ') -" -DEPEND="${RDEPEND} - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" - -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-2.1.1-dontbuildagain.patch \ - "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ - "${FILESDIR}"/${PN}-2.0.0-global-dlopen.patch \ - "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ - "${FILESDIR}"/${PN}-1.13.0-setup.patch \ - "${FILESDIR}"/${PN}-2.1.1-emptyso.patch \ - - # Set build dir for pytorch's setup - sed -i \ - -e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \ - tools/setup_helpers/env.py \ - || die - distutils-r1_src_prepare - - hprefixify tools/setup_helpers/env.py -} - -python_compile() { - PYTORCH_BUILD_VERSION=${PV} \ - PYTORCH_BUILD_NUMBER=0 \ - USE_SYSTEM_LIBS=ON \ - CMAKE_BUILD_DIR="${BUILD_DIR}" \ - distutils-r1_python_compile develop sdist -} - -python_install() { - USE_SYSTEM_LIBS=ON distutils-r1_python_install -} -- cgit v1.2.3