diff options
Diffstat (limited to 'sci-libs')
28 files changed, 592 insertions, 521 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 3999e81bbff8..2b3f54c7c7c1 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 704de9050f3e..573a9f8b161c 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -7,9 +7,12 @@ AUX caffe2-2.5.1-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8f AUX caffe2-2.5.1-newfix-functorch-install.patch 441 BLAKE2B 0caa9e43432aecba83e3ae1cc2974d8eeb9262c8547bd1a72b0651b80a5057adb0d2bbbd2f77b773fe1036bd933dadb9f4a40e886e363f5d0a961ace69e6d16a SHA512 b8b9262db9e76768e8a114857d9bfcae67528568b5e3b90a0330dc246329439da56600689a289e9bb8aee06bd5a9708bdc2b49f79abc139aaec2778b6d68458b AUX caffe2-2.5.1-unbundle_fmt.patch 499 BLAKE2B 06550f8e7ae3a932a585f8abe7653ac0b574d9ce1160c190a39f96b7d76e3a9e7a4e62b9e5e967e5884d0e38668f60af7737ea3c715d718deb7a634de98ccebd SHA512 afcb5f1123cbe5eeebdb2c5e312e37956dbc33a926cf379f531896f2c75fbb4b4dfa2c9d276a98bbad51bc587886bb572c3221be06e5116443c8ab44e1d12da5 AUX caffe2-2.5.1-unbundle_kineto.patch 830 BLAKE2B 80c9ebc30d0ca3b964141a5d9a7cb3662e6dc8472454ceabc2725f47277211cd495c4146dc9c2046cc5c5505909cf4e30c780685fceebdb05319aba5c4366346 SHA512 9645b11b5395f7a4626f17edae22c718c73d2e2f3de56e98653932a3c66f417942d54fd1dadc99112337c11513ac707a96d0caac4bf3d100db8f7079609b9b68 +AUX caffe2-2.6.0-gentoo.patch 6698 BLAKE2B 58c46bedcc71ef25ab3e70efbea98e2cd4f5c068deb289ae95ba985745edcacb258bcf5cf093f44ff60606b3f6dcd1f75c9463ee225dec5e79675d0f78196e05 SHA512 b835e24e903f4d4aeaa4c1c8611bdd3896e36631c163da4154201676d7c5236e6eb7d80e0f81700f47b5f5859ced4c7ec0bdfbef6646c6ccc0f982f0d893fe14 DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289 +DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0 EBUILD caffe2-2.4.1-r4.ebuild 8557 BLAKE2B 2cefd7d0c818fb431b3eb6bc2be0a1b225790271b1108169256f8dccac99707fac3d36dc98b7e19a688c66053627d0a222d67e7f65eb6a600ed251677df5490a SHA512 ded17bc1e912f4691bfeee75c66676d331d03c21fe9c9c7416c874ef435e624bdc6109c128f0b5dbe9a5a5be81e648767c6020cd570b94e74f47061e5839f9b3 -EBUILD caffe2-2.5.1-r7.ebuild 8710 BLAKE2B 425e59df62e884643f9ea7024f942b6fd42948d4fb9d8e446dbba3c920d6f8efad2e78bd7a7ff54c04b08483dcb00572596a848f36d22dbdb0e1c6723e05cfec SHA512 3f056ebc8db1501e210f96a075286b788916de89099b3f2ded0e124220848dc6268ba5f1702e81b0c373f944ec53e0494ce862940b0bfa76925ef7ef55d8b678 +EBUILD caffe2-2.5.1-r8.ebuild 8709 BLAKE2B bc51fd52e4cc86d50c1793a592bb1b5a38466f0332c7c9c0010eb051e42db694049237fe9b5dabdfa6f179437708a3cca7cc45fe79991828044698484cdfc237 SHA512 9576827a35e5b380b7142dd8cb7ffe4a85aa30693011425c999790919865e541eac41fd481337019af584b07e21397e0095f576197185940c59a054cfa5ef216 +EBUILD caffe2-2.6.0.ebuild 8745 BLAKE2B 0880979760a4c2ea297bdad4a130bbe706dc74780ddada5d93a78f9fd51634e2fe745caf8ef395e2fb223b1c0de4c647669bab727de7482ad1f80817f7f0c771 SHA512 e93d9a21d7ac83e97e934d3b91c9f62fffbea3eb19ae26a154d9375853a567d0cf7f98f5586b01784bef9f9356c6ec00f4904c14e42d6b7e60b361ae5d3c68eb MISC metadata.xml 1081 BLAKE2B 57800165612fd555263cab4cf0bb0521acd7d41f0023da501a50ccc5a479d25ad7087661a6eec500333c3cf9cc3a85d7be8e9385869c14d92f351d8d9df68556 SHA512 71cc785a5b1688b6a0ac971d31d5fa85bef86966aa80009c34e97caa385c81a7c2fb64ae34d0a39c21548d8238efd008da24bd838a47886bfa3f0d952246b76e diff --git a/sci-libs/caffe2/caffe2-2.5.1-r7.ebuild b/sci-libs/caffe2/caffe2-2.5.1-r8.ebuild index 85a3c940b097..0e476ce00275 100644 --- a/sci-libs/caffe2/caffe2-2.5.1-r7.ebuild +++ b/sci-libs/caffe2/caffe2-2.5.1-r8.ebuild @@ -90,7 +90,7 @@ RDEPEND=" sci-libs/tensorpipe[cuda?] dev-cpp/cpp-httplib ) - xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 ) + xnnpack? ( ~sci-libs/XNNPACK-2024.02.29 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) " diff --git a/sci-libs/caffe2/caffe2-2.6.0.ebuild b/sci-libs/caffe2/caffe2-2.6.0.ebuild new file mode 100644 index 000000000000..56dbe5d03370 --- /dev/null +++ b/sci-libs/caffe2/caffe2-2.6.0.ebuild @@ -0,0 +1,326 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +ROCM_VERSION=6.1 +inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs + +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 flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + mpi? ( distributed ) + gloo? ( distributed ) + ?? ( cuda rocm ) + rocm? ( + || ( ${ROCM_REQUIRED_USE} ) + !flash + ) +" + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/abseil-cpp:= + dev-cpp/gflags:= + >=dev-cpp/glog-0.5.0 + dev-cpp/nlohmann_json + dev-cpp/opentelemetry-cpp + 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-util/nvidia-cuda-toolkit:=[profiler] + ) + fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) + 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-3.5* ) + opencl? ( virtual/opencl ) + qnnpack? ( + !sci-libs/QNNPACK + dev-cpp/gemmlowp + ) + rocm? ( + =dev-util/hip-6.1* + =dev-libs/rccl-6.1*[${ROCM_USEDEP}] + =sci-libs/rocThrust-6.1*[${ROCM_USEDEP}] + =sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}] + =sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}] + =sci-libs/hipFFT-6.1*[${ROCM_USEDEP}] + =sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}] + =sci-libs/hipRAND-6.1*[${ROCM_USEDEP}] + =sci-libs/hipCUB-6.1*[${ROCM_USEDEP}] + =sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}] + =sci-libs/miopen-6.1*[${ROCM_USEDEP}] + =dev-util/roctracer-6.1*[${ROCM_USEDEP}] + + =sci-libs/hipBLASLt-6.1* + amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] ) + amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] ) + amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] ) + amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] ) + ) + distributed? ( + sci-libs/tensorpipe[cuda?] + dev-cpp/cpp-httplib + ) + xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 ) + mkl? ( sci-libs/mkl ) + openblas? ( sci-libs/openblas ) +" + +DEPEND=" + ${RDEPEND} + qnnpack? ( dev-libs/clog ) + 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_p20240525 + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + ') +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.1-unbundle_fmt.patch + "${FILESDIR}"/${PN}-2.5.1-unbundle_kineto.patch + "${FILESDIR}"/${PN}-2.5.1-cudnn_include_fix.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch + "${FILESDIR}"/${PN}-2.5.1-glog-0.6.0.patch + "${FILESDIR}"/${PN}-2.5.1-newfix-functorch-install.patch +) + +src_prepare() { + filter-lto #bug 862672 + + # Unbundle fmt + sed -i \ + -e 's|::fmt-header-only||' \ + c10/CMakeLists.txt \ + cmake/Dependencies.cmake \ + torch/CMakeLists.txt \ + || die + + # Drop third_party from CMake tree + sed -i \ + -e '/add_subdirectory.*third_party/d' \ + CMakeLists.txt \ + cmake/Dependencies.cmake \ + cmake/ProtoBuf.cmake \ + aten/src/ATen/CMakeLists.txt \ + || die + # Change libc10* path + sed -i \ + -e "/EXPORT/s|DESTINATION lib)|DESTINATION $(get_libdir))|" \ + c10/cuda/CMakeLists.txt \ + c10/CMakeLists.txt \ + c10/hip/CMakeLists.txt \ + || 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 + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + -DPython_EXECUTABLE="${PYTHON}" + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) + -DUSE_CCACHE=OFF + -DUSE_CUDA=$(usex cuda) + -DUSE_DISTRIBUTED=$(usex distributed) + -DUSE_FAKELOWP=OFF + -DUSE_FBGEMM=$(usex fbgemm) + -DUSE_FLASH_ATTENTION=$(usex flash) + -DUSE_GFLAGS=ON + -DUSE_GLOG=ON + -DUSE_GLOO=$(usex gloo) + -DUSE_ITT=OFF + -DUSE_KINETO=OFF # TODO + -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MEM_EFF_ATTENTION=OFF + -DUSE_MKLDNN=$(usex onednn) + -DUSE_MPI=$(usex mpi) + -DUSE_NCCL=OFF + -DUSE_NNPACK=$(usex nnpack) + -DUSE_NUMA=OFF + -DUSE_NUMPY=$(usex numpy) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENMP=$(usex openmp) + -DUSE_PYTORCH_QNNPACK=$(usex qnnpack) + -DUSE_PYTORCH_METAL=OFF + -DUSE_ROCM=$(usex rocm) + -DUSE_SYSTEM_CPUINFO=ON + -DUSE_SYSTEM_EIGEN_INSTALL=ON + -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_GLOO=ON + -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_PSIMD=ON + -DUSE_SYSTEM_PSIMD=ON + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_PYBIND11=ON + -DUSE_SYSTEM_SLEEF=ON + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex distributed) + -DUSE_UCC=OFF + -DUSE_VALGRIND=OFF + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_XPU=OFF + -Wno-dev + ) + + 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 + ) + + # ROCm libraries produce too much warnings + append-cxxflags -Wno-deprecated-declarations -Wno-unused-result + + if tc-is-clang; then + # fix mangling in LLVM: https://github.com/llvm/llvm-project/issues/85656 + append-cxxflags -fclang-abi-compat=17 + fi + fi + + if use onednn; then + mycmakeargs+=( + -DMKLDNN_FOUND=ON + -DMKLDNN_LIBRARIES=dnnl + -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl" + ) + fi + + cmake_src_configure +} + +src_compile() { + PYTORCH_BUILD_VERSION=${PV} \ + PYTORCH_BUILD_NUMBER=0 \ + cmake_src_compile +} + +src_install() { + cmake_src_install + + # Used by pytorch ebuild + insinto "/var/lib/${PN}" + doins "${BUILD_DIR}"/CMakeCache.txt + dostrip -x /var/lib/${PN}/functorch.so + + rm -rf python + mkdir -p python/torch || die + cp torch/version.py python/torch/ || die + python_domodule python/torch + + mkdir "${D}"$(python_get_sitedir)/torch/bin || die + mkdir "${D}"$(python_get_sitedir)/torch/lib || die + mkdir "${D}"$(python_get_sitedir)/torch/include || die + + ln -s ../../../../../include/torch \ + "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269 + + mv "${D}"/usr/bin/torch_shm_manager \ + "${D}"/$(python_get_sitedir)/torch/bin/ || die + + mv "${D}"/usr/$(get_libdir)/libtorch_global_deps.so \ + "${D}"/$(python_get_sitedir)/torch/lib/ || die +} diff --git a/sci-libs/caffe2/files/caffe2-2.6.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.6.0-gentoo.patch new file mode 100644 index 000000000000..0464c06ad376 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.6.0-gentoo.patch @@ -0,0 +1,156 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -984,12 +984,11 @@ endif() + # third_party/FBGEMM + include(cmake/public/utils.cmake) + if(NOT MSVC) +- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") ++ string(APPEND CMAKE_CXX_FLAGS " -O2") + # 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) +@@ -1091,7 +1091,6 @@ + endif() + 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) + if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13) + append_cxx_flag_if_supported("-Wno-error=dangling-reference" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Wno-error=redundant-move" CMAKE_CXX_FLAGS) +--- a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt ++++ b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt +@@ -323,16 +323,8 @@ set_target_properties(pytorch_qnnpack PROPERTIES PUBLIC_HEADER include/pytorch_q + set_target_properties(pytorch_qnnpack PROPERTIES PUBLIC_HEADER include/qnnpack_func.h) + + # ---[ Configure clog +-if(NOT TARGET clog) +- set(CLOG_BUILD_TESTS OFF CACHE BOOL "") +- set(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "") +- add_subdirectory( +- "${CLOG_SOURCE_DIR}" +- "${CONFU_DEPENDENCIES_BINARY_DIR}/clog") +- # We build static version of clog but a dynamic library may indirectly depend on it +- set_property(TARGET clog PROPERTY POSITION_INDEPENDENT_CODE ON) +-endif() +-target_link_libraries(pytorch_qnnpack PUBLIC clog) ++find_library(CLOG_LIBRARY NAMES clog REQUIRED) ++target_link_libraries(pytorch_qnnpack PUBLIC ${CLOG_LIBRARY}) + + # ---[ Configure cpuinfo + if(NOT TARGET cpuinfo AND USE_SYSTEM_CPUINFO) +--- a/caffe2/CMakeLists.txt ++++ b/caffe2/CMakeLists.txt +@@ -87,7 +87,7 @@ endif() + # 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 "") +@@ -1130,7 +1130,6 @@ if(USE_XPU) + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +--- a/cmake/Codegen.cmake ++++ b/cmake/Codegen.cmake +@@ -64,7 +64,7 @@ if(INTERN_BUILD_ATEN_OPS) + 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/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -467,7 +467,9 @@ + set_property(TARGET pytorch_qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON) + # QNNPACK depends on gemmlowp headers +- target_include_directories(pytorch_qnnpack PRIVATE "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") ++ find_package(gemmlowp REQUIRED) ++ get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp::gemmlowp INTERFACE_INCLUDE_DIRECTORIES) ++ target_include_directories(pytorch_qnnpack PRIVATE ${GEMMLOWP_INCLUDE_DIRS}) + endif() + + list(APPEND Caffe2_DEPENDENCY_LIBS pytorch_qnnpack) +@@ -556,7 +556,7 @@ + find_library(microkernels-prod_LIBRARY microkernels-prod) + set_property(TARGET XNNPACK PROPERTY IMPORTED_LOCATION "${XNNPACK_LIBRARY}") + set_property(TARGET microkernels-prod PROPERTY IMPORTED_LOCATION "${microkernels-prod_LIBRARY}") +- if(NOT XNNPACK_LIBRARY or NOT microkernels-prod_LIBRARY) ++ if(FALSE) + message(FATAL_ERROR "Cannot find XNNPACK") + endif() + message("-- Found XNNPACK: ${XNNPACK_LIBRARY}") +@@ -693,7 +695,7 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) + 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") +@@ -745,6 +747,7 @@ if(USE_FBGEMM) + endif() + + if(USE_FBGEMM) ++ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) + caffe2_update_option(USE_FBGEMM ON) + else() + caffe2_update_option(USE_FBGEMM OFF) +--- a/cmake/External/nnpack.cmake ++++ b/cmake/External/nnpack.cmake +@@ -56,7 +56,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) + set(NNPACK_BUILD_TESTS OFF CACHE BOOL "") + set(NNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "") + set(NNPACK_LIBRARY_TYPE "static" CACHE STRING "") +--- a/cmake/public/utils.cmake ++++ b/cmake/public/utils.cmake +@@ -422,8 +422,6 @@ function(torch_compile_options libname) + endif() + + # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression) +- target_compile_options(${libname} PRIVATE +- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>>:-O2>) + + endfunction() + +--- a/aten/src/ATen/CMakeLists.txt 2025-02-27 14:23:02.402742165 +0100 ++++ b/aten/src/ATen/CMakeLists.txt 2025-02-27 14:23:40.445850718 +0100 +@@ -269,8 +269,6 @@ + if(USE_CUDA) + list(APPEND ATen_CUDA_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/cuda) + # Next two lines are needed because TunableOp uses third-party/fmt +- list(APPEND ATen_CUDA_INCLUDE $<TARGET_PROPERTY:fmt::fmt-header-only,INTERFACE_INCLUDE_DIRECTORIES>) +- list(APPEND ATen_CUDA_DEPENDENCY_LIBS fmt::fmt-header-only) + list(APPEND ATen_CUDA_CU_SRCS + ${cuda_cu} + ${native_cuda_cu} +@@ -315,8 +313,6 @@ + list(APPEND ATen_HIP_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/include) + list(APPEND ATen_HIP_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/library/include) + # Next two lines are needed because TunableOp uses third-party/fmt +- list(APPEND ATen_HIP_INCLUDE $<TARGET_PROPERTY:fmt::fmt-header-only,INTERFACE_INCLUDE_DIRECTORIES>) +- list(APPEND ATen_HIP_DEPENDENCY_LIBS fmt::fmt-header-only) + list(APPEND ATen_HIP_SRCS + ${ATen_HIP_SRCS} + ${hip_hip} diff --git a/sci-libs/composable-kernel/Manifest b/sci-libs/composable-kernel/Manifest index 0b7899cc6cb0..6f87eda9229b 100644 --- a/sci-libs/composable-kernel/Manifest +++ b/sci-libs/composable-kernel/Manifest @@ -13,4 +13,4 @@ DIST gtest-1.14.0_p20220421.tar.gz 849107 BLAKE2B e9c32d9c1d98959583b696430a6be4 EBUILD composable-kernel-5.7.1-r1.ebuild 1769 BLAKE2B 4e51c1eb8f331df322d9427b00d2cb8cba81f10b335533bc131142719d224d9bc89f98a0b54ec20d65f9622a081ab74d2a6bbae9289d1807958a9ded7f08fe4a SHA512 610bc66d4a374c6de7a0afb15a84255dae71911175c05674550478f5850b20f99a5bd0f5c40103c17e42ca774c80423d6a68b5bd0307be9c0ef3eaffa2912a58 EBUILD composable-kernel-6.1.1.ebuild 1885 BLAKE2B 07a795ad81748763eac5aa3fcb074eba9e11f96a8b81b7810f7bbe07e9ca8175bf00733376792ce3ed2385683b5cab6fc42e8396cc7720b8779d5a049a51f456 SHA512 5dcb45957ac5a8c659ea2f8cb796cc46b2d3432d44c5ae70d02e8a2835d80838610eff04e9a42e81c533afdc86f611419837e327251e5c9adb6eb648661ce2fb EBUILD composable-kernel-6.3.0.ebuild 2865 BLAKE2B 6bb823d2f1938f77c200adf8565298b9a9b20ecce5e0526cb188761b4f1187a9e42b209b9aa7bae54347109c79a17a0b4cfa921cb028ea2e88d009d02ddaa3d7 SHA512 375e3c356575f539e85f95a9c44cf3746c63c29b2d758503a19351f1b25bc9d5a0118e03c99cd54216f890b1e4efc7dae2ef6c18c3bf40ad52ed1beb2954c610 -MISC metadata.xml 565 BLAKE2B 9644f1c5275c8a60e37a7220d561b3461a9e76d27d6bf2c640e09a3fa38c902d1b1efc51fbc34eb987ba930b635b7969a73ae079f9de9df34d7f75c0226bcfc6 SHA512 f4b46d0faa827007925289f210e12977d8ce852d77da1e46cd1427132782dab78cd05c0137fa9632ace209ecfedf7b6eb99d53dacaba856c451491aab6b223d6 +MISC metadata.xml 569 BLAKE2B 4d2e3b37e3e5fda209b774afbf14bbd246c9212a5796219f32a1b983de50ee592de71931228cc83e1d6c5d68fb95e365c8e90a2ca8e5ac4a484c409fbcd29508 SHA512 5466e5a4b268d10adbe9142141cde695d77d5d12a0d36eede6106dbcdb71f944cd1f48a48da9917b7b765b4e7d4310f4a3bac3f3db84e4831eed9492b963e264 diff --git a/sci-libs/composable-kernel/metadata.xml b/sci-libs/composable-kernel/metadata.xml index 304ae9aafa5e..718a0d193bf7 100644 --- a/sci-libs/composable-kernel/metadata.xml +++ b/sci-libs/composable-kernel/metadata.xml @@ -9,9 +9,9 @@ <email>sci@gentoo.org</email> <name>Science Project</name> </maintainer> - <use> - <flag name="profiler">Build and install the Composable Kernal profiler (ckProfiler)</flag> - </use> + <use> + <flag name="profiler">Build and install the Composable Kernal profiler (ckProfiler)</flag> + </use> <upstream> <remote-id type="github">ROCm/composable_kernel</remote-id> </upstream> diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index f2fbf13c3af6..cba6406946ee 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -1,6 +1,3 @@ -AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09 -AUX dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch 2443 BLAKE2B f4df5afc449fd64951f21f9a243c504c57a2b8e6525b6215c9edf539b26cda863a311e31d65726091af239cb8d5aa1a00d32ec52ff0aca1cfa7f01523c934010 SHA512 dcc1e87c393437e0a13e19f70a2096af052eba34ae82c9f2e640a2cb83014aaaa71a20e2a2efcd91a55d08b2e796669113388b8953da7a412ff181628da50db6 -AUX dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch 894 BLAKE2B 097db57d5fbf5d7f6f4c1545da6fe0c49c2dad674c3da1a7a30e17d3a9c9b4da36946c24b3507c397d8f9f8551be1f934593eff79f15448863f8a7c6e416e323 SHA512 83f4085d88e67d6d93e045d6ce672c67273a86e96f1c608134637198e3acda25451af9b2fc13dc97fee8c76db3bdfb750c5bb6f46a4b74fcf96a45b2fd1bf821 DIST dealii-9.5.0-offline_documentation.tar.gz 412499027 BLAKE2B 521aa2488d84d48a624f4cbdbe9c173d0cdcee2df8d06b97b7c25ba28d4a2113a7da9fd9abd9eb64cd56b37f8edc716bd034fc3ba8823f8b1def26c34aaeeb55 SHA512 2e0d331f92d52b0fd909a0139157a1960a9222d46d537611f0508cdb79020a8e51ff0da6aefdf95adff732cea050b72df7dc1a8af7e93c736721970218815cfe DIST dealii-9.5.0-offline_documentation.tar.gz.asc 246 BLAKE2B 0a570885e80ad09ff154532b71c07e33894e93c96b3bca48dc8aae0b308883518cbb5eca57658c4e13de47efba47c3cb20bf376482ef7a26c6c0da93ee4dd689 SHA512 b63a9a0504fe5266b448ffda74e1d85ad5b6f344535c5b5f11d209546b51bb916ad69504ce5e4f1fd2287407c2d3d98a20b01bd830e8d45f510a85b7a057a8d5 DIST dealii-9.6.2.tar.gz 40863604 BLAKE2B 5214b9cfd78e48f2588046b1a3d68837f9d856191c77d179c384ddaa524a464bd2cd9eef6597bdc036e9fa7121843c048ff035fa926aa67a1a15e1c1f85f276e SHA512 79fe3c3baba4bcb479f30ae863e577e64d0a6ea488172a9d6bacecf1e5ec845f47eff9a8bf3cb4651e6803b9b0c38dc32ca745abc64737d66aedf7ec73c2e362 diff --git a/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch b/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch deleted file mode 100644 index 69c2c09e679c..000000000000 --- a/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/config/config_debug.pc.in b/cmake/config/config_debug.pc.in -index 5ea03885cd..32e45d8121 100644 ---- a/cmake/config/config_debug.pc.in -+++ b/cmake/config/config_debug.pc.in -@@ -8,4 +8,4 @@ Version: @DEAL_II_VERSION@ - URL: https://dealii.org/ - - Cflags: @DEAL_II_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_DEBUG@ @CONFIG_INCLUDE_DIRS_PC@ --Libs: @DEAL_II_LINKER_FLAGS@ @DEAL_II_LINKER_FLAGS_DEBUG@ @CONFIG_LIBRARIES_DEBUG_PC@ @CONFIG_RPATH_DEBUG_PC@ -+Libs: @CONFIG_LIBRARIES_DEBUG_PC@ @CONFIG_RPATH_DEBUG_PC@ -diff --git a/cmake/config/config_release.pc.in b/cmake/config/config_release.pc.in -index 726a35d040..8a879d07e8 100644 ---- a/cmake/config/config_release.pc.in -+++ b/cmake/config/config_release.pc.in -@@ -8,4 +8,4 @@ Version: @DEAL_II_VERSION@ - URL: https://dealii.org/ - - Cflags: @DEAL_II_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_RELEASE@ @CONFIG_INCLUDE_DIRS_PC@ --Libs: @DEAL_II_LINKER_FLAGS@ @DEAL_II_LINKER_FLAGS_RELEASE@ @CONFIG_LIBRARIES_RELEASE_PC@ @CONFIG_RPATH_RELEASE_PC@ -+Libs: @CONFIG_LIBRARIES_RELEASE_PC@ @CONFIG_RPATH_RELEASE_PC@ diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch deleted file mode 100644 index 85a78c4c1326..000000000000 --- a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch +++ /dev/null @@ -1,59 +0,0 @@ -From aafc2c19dfd3ebc43e37ba3f13eda5f790376b1c Mon Sep 17 00:00:00 2001 -From: Matthias Maier <tamiko@43-1.org> -Date: Thu, 15 Feb 2024 15:54:36 -0600 -Subject: [PATCH 1/2] base/mpi.cc: remove superfluous explicit instantiations - of template variable - -The `mpi.h` header already contains: -``` -template <typename T> -const MPI_Datatype mpi_type_id_for_type = /* implementation detail */; -``` -Meaning, the variable is known fully after including the header. -Furthermore, the `const` qualifier marks the (template) variable as -`static`. I.e., it has internal linkage. - -Thus, we must not explicitly instantiate the variables (suggesting -"extern" linkage in all but the `mpi.cc` compilation unit). This -apparently not an issue with OpenMPI because `MPI_Datatype` is a -complex data structure. But it is an issue with mpich where -`MPI_Datatype` is a simple `int` - leading to a segmentation fault when -during program startup. ---- - source/base/mpi.cc | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/source/base/mpi.cc b/source/base/mpi.cc -index dab88e2b97..f845845764 100644 ---- a/source/base/mpi.cc -+++ b/source/base/mpi.cc -@@ -100,26 +100,6 @@ namespace Utilities - - namespace MPI - { --#ifdef DEAL_II_WITH_MPI -- // Provide definitions of template variables for all valid instantiations. -- template const MPI_Datatype mpi_type_id_for_type<bool>; -- template const MPI_Datatype mpi_type_id_for_type<char>; -- template const MPI_Datatype mpi_type_id_for_type<signed char>; -- template const MPI_Datatype mpi_type_id_for_type<short>; -- template const MPI_Datatype mpi_type_id_for_type<int>; -- template const MPI_Datatype mpi_type_id_for_type<long int>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned char>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned short>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned long int>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned long long int>; -- template const MPI_Datatype mpi_type_id_for_type<float>; -- template const MPI_Datatype mpi_type_id_for_type<double>; -- template const MPI_Datatype mpi_type_id_for_type<long double>; -- template const MPI_Datatype mpi_type_id_for_type<std::complex<float>>; -- template const MPI_Datatype mpi_type_id_for_type<std::complex<double>>; --#endif -- -- - MinMaxAvg - min_max_avg(const double my_value, const MPI_Comm mpi_communicator) - { --- -2.43.0 - diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch deleted file mode 100644 index 032b12237bd2..000000000000 --- a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2ef67e3896a2a7d0ba93539cf79310384470fc91 Mon Sep 17 00:00:00 2001 -From: Matthias Maier <tamiko@43-1.org> -Date: Thu, 15 Feb 2024 16:03:22 -0600 -Subject: [PATCH 2/2] base/mpi.h: mark a template variable to have "const - inline" linkage. - ---- - include/deal.II/base/mpi.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h -index b77fd3e7c8..8ee55fbe41 100644 ---- a/include/deal.II/base/mpi.h -+++ b/include/deal.II/base/mpi.h -@@ -1728,8 +1728,8 @@ namespace Utilities - * not satisfied. - */ - template <typename T> -- const MPI_Datatype -- mpi_type_id_for_type = internal::MPIDataTypes::mpi_type_id( -+ inline const MPI_Datatype mpi_type_id_for_type = -+ internal::MPIDataTypes::mpi_type_id( - static_cast<std::remove_cv_t<std::remove_reference_t<T>> *>(nullptr)); - #endif - --- -2.43.0 - diff --git a/sci-libs/foxi/Manifest b/sci-libs/foxi/Manifest index 47fed03db850..71d6245decfc 100644 --- a/sci-libs/foxi/Manifest +++ b/sci-libs/foxi/Manifest @@ -1,4 +1,4 @@ AUX foxi-2021.05.27-gentoo.patch 2398 BLAKE2B 53ed8efa8c86460768839ef071567632793fadca138d72b5e7f07619db769dbbd2d4497bfb71d63ba47c201b17fb6a415a116ee05f56083c8cbc1a00b147e31a SHA512 4b81687444653d1614226b6696ee6515e652b62746187e0b44dcff1db7bfea653cee4d9e20775d6b8e2aca7430f0f654db3da95e3a784d477373da528b05b39e DIST foxi-2021.05.27.tar.gz 28960 BLAKE2B 06c960f829b090eec4fe9e8c981e119578f358724e0b63991173bb7e318d23654261b901d1e15efeb6240bba75cc05fd45ab32fb30bbdf48369e139cf152f398 SHA512 ad42cfd70e40ba0f0a9187b34ae9e3bd361c8c0038669f4c1591c4f7421d12ad93f76f42b33c2575eea1a3ddb3ff781da2895cdc636df5b60422598f450203c7 -EBUILD foxi-2021.05.27.ebuild 517 BLAKE2B 27c2c8c28625565f346b6baeeea5bc39e5aaebf0817d0ea830e641abacff60a4d8e6a20c0c65ddaf8bb02218735e289cc6808670f99486e0bf8bb01200cb212d SHA512 6d52dd1f00a957a9a763f12c0f6da9541e9757cad2e3655b9c21824c6405868dfa781dcdfbce3aed6043f73bcfda51786b5fb80773ddff39ee330efb71b7ec2f +EBUILD foxi-2021.05.27.ebuild 524 BLAKE2B f591311b2823c831b826c95c5e75713115844279b150d7207be5fcadf6eb2adae554951d9a24d583c626dd8c734fef5962e9924b5ab3a935a69dc6f2aaf4d124 SHA512 736988b1d7cf20316e180276a5739549ad71f79e7d02a5bc4be8220cea78bb4c3f654f7f5c6d5ab533c6d96014c819c3f05ddc49749e8b7b7ce90e83721ad09f MISC metadata.xml 327 BLAKE2B d9b056783fbf66675262cb93b1faf4cd410f1ea34c877480896602f07b1a6e136d7e4168d41725d4b4bd8743155508500e1f9d80b9158acce72bca7a84596953 SHA512 4598a70431dd411d24237ec4b97ec2ab57d9a46fcbcfd3416edfa1623baf7f10599c932ae22d6bd9d69f7898a1e51322ae084ececd2a44c2d73d07cc9817f863 diff --git a/sci-libs/foxi/foxi-2021.05.27.ebuild b/sci-libs/foxi/foxi-2021.05.27.ebuild index ef8a2caf3511..44f1fdeca8c9 100644 --- a/sci-libs/foxi/foxi-2021.05.27.ebuild +++ b/sci-libs/foxi/foxi-2021.05.27.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 @@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${CommitId} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" RESTRICT="test" # No test available diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest index 75e34fdb942f..f43a1d3a20c1 100644 --- a/sci-libs/kineto/Manifest +++ b/sci-libs/kineto/Manifest @@ -1,10 +1,8 @@ AUX kineto-0.4.0-gcc13.patch 255 BLAKE2B 5633abeae41fd306a6d66d4e0f72040abbcc27b052a9802c94235c4afcff5ed99f3ac0df9ed712c6d4a57345d666442ea89bcc84f9f7d333d2ec77be9246a1d5 SHA512 db55567e22355f7ca98959f6a385b103474b2aeed0684f48e0c2e043754defc888fbd6ae997c3e5909329777d662b2e4e1b85520192da7fcae32845798c4565d AUX kineto-0.4.0_p20231031-gentoo.patch 2997 BLAKE2B 123603ac81512b12800a0ef82fd0f573891c4170a16156f87afbdb7004608cf2593eccd23541aa2f042137762dc5d4a1d4013e9fa42303fb8e60066f96529030 SHA512 e7f4d0c7418cb3d4b00cd231b03692dd6b0fd3c29d54f6db557bb87d4ab000e5020d03fffec1583b7c2df8b0431e7f263a4c892eadc16e04ce8af2c9032b47fe AUX kineto-0.4.0_p20240525-libfmt-11.patch 2191 BLAKE2B c6fec2eb3f79222d1224572801864d55759b75ea73de6273566b83a47dfdb051235da1290021125a113cd6152e24cf753b177890d022d98e3904e346eb47b54a SHA512 e039c0c0845cf807eb6550ff6f9de1e736786df7b78ec4aac370025377e28c64dcb05e776040244c43d819ed3fe0200ae50d8b4d1f77d34ab0c3819c01ab14b8 -DIST kineto-0.4.0_p20240525.tar.gz 8243259 BLAKE2B 677529d327254c26000271a6c845356604598fb05ba57befd0e5cbd0f112f6776d2851ea1e2a7671a38ee6cb06df45db68ff0435fcddbf69496db43f5ec1e7ee SHA512 41a08c7da9eea7d12402f80a5550c9d4df79798719cc52b12a507828c8c896ba28a37c35d8adf809ca72589e1d84965d5ef6dd01f3f8dc1c803c5ed67b03a43a DIST kineto-0.4.0_p20240807.tar.gz 8263052 BLAKE2B 79a9035939164595f30f55c6cdfdc72ab42fd93d6d8fc63dc028cae50498823916993cb2d856c4b4dc43f4107602e28e8cf70584b4aea4cacda2a700b9e856e3 SHA512 f037fac78e566c40108acf9eace55a8f67a2c5b71f298fd3cd17bf22cf05240c260fd89f017fa411656a7505ec9073a06a3048e191251d5cfc4b52c237b37d0b DIST kineto-0.4.0_p20241109.tar.gz 8275370 BLAKE2B 976e629eda6b967e3169e4179e021d8e6e62671d53ceadae420dc2c586445ab701a1f4b479d7e2abd8f0bd689e4679e66d57dcadc42f5e763c127fb371bb389c SHA512 e56500c3fb967d808b9aa052587a4bdeb5561bd47ab4de87cc636496867089c5b480e1c7634a0269b97262504e03ced047dc612903fa0f56a018c23adef4e686 -EBUILD kineto-0.4.0_p20240525.ebuild 1067 BLAKE2B d8bf1c1c5b4e8c407ca1d1716895f3a5ccb95f4a691901fe84bd2e637e43fb01610addfba0a983c1461721fda33f95fa4cbe2d30ad4a32965f585f38eecbe949 SHA512 db4b499cd3c8973d4ce40e35588b91bbb3177292d3989251084c3cf2167f6225ab2ff9de317155fe48037b9bf977d1017e62f2585298aea5beba9dc3ae671550 EBUILD kineto-0.4.0_p20240807.ebuild 1070 BLAKE2B 282ea15bb12a06ad03115b3b9cb67d8e2ac78b5fffc61639e70c83abbf2e48df056c52d41f5e903a576f781adb50dafa1d6fdda2d3eba14a7da49de1a5655e65 SHA512 c2300f43bfcebb1ef66416851be9f3c4229488fa01a3781c619f75b80c22ef659cb01a87d52212cdc71d5e19cbbc3a4393579e9c580a250209826a223497b958 -EBUILD kineto-0.4.0_p20241109.ebuild 1014 BLAKE2B f9810d267d3abf2048ba6f46959954f1269a435ae5fcad772b89c1b3511925321b62551132928baee3d8efdbcd00907002527f0d42e6486dec7e921bde38fe99 SHA512 f284b3bbfb93f4d6047705f312f978cd2d8fbb736ab4b71948cdcb8bef9ef384a75b5601665de5c91423da4627f2705d2ebd008286b0d92f7d7948b36c1e3750 +EBUILD kineto-0.4.0_p20241109.ebuild 1021 BLAKE2B 0569a26b9094272766a3cfee6ba7f26e674eaff6201dc4e811a337d01caa9228c58468d28e02a036e675381b1a1649fb840d1104c973257eeab5413516af24a9 SHA512 0c760eeb8be389021fb20be5a62e153cc23e70304f164d56e7252666b33946b47babafac606f82dcfa89eefed849d0b54a79bdd298b16b36df7d9b67b1bc1ce9 MISC metadata.xml 327 BLAKE2B f48b87396bdfbc5a12b807941e162b596bbf760252fbfd08dc05ef8aeb9dcd8fc1b0ed3c8d4ec5f531da5a7315a041b8db7b0f6449c86fc52fba4f6d4476beb5 SHA512 9f6906e171f530b6f5de417338af00c26681fe757d823b4ab88cb9749506404c2d9baa96ea3c71c4fe523f6f5877a81e20f2378abe4a2e9895e501829e3fe85d diff --git a/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild b/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild deleted file mode 100644 index 2c0e437f0197..000000000000 --- a/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit python-any-r1 cmake prefix - -CommitId=be1317644c68b4bfc4646024a6b221066e430031 - -DESCRIPTION="part of the PyTorch Profiler" -HOMEPAGE="https://github.com/pytorch/kineto" -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-${CommitId} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=" - dev-libs/libfmt - dev-libs/dynolog -" -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( dev-cpp/gtest ) - ${PYTHON_DEPS} -" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.0-gcc13.patch - "${FILESDIR}"/kineto-0.4.0_p20240525-libfmt-11.patch -) - -src_prepare() { - cd libkineto - cmake_src_prepare -} - -src_configure() { - cd libkineto - local mycmakeargs=( - -DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/ - -DKINETO_BUILD_TESTS=OFF # tests require cuda toolkit - ) - eapply $(prefixify_ro "${FILESDIR}"/${PN}-0.4.0_p20231031-gentoo.patch) - - cmake_src_configure -} diff --git a/sci-libs/kineto/kineto-0.4.0_p20241109.ebuild b/sci-libs/kineto/kineto-0.4.0_p20241109.ebuild index c8bfaa7c2cc4..9ebae4ffc2d4 100644 --- a/sci-libs/kineto/kineto-0.4.0_p20241109.ebuild +++ b/sci-libs/kineto/kineto-0.4.0_p20241109.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${CommitId}/libkineto LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="test" RDEPEND=" diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index 5b55c5f55ac4..369d882ea738 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1,11 +1,5 @@ -DIST libqalculate-5.3.0.tar.gz 2705592 BLAKE2B 8a42ab386e6b028c8e8429abedf0606e409c552a722b785bf621ea205fc792d9174fe8f62311fd7587c4a7f5d91fcbf7c1ce99ceb5d0c08ad2b696aba2f6856a SHA512 41aa83a6448158ddfbf6b4e0a88062d20dd199d8bc1fa6f12b704fa0c4085ddac19bc1bc0a7e01e063221e157b1597cf8cc387ee226a90e228723fc0e2e2bed1 -DIST libqalculate-5.4.0.1.tar.gz 2203512 BLAKE2B ccecbfdb9dc026f00bc072124d9582b8f364293d60443fb6136bf2520492b50a76db7bd6a1e678c4c4eea1ff18c9033098d8046415daaba49add765e8fa68fa5 SHA512 453e5048fca023b787f4bc68ef6cf9aac6b9aeb64ef6048543a7d3729c918976dff4336e2a1f697e5e1e7489fe6c2cc92ab016802e0ee8a1a3085b0f807e38cc -DIST libqalculate-5.4.0.tar.gz 2720059 BLAKE2B e6ec9536a8b0ed3769c2a013bd267ca8202f58ebf54cd4c629d0d993cede797f2f547d02da50ced4ce94d41bbb8d54db9b4136451e960340c6bcd03c040080d6 SHA512 0539fe8053c903653b72716d0f7e5bc17d2ba954854d61f51bf62f2d9b6a02d3160be6a9f0208c67960ae5f9d831cc29eae4e80438cae482e6fb97e7686207e4 DIST libqalculate-5.5.0.tar.gz 2209195 BLAKE2B 64781eeb1ad06bb25ac604fce10fb6a158e5f704ad311d52d0b3494ddf4f96d6240795b9f1d25aaf415b4e06f9916af12ca3db71d6b97c00f07fd0e31ebc6036 SHA512 c19dd210c03eb3a2966937dafade9f15e5289a04b5c498180b3bff37e202b6707e1942e02dd76fd4f461d5f80bd7ab7b99ba7802916b7ed6a25d1e59b16472e7 DIST libqalculate-5.5.1.tar.gz 2212026 BLAKE2B dd10a0e2a5d6454c545465cafa21ab3d2d999b4671617ca98b95af4850f7275a9a53b59b923e0f34866cc6814298f82cdff714250df945ae3673a1e9e6d3c1b9 SHA512 97fca04ef8ccd9596a40f36095fd418ebcb9b98cd2c9f412b9bf8475454024b1d8942adc869b03f501656fa2d36a6dc2c8a2fc7e366325e8da382d6194346977 -EBUILD libqalculate-5.3.0-r1.ebuild 2024 BLAKE2B 0d97cc798bca2a1be1a0f9476fc0bfed859eeef6a91a14f97bce3d73d7a9264fb2b5aa5fd7bc8abbb446bc328477c9568de8a1a5d9d41229fb165be5be3109fb SHA512 209f7f45bd48e5465bf8baf0148b5a743501f38231111053ca368432ed5c96ea39559fa4a015b9aa44a0eed55c8a2dac5a8e5473ff763c289ea3d833b7dc8188 -EBUILD libqalculate-5.4.0.1.ebuild 2055 BLAKE2B 3e06de568764eb87ba1c6583e9488afc6c55363f97887f6e174e1dca34d98ab1941658652d6026da35a6fc0e1abec25123d09d05f94d273852e1d5fbd64c9512 SHA512 390a56f0437e02f8249316ec7e121705269fd594f08f01b0b5b73ac2d3d8c490396b6cde5c148ec47935f605203960e8582cf5305e452f3ac2ea8548799f4ea7 -EBUILD libqalculate-5.4.0.ebuild 2030 BLAKE2B a8c68135617a95f870d188bdf5d6930ba0e6f88797e61109fb4767e31555a1ea10e8f34cd630ebc4b03ef9c43db4667786d48babdff704b37eaac80c5c7ca8a5 SHA512 dfeaeb60112fc043b0dadb7d01cae32033973809283019d4f77e41514eb8776bc3354380818175e54f72cb4c21e0ce6f106279220e7e91e3d0bc772b094e8e0c EBUILD libqalculate-5.5.0.ebuild 2055 BLAKE2B 3e06de568764eb87ba1c6583e9488afc6c55363f97887f6e174e1dca34d98ab1941658652d6026da35a6fc0e1abec25123d09d05f94d273852e1d5fbd64c9512 SHA512 390a56f0437e02f8249316ec7e121705269fd594f08f01b0b5b73ac2d3d8c490396b6cde5c148ec47935f605203960e8582cf5305e452f3ac2ea8548799f4ea7 EBUILD libqalculate-5.5.1.ebuild 2061 BLAKE2B 15cffc65c467b5e4d59dedc3edcba449772cc7b9c81e49e973929bd851dede7ddd6ec3cf81ac8702eec71627be86512401d2483ee02453ec5fe0104d3b6d2a81 SHA512 14d9d6980d19264b3451f488e25256b5206aaf703d69a01828e24bc69dc3c017b8decaaac0ff27d2922bf55d1e526615d3590f810efd037e3a7b3df63a216211 MISC metadata.xml 807 BLAKE2B 84adb8d9b92f233d93cc630d9dbf89630a9ca1ea839f0d7d5100763c9c6e4a7065753bfe55f013e6aa99370822b4d638e7e788c8cb7bd30cae4b7bed2d7befd9 SHA512 d96812e36a70e9c1a776fe5882e1ded9fe2e7a3d1406a619202af25fc0d20180ed3209ed6df79e147697e450edb42cfcc6f38ee99ecec4e1513949b92576b4fd diff --git a/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild b/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild deleted file mode 100644 index 97c095f1c488..000000000000 --- a/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt - -inherit flag-o-matic toolchain-funcs - -MY_PV="${PV//b/}" - -DESCRIPTION="A modern multi-purpose calculator library" -HOMEPAGE="https://qalculate.github.io/" -SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${MY_PV}/${P}.tar.gz" -S="${WORKDIR}"/"${PN}-${MY_PV}" - -LICENSE="GPL-2+" -# SONAME changes pretty often on bumps. Check! -SLOT="0/23.3" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="curl icu gnuplot +hardened readline test" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/gmp:= - dev-libs/libxml2:2 - dev-libs/mpfr:= - virtual/libiconv - curl? ( net-misc/curl ) - icu? ( dev-libs/icu:= ) - readline? ( sys-libs/readline:= )" -RDEPEND="${DEPEND} - gnuplot? ( >=sci-visualization/gnuplot-3.7 )" -BDEPEND="dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - default - cat >po/POTFILES.skip <<-EOF || die - # Required by make check - data/currencies.xml.in - data/datasets.xml.in - data/elements.xml.in - data/functions.xml.in - data/planets.xml.in - data/prefixes.xml.in - data/units.xml.in - data/variables.xml.in - src/defs2doc.cc - EOF -} - -src_configure() { - # Needed for po-defs/Makefile - export CXX_FOR_BUILD="$(tc-getBUILD_CXX)" - export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E" - - # bug #792027 - tc-export CC - - # bug #924939 - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - local myeconfargs=( - $(use_enable test tests) - $(use_enable test unittests) - $(use_with curl libcurl) - $(use_with gnuplot gnuplot-call) - $(use_enable !hardened insecure) - $(use_with icu) - $(use_with readline) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # docs/reference/Makefile.am -> referencedir= - emake \ - DESTDIR="${D}" \ - referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \ - install - - einstalldocs - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild b/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild deleted file mode 100644 index b9213fc29c4d..000000000000 --- a/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt - -inherit autotools flag-o-matic toolchain-funcs - -MY_PV="${PV//b/}" - -DESCRIPTION="A modern multi-purpose calculator library" -HOMEPAGE="https://qalculate.github.io/" -SRC_URI="https://github.com/Qalculate/libqalculate/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/"${PN}-${MY_PV}" - -LICENSE="GPL-2+" -# SONAME changes pretty often on bumps. Check! -SLOT="0/23.3" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="curl icu gnuplot +hardened readline test" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/gmp:= - dev-libs/libxml2:2 - dev-libs/mpfr:= - virtual/libiconv - curl? ( net-misc/curl ) - icu? ( dev-libs/icu:= ) - readline? ( sys-libs/readline:= )" -RDEPEND="${DEPEND} - gnuplot? ( >=sci-visualization/gnuplot-3.7 )" -BDEPEND="dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - default - cat >po/POTFILES.skip <<-EOF || die - # Required by make check - data/currencies.xml.in - data/datasets.xml.in - data/elements.xml.in - data/functions.xml.in - data/planets.xml.in - data/prefixes.xml.in - data/units.xml.in - data/variables.xml.in - src/defs2doc.cc - EOF - - eautoreconf -} - -src_configure() { - # Needed for po-defs/Makefile - export CXX_FOR_BUILD="$(tc-getBUILD_CXX)" - export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E" - - # bug #792027 - tc-export CC - - # bug #924939 - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - local myeconfargs=( - $(use_enable test tests) - $(use_enable test unittests) - $(use_with curl libcurl) - $(use_with gnuplot gnuplot-call) - $(use_enable !hardened insecure) - $(use_with icu) - $(use_with readline) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # docs/reference/Makefile.am -> referencedir= - emake \ - DESTDIR="${D}" \ - referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \ - install - - einstalldocs - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/libqalculate/libqalculate-5.4.0.ebuild b/sci-libs/libqalculate/libqalculate-5.4.0.ebuild deleted file mode 100644 index 341483a69648..000000000000 --- a/sci-libs/libqalculate/libqalculate-5.4.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt - -inherit flag-o-matic toolchain-funcs - -MY_PV="${PV//b/}" - -DESCRIPTION="A modern multi-purpose calculator library" -HOMEPAGE="https://qalculate.github.io/" -SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${MY_PV}/${P}.tar.gz" -S="${WORKDIR}"/"${PN}-${MY_PV}" - -LICENSE="GPL-2+" -# SONAME changes pretty often on bumps. Check! -SLOT="0/23.3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="curl icu gnuplot +hardened readline test" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/gmp:= - dev-libs/libxml2:2 - dev-libs/mpfr:= - virtual/libiconv - curl? ( net-misc/curl ) - icu? ( dev-libs/icu:= ) - readline? ( sys-libs/readline:= )" -RDEPEND="${DEPEND} - gnuplot? ( >=sci-visualization/gnuplot-3.7 )" -BDEPEND="dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - default - cat >po/POTFILES.skip <<-EOF || die - # Required by make check - data/currencies.xml.in - data/datasets.xml.in - data/elements.xml.in - data/functions.xml.in - data/planets.xml.in - data/prefixes.xml.in - data/units.xml.in - data/variables.xml.in - src/defs2doc.cc - EOF -} - -src_configure() { - # Needed for po-defs/Makefile - export CXX_FOR_BUILD="$(tc-getBUILD_CXX)" - export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E" - - # bug #792027 - tc-export CC - - # bug #924939 - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - local myeconfargs=( - $(use_enable test tests) - $(use_enable test unittests) - $(use_with curl libcurl) - $(use_with gnuplot gnuplot-call) - $(use_enable !hardened insecure) - $(use_with icu) - $(use_with readline) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # docs/reference/Makefile.am -> referencedir= - emake \ - DESTDIR="${D}" \ - referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \ - install - - einstalldocs - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index 96fa52e19614..afe761dd8032 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -1,8 +1,6 @@ AUX onnx-1.15.0-hidden.patch 511 BLAKE2B 857a4ff9597a25430e2236c2d9de47c1203e630a4adfe8e4cdb72ddfb928f0327e2a625ad91e936e4d3f71bc4aa135bbd15abcf348958238075d356d47d3291b SHA512 a4dbcbae79af1ef1edc8ec8aa27eb0303c1a52baf7db74e70f2d1e6a35db7d5ed2205f7f10f34fdcd3ac536b029edf749b9eb8f7926ac2b620ac7a4b59884182 -DIST onnx-1.16.1.tar.gz 12428832 BLAKE2B 15a7db2fa263914957c671bd8e94eb8b80afeba0b396e8b54f8fb2deda2965885055efae7a6f6e402eb085b5795025020f650132023ba3d4df1f395d99ec353c SHA512 0ae1b36563ddeaa9947bf452eb20b83174e4c2bc4696b61768f096c401666323343fac0f699f756da99d3c29df15a0bd78fe3fa51da15f133617d7310c5b28d4 DIST onnx-1.16.2.tar.gz 12429500 BLAKE2B 1541fd9e80e305bc0764d1f5d236a89a2f0d0d8819bd6f235c88d35985daf02f575854a537af193befbeab861b2fe6a9d5b8803975b8ae6a47d5d5a6dc28b661 SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d DIST onnx-1.17.0.tar.gz 12475304 BLAKE2B 17e3cdd4bf101749ba841599d1b4e89ad80cfa3de6adabc10491f84ec928c385b1fe517e32657b24ca57d14780d51cc9a641860c06194cec082d9a9950004c8c SHA512 5a18e2b19ec9c18c8b115fb7e12ed98eddaa581c95f15c4dd420cd6c86e7caa04f9a393da589e76b89cf9b3544abd3749a8c77c2446782f37502eb74e9b1f661 -EBUILD onnx-1.16.1-r2.ebuild 1478 BLAKE2B c673170582e8eb3986185d71e213dac55f1b6e9e8d1d9d2dfe1ec8dbf0f4249f2d9662217205940d6c9a473349f4b7bc2e839af61a3dc5056679cb20611fe8c7 SHA512 ed31b08bfa27810e6f737de6c5ac64d2e4b98564e12d93b8a4d9933c1d4e4ca3625299f5de2f586f7ac327011b7310e841d21d5af675b594eecb7ab94a9ac415 EBUILD onnx-1.16.2-r1.ebuild 1478 BLAKE2B c673170582e8eb3986185d71e213dac55f1b6e9e8d1d9d2dfe1ec8dbf0f4249f2d9662217205940d6c9a473349f4b7bc2e839af61a3dc5056679cb20611fe8c7 SHA512 ed31b08bfa27810e6f737de6c5ac64d2e4b98564e12d93b8a4d9933c1d4e4ca3625299f5de2f586f7ac327011b7310e841d21d5af675b594eecb7ab94a9ac415 -EBUILD onnx-1.17.0.ebuild 1478 BLAKE2B 75c3ab7ebb08ee46e77dfa4255ccfd749d8d5c2cd0ee73cd814da513b36416ebfcab0cc88dcae99a21e33dd884478ae35140577853a93474e8319645139e00d5 SHA512 7f95853463e2d656bd3c24041744322a062e6658feb14dd55d6139bf6e0af8b728323de8aedade24350d82667c0dfb0ab74c78b5521903b55a80388577b7e011 +EBUILD onnx-1.17.0.ebuild 1485 BLAKE2B e44eee6ff15b1aca952786d9fa43ab0490ab62c917f813a29e7aeba98b8452e3d0ec1af85cf9a851300405eb30479368e5af300d160312dac83560258ccf8a83 SHA512 a27e58b83bd77dbcd98983ddecac6fd3ec07905aad4cc3de4908787a1cf6b0c1f24a2f69f9a64a063a16921fe6dd2b654ac9db07f03b76fce2302d39bd9297c2 MISC metadata.xml 404 BLAKE2B 363f1790f0dd2eace0368d7eb1875c166ba6dd0b2514232050f2f1813ccba854b4f8e58e22a329792126188f06d21bf87436c1dcc10d68b018f7abc8eb8ec3e9 SHA512 6a80de77d763a261cafee9cd69337de5282fa39772a1d2a82c3d954d29221596036346339926a124f9df9b261050d17b58d004cdd01ff2f57347379e9df2e45f diff --git a/sci-libs/onnx/onnx-1.16.1-r2.ebuild b/sci-libs/onnx/onnx-1.16.1-r2.ebuild deleted file mode 100644 index 555c3bac3c40..000000000000 --- a/sci-libs/onnx/onnx-1.16.1-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2022-2025 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_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-libs/protobuf:=[protoc(+)] - dev-cpp/abseil-cpp:= -" -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/onnx/onnx-1.17.0.ebuild b/sci-libs/onnx/onnx-1.17.0.ebuild index 6c0cfd72f636..557c1014ad16 100644 --- a/sci-libs/onnx/onnx-1.17.0.ebuild +++ b/sci-libs/onnx/onnx-1.17.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="~amd64 ~arm64 ~riscv" IUSE="disableStaticReg" RESTRICT="test" diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest index 70f76615b44e..51a6ccf75e33 100644 --- a/sci-libs/openlibm/Manifest +++ b/sci-libs/openlibm/Manifest @@ -1,5 +1,5 @@ AUX openlibm-0.8.3-fix-loong-riscv-fenv.patch 749 BLAKE2B 27f062b7bc9212a487812efc923fd584a03d0641fb81f6b4b683b161c6f3e1c255b5141c63418f9e0be96250d5cda09fae5ebf611aeaf79562d32cb0c266bbee SHA512 d0290460c8fb444496ef3978eb77bdf691df380d4e11080fffb7060b5e2b7ab4da287b424eda4fef7f719b53d24d244c128f4c118deb4e07f1a00f6b32d46474 AUX openlibm-0.8.3-stack-protection.patch 2065 BLAKE2B 213710329df83d08798cea61d952e6ced7218bad7e80eb9ee8004ccbfaf85a27fc70fb1ac4f6f5b313b47453be1197567296c8cca23fcd65ad037599ff0b17a7 SHA512 7e750cdb2fe9871b1e83291ffac5d255a73f2f577b05f3a3dcb35ee919c38fa26980416d38352805b1b32f91de3b7bcba8fab0f0757bb506786ddbdeb4429739 DIST openlibm-0.8.3.tar.gz 374991 BLAKE2B 91474b5c9480753dafb2f85521a8909eaa00febc871bd71d6ffecfd1001200ce66c66c43f4f5738215f04bc109035dcceb2a9f6319e8b9405e6cab65e802aafb SHA512 1c6969e6e3117ddc066697318e43cf42d170750cb85cbed6013eb29d7513d5998eeffbff4a658d222cf637977cb7dca34b7a15814f8870f4e36e880673d757c0 -EBUILD openlibm-0.8.3.ebuild 1290 BLAKE2B 64e7e67d8d687976432c8db26602ad09000d6e977fc078b7d90872763ef230b61cc5e23ec14b6f23ec73760b75d9336a25069a198da38428d00fbfe5a078fd4a SHA512 91b3a823f24dc61fdd46682425297b8f03a43a4268373d0e329ebae8b6fb75f459e8a590f222ea4c66f68ce2feef75f682bc1ab0db5dfe9c46356812dc1c9717 +EBUILD openlibm-0.8.3.ebuild 1289 BLAKE2B f1fca0ac05dbcd2b866d30da8d41534c92f004ffb13d1c2f18f7c4fbc801fe882f9f8855b5efcac7b0bd6a920b44d87acb3e838f598371e88a69025a4c3ede30 SHA512 5af51b73144eb00c5aa7c6ce66955ed54844f613dda3499435e5609dd8443def0128e16587b1e44f081653e8fc7ee16585da22f71c92d666b918e27a5f3f813d MISC metadata.xml 785 BLAKE2B 160415de6f1dd61dfe42488a2aaf716bb6ecb00396ae541c8b385116fb0b5017bc546fdcdd6394ce5c547cd85e7ccf94b7996128355ce3fa9fc7b17478c2949d SHA512 cdc602bce059702ad03d57a67ad9e2897fdcf999fd2d664e76293ddd22741817a042abafd6603c424839780d30b647a82901c468a5d55dc1794fdafd2a281b8c diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild index 1e78e2465e90..2252f0e806cd 100644 --- a/sci-libs/openlibm/openlibm-0.8.3.ebuild +++ b/sci-libs/openlibm/openlibm-0.8.3.ebuild @@ -13,7 +13,7 @@ IUSE="static-libs" LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+" # See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm SLOT="0/4" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" PATCHES=( "${FILESDIR}"/${P}-stack-protection.patch diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 7d8931405653..4eaa209374b6 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -6,8 +6,11 @@ AUX pytorch-2.4.0-global-dlopen.patch 887 BLAKE2B 044e7708619070f93b1157a0c4e560 AUX pytorch-2.4.0-torch_shm_manager.patch 367 BLAKE2B f03c002cbd50fb959dfc3ccf89cb8aa9fe6e001ff2cb47bee45cde28cac262e20df1d06f396776ce069f0a9e92cd370c96788db0aa5d1b9d9f3bc1832701502a SHA512 94f095908385b3058863d05a78a0e243f8614bbde406d457e50bdba574a8e1911b77790a0806f705644dc0c0ae235888314ea4a31aed7c0eb8ddfb29ff42636e AUX pytorch-2.5.1-dontbuildagain.patch 420 BLAKE2B 42935902e5cb98d5d013fd4e409107c7fa95b91a09ee34723b67dbee37eed4575bb008de0aaab4d00b36bb19d87b4d6855829498fe5b7de95e47b4d536edc71c SHA512 e78b572110ff62d7d90ecd8dfb3f9f6a72c05e5190991ee8084107bbe11f0fe4f85d6fa440b2b4d3ce5e2611685e6e6f35d4fb026eef43131e3e4e60dba53bcf AUX pytorch-2.5.1-setup.patch 437 BLAKE2B 4107ad2dfde10b25e7422f65c7f87833bb662958eb3fca3ac0c1a5c2e203f7186c31142ac6cdf2a10009a95408e45caaa09fd85a5cc35ee6c9106f8c630a8beb SHA512 a51b3840763f960c1c63df0181c2d35747697a57e11bb08681acf21af06b64d2fca45f6bb3647034d20860e497cab53cec9bd2b5719c5c5aab7bf01080da9103 +AUX pytorch-2.6.0-dontbuildagain.patch 757 BLAKE2B 2de63f16f26bdf2df95fc040ab1d69cb2026a1785f37be6be75744c7cb8d62e59552b18598fe740c1551415b1bf915ab57e0d0cb7791ede86541a1cc68305dfc SHA512 0f072dc1b7b568d1c3a6e3fea5a9566bebfc113a32a51fa25ce3aee35f8ff77f8a8a7681dd7ebb121136b55605c52592439c9b2d1ccc0ded241deacefe33940b DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289 +DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0 EBUILD pytorch-2.4.1.ebuild 1616 BLAKE2B 6d2b4012e2ee45eff08e7d38cd6f8177b94ae556337cde21fe5352aca2bbfeecda582159f45bb947d96775468aed2617eaf28cdc4d42e0e0d2cb2c662dbe70ed SHA512 a0ea63813cac1cdc2d23f99982574786417b8f9a829f7166be2b33eb9b2f7dcb20a174ca2a70bc7e887d415efea361a7491c1642b3bbeb68446a8cbee4ed4a1c EBUILD pytorch-2.5.1-r1.ebuild 1484 BLAKE2B c7a2ffa0e2da094a4563aff1017b6a30ad2255a660ca7e6a52e7b4ab0265376507f569babaa0dec4af45cc7658f1fcfdaeda82fba4cb63ed6ef1e42627acc5ce SHA512 69b7f6ee48639a45b4662a9f315f168aa2994085e997c710d1a89a79e8055d77e388d2b7339c30bae14bc27c46433c5df85fcc624eabaa6fb53617125a695e91 +EBUILD pytorch-2.6.0.ebuild 1445 BLAKE2B 667667dbe58341c6378b0e4c2f1299dcbeed89bc0ac69a93f923468f7d7b3b9971ea4ddd88c93c8a670c551bf930fc911ecd367b9e9e01119ca607026e20e2ba SHA512 361281ee20731e7281ec4aa9a49597a5f84d6d4908dd1de622ca40e78945095bc9622a96fa83eebc76e9e9ec96cbf9ebbc3cba4bb4cc5b6b02667f3c13fc968e MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 diff --git a/sci-libs/pytorch/files/pytorch-2.6.0-dontbuildagain.patch b/sci-libs/pytorch/files/pytorch-2.6.0-dontbuildagain.patch new file mode 100644 index 000000000000..75a386ce2969 --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-2.6.0-dontbuildagain.patch @@ -0,0 +1,25 @@ +--- a/setup.py ++++ b/setup.py +@@ -256,6 +256,7 @@ + import setuptools.command.sdist + from setuptools import Extension, find_packages, setup + from setuptools.dist import Distribution ++sys.path[:0] = os.getcwd() + from tools.build_pytorch_libs import build_pytorch + from tools.generate_torch_version import get_torch_version + from tools.setup_helpers.cmake import CMake +@@ -483,14 +483,6 @@ + check_submodules() + check_pydep("yaml", "pyyaml") + build_python = not BUILD_LIBTORCH_WHL +- build_pytorch( +- version=version, +- cmake_python_library=cmake_python_library, +- build_python=build_python, +- rerun_cmake=RERUN_CMAKE, +- cmake_only=CMAKE_ONLY, +- cmake=cmake, +- ) + + if CMAKE_ONLY: + report( diff --git a/sci-libs/pytorch/pytorch-2.6.0.ebuild b/sci-libs/pytorch/pytorch-2.6.0.ebuild new file mode 100644 index 000000000000..9cb0e5814c84 --- /dev/null +++ b/sci-libs/pytorch/pytorch-2.6.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) +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}] + >=sci-libs/caffe2-2.5.1-r5 + $(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}"/${P}-dontbuildagain.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 + + # Get object file from caffe2 + cp /var/lib/caffe2/functorch.so functorch/functorch.so || die + + 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 +} |