From a625efe29cec7f7c437cf33a956ea99eed1e4bd9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2024 11:40:42 +0000 Subject: gentoo auto-resync : 24:02:2024 - 11:40:42 --- dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild | 81 ---------------------- dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild | 79 +++++++++++++++++++++ dev-libs/FBGEMM/Manifest | 6 +- .../FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch | 65 ----------------- .../FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch | 10 --- 5 files changed, 81 insertions(+), 160 deletions(-) delete mode 100644 dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild create mode 100644 dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild delete mode 100644 dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch delete mode 100644 dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch (limited to 'dev-libs/FBGEMM') diff --git a/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild deleted file mode 100644 index f9344e4d5411..000000000000 --- a/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit python-any-r1 flag-o-matic cmake - -CommitId=03b2046676707da64504e898490ab46104d4682a - -DESCRIPTION="Facebook GEneral Matrix Multiplication" -HOMEPAGE="https://github.com/pytorch/FBGEMM" -SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc test" - -DEPEND=" - >=dev-libs/asmjit-2022.07.02 - dev-libs/cpuinfo -" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-cpp/gtest ) - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - dev-python/breathe[${PYTHON_USEDEP}] - ') - ) - ${PYTHON_DEPS} -" -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${CommitId} - -python_check_deps() { - if use doc; then - python_has_version \ - "dev-python/sphinx[${PYTHON_USEDEP}]" \ - "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \ - "dev-python/breathe[${PYTHON_USEDEP}]" - fi -} - -PATCHES=( - "${FILESDIR}"/${PN}-2022.01.13-gentoo.patch - "${FILESDIR}"/${PN}-2022.07.16-gcc13.patch - "${FILESDIR}"/${P}-test.patch -) - -src_prepare() { - # Bug #855668 - filter-lto - - rm test/RowWiseSparseAdagradFusedTest.cc || die - rm test/SparseAdagradTest.cc || die - sed -i \ - -e "/-Werror/d" \ - CMakeLists.txt \ - || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DFBGEMM_LIBRARY_TYPE=shared - -DFBGEMM_BUILD_BENCHMARKS=OFF - -DFBGEMM_BUILD_DOCS=$(usex doc ON OFF) - -DFBGEMM_BUILD_TESTS=$(usex test ON OFF) - ) - cmake_src_configure -} - -src_test() { - OMP_STACKSIZE=512k cmake_src_test -} diff --git a/dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild b/dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild new file mode 100644 index 000000000000..0d2e34d143c4 --- /dev/null +++ b/dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild @@ -0,0 +1,79 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-any-r1 flag-o-matic cmake + +CommitId=88fc6e741bc03e09fcdc3cd365fa3aafddb7ec24 + +DESCRIPTION="Facebook GEneral Matrix Multiplication" +HOMEPAGE="https://github.com/pytorch/FBGEMM" +SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" + +DEPEND=" + >=dev-libs/asmjit-2022.07.02 + dev-libs/cpuinfo +" +RDEPEND="${DEPEND}" +BDEPEND=" + test? ( dev-cpp/gtest ) + doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + dev-python/breathe[${PYTHON_USEDEP}] + ') + ) + ${PYTHON_DEPS} +" +RESTRICT="!test? ( test )" + +S="${WORKDIR}"/${PN}-${CommitId} + +python_check_deps() { + if use doc; then + python_has_version \ + "dev-python/sphinx[${PYTHON_USEDEP}]" \ + "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" \ + "dev-python/breathe[${PYTHON_USEDEP}]" + fi +} + +PATCHES=( + "${FILESDIR}"/${PN}-2023.11.02-gentoo.patch +) + +src_prepare() { + # Bug #855668 + filter-lto + + rm test/RowWiseSparseAdagradFusedTest.cc || die + rm test/SparseAdagradTest.cc || die + sed -i \ + -e "/-Werror/d" \ + CMakeLists.txt \ + || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DFBGEMM_LIBRARY_TYPE=shared + -DFBGEMM_BUILD_BENCHMARKS=OFF + -DFBGEMM_BUILD_DOCS=$(usex doc ON OFF) + -DFBGEMM_BUILD_TESTS=$(usex test ON OFF) + ) + cmake_src_configure +} + +src_test() { + OMP_STACKSIZE=512k cmake_src_test +} diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest index 5c2e3008bce3..d8cc1075a672 100644 --- a/dev-libs/FBGEMM/Manifest +++ b/dev-libs/FBGEMM/Manifest @@ -1,9 +1,7 @@ -AUX FBGEMM-2022.01.13-gentoo.patch 2202 BLAKE2B 541f97c2e57c13659bbd2ffc165f72062a24a93d6e5bb39e48986c0b40c9b69270798920afc4e714fa8d0d80f4ccaaf8c2d01a8d6acda6cbada8425c24c49bf5 SHA512 2c794446af33ba8ae521ce061dee76d286e61877c44d657f9436ac38c7a3a80439b25daea534ed89aeedfee02fbc031e5da70cdf446e4dee4bf2c96e91a340dc -AUX FBGEMM-2022.07.16-gcc13.patch 230 BLAKE2B f90e3efc20dee725ca1f6b93180b0176090fd314b7049d90285e7d7634af8cacc588560f593d475db73c04c9f14ae620d2ab27ee974e7a473b806254cfb5f923 SHA512 abd30f206bba3104c0b675a52c3320a251b769e9f1ea58a79de351d0d2e57e81265c554e7e8cb505014a1b5d7f7edd77d838eec33bb0fd932dfbc795b1d732e4 AUX FBGEMM-2023.02.10-test.patch 432 BLAKE2B 036f437280f186dbf970a4e3b9a8c729b0f5f6878f7daa0aa750e106b9848423a55a5a43efb1d2f5f800121a034384e7480773bf856d71517ad3daa49dc02aa4 SHA512 ba2c12e42c6f6afb4ea772ff80b5e1040b311af6457cb17d08bd254b4458d520f1a70acb2f63335ee2a06c168508d657b71adfc7ed4b697c8469cb140ed23b2f AUX FBGEMM-2023.11.02-gentoo.patch 2162 BLAKE2B c585ac736dc1494820e778dbba951a340b01cc60d99fe5c308bb140d42a0af8f6c05273963e0dd99a7f1ad2dc9af854702bdadf5b2682c5a959a0e742d22c772 SHA512 296d4f15e4047e98a0ccf7a3d23a9661ca2be8f4599d4dd5541f6e728f181cf58e836f09382ef2ed69792d1c9da3146a57cbce9041f7a43ab5354e641551f9fd -DIST FBGEMM-2023.02.10.tar.gz 854918 BLAKE2B 2af11baf95c1f33e1b1dd6f2a51dde2c991ff0f606402a7aaa539b7bc505c3707cafaa96d8f742c91672ec09a1f18a69f0e69c012b6db11d5297d602b8f4860c SHA512 a59d928150d674c56b5d38f73e62b5f4e2b527ea1f7ebb891ea1d3356e4183e0f469d145fca37fcb1c85f8773cf54226a8e41389fe9783474c457a7bd31846d6 DIST FBGEMM-2023.11.02.tar.gz 895265 BLAKE2B 0f884147a86881159485680f1cb0c7b7e65bba5a98e62c38534041264f920e08a268e348e3d82ba3d246226a10f592d86dc37bce0cfa42c72dad478041a6c807 SHA512 030f27a120586240c5f80026bd033cf6fedbe1ae12a667308d33d6321f2334021d474a3625795d1f34734336b688b19c09134e10d5cc8dec86e84485de298584 -EBUILD FBGEMM-2023.02.10.ebuild 1660 BLAKE2B f7baa490dc3a03301ee660fbb47c15144f7172ed8ff169be0a45e5916cf94115bf43b4bd6af34fda92e56694042db19050bd4723c373bb60666db5cebb8b7836 SHA512 b0227a9fbe4a68cdf0ec7777836992b127838608d6bff355f08e79a986a54aea2ce0ae9dec95abbadabaf108040ae574e47fd63011d257dcf927d6221d54864c +DIST FBGEMM-2023.12.01.tar.gz 1004090 BLAKE2B dc19ebee06bccb888e5d03606168c7439ce8c96303a697056edd22d3a3a6ff4f4f3ddf5371d50aa774890ca1ad66d665f5e54976dc1b8da841759a3f4d64c4d7 SHA512 ab37964326d2cbbcbf0f2c722675d1f059407fc3185275d37f2e04f3e516fe0733ac1fb35351fc7e7c308e9c0da40811d3657a10a3696cb7648494df79408aab EBUILD FBGEMM-2023.11.02.ebuild 1573 BLAKE2B 88fb8637f4d9b7660a0bcdb3724747deac2082c697bf03d1fd0e281ecf6a81a64d14f040bcf420992f7cbdbc8e0bf7fd9d66decc69ed043cb511497faffb6549 SHA512 946a29d14eb0955a0570ad7122b41bca9c709976fdff9acb6fb06f1045e1d76c98b8b8ffcb6654c7e14610fb669fea9473228897cbff4c4cb0d75478cbbe136e +EBUILD FBGEMM-2023.12.01.ebuild 1586 BLAKE2B 2962b4eb6ed5a11c97662d8374ce524fa8ac472c88eb8a2afe6107e290b406e224bb25d853633944c68c53e63c3bcd6580eeadb7b2a24214f759b073d534c2e1 SHA512 6f36f059a3b3ebd5446e0580f039fc4b64a787be322f2c26a5bc5242dc089ad43cdcad9b9c3b563c7fdd9b9f5a90d6a59e5f0b12fada0b12d78dcc9403646ff3 MISC metadata.xml 327 BLAKE2B 860b9c0ecb3b0029c855db0a0054590135f3bd6ec9dad20cdf433fc70c119354518eea50fdbb2a204eb8cc6621de23e6928a2f9ec961ac0c51fd9dae22fa8488 SHA512 3a0d5a69421a41e62ce134636025e0024010c1938ee35f7489d8d870d915a66cd526aa60d107a378dc4522ff71b7f10486e20867c8b424b1b47e458988ebff58 diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch deleted file mode 100644 index 9ff87d5b6cb4..000000000000 --- a/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/CMakeLists.txt 2022-05-21 13:13:50.806813151 +0200 -+++ b/CMakeLists.txt 2022-05-21 13:16:46.448969453 +0200 -@@ -187,7 +187,7 @@ - message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") - message(WARNING "==========") - --if(NOT TARGET asmjit) -+if(FALSE) - #Download asmjit from github if ASMJIT_SRC_DIR is not specified. - if(NOT DEFINED ASMJIT_SRC_DIR) - set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" -@@ -216,7 +216,7 @@ - endif() - endif() - --if(NOT TARGET cpuinfo) -+if(FALSE) - #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. - if(NOT DEFINED CPUINFO_SOURCE_DIR) - set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" -@@ -293,7 +293,6 @@ - - target_link_libraries(fbgemm $ - $) --add_dependencies(fbgemm asmjit cpuinfo) - - install(TARGETS fbgemm EXPORT fbgemmLibraryConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -302,6 +301,8 @@ - - install(FILES ${FBGEMM_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm") -+install(FILES src/RefImplementations.h -+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/fbgemm/src") - - install(EXPORT fbgemmLibraryConfig DESTINATION share/cmake/fbgemm - FILE fbgemmLibraryConfig.cmake) ---- a/test/CMakeLists.txt 2022-05-21 13:15:34.140135199 +0200 -+++ b/test/CMakeLists.txt 2022-05-21 13:17:59.170813431 +0200 -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.5 FATAL_ERROR) - --if(FBGEMM_BUILD_TESTS AND NOT TARGET gtest) -+if(FALSE) - #Download Googletest framework from github if - #GOOGLETEST_SOURCE_DIR is not specified. - if(NOT DEFINED GOOGLETEST_SOURCE_DIR) -@@ -67,7 +67,6 @@ - target_link_libraries(${TESTNAME} ${OpenMP_CXX_LIBRARIES}) - endif() - -- add_dependencies(${TESTNAME} gtest fbgemm) - add_test(${TESTNAME} ${TESTNAME}) - set_target_properties(${TESTNAME} PROPERTIES FOLDER test) - endmacro() ---- a/src/PackMatrix.cc 2022-05-24 08:19:00.639462626 +0200 -+++ b/src/PackMatrix.cc 2022-05-24 08:27:59.127720548 +0200 -@@ -30,6 +30,7 @@ - } - - template -+FBGEMM_API - int PackMatrix::packedBufferSize( - int rows, - int cols, diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch deleted file mode 100644 index cba259688d96..000000000000 --- a/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/fbgemm/UtilsAvx2.h 2023-03-11 17:17:28.365325199 +0100 -+++ b/include/fbgemm/UtilsAvx2.h 2023-03-11 17:18:06.076766162 +0100 -@@ -9,6 +9,7 @@ - // flags. - - #include -+#include - - namespace fbgemm { - -- cgit v1.2.3