[gentoo-commits] repo/gentoo:master commit in: dev-libs/FBGEMM/, dev-libs/FBGEMM/files/
commit: dcf7a0395989c3c40a72f9e2f30916334aefdfae
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Feb 24 07:00:12 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Feb 24 07:00:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf7a039
dev-libs/FBGEMM: add 2023.12.01, drop 2023.02.10
Signed-off-by: Alfredo Tupone gentoo.org>
...-2023.02.10.ebuild => FBGEMM-2023.12.01.ebuild} | 10 ++--
dev-libs/FBGEMM/Manifest | 2 +-
.../FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch| 65 --
.../FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch | 10
4 files changed, 5 insertions(+), 82 deletions(-)
diff --git a/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
b/dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild
similarity index 85%
rename from dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
rename to dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild
index f9344e4d5411..0d2e34d143c4 100644
--- a/dev-libs/FBGEMM/FBGEMM-2023.02.10.ebuild
+++ b/dev-libs/FBGEMM/FBGEMM-2023.12.01.ebuild
@@ -1,12 +1,12 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit python-any-r1 flag-o-matic cmake
-CommitId=03b2046676707da64504e898490ab46104d4682a
+CommitId=88fc6e741bc03e09fcdc3cd365fa3aafddb7ec24
DESCRIPTION="Facebook GEneral Matrix Multiplication"
HOMEPAGE="https://github.com/pytorch/FBGEMM;
@@ -48,9 +48,7 @@ python_check_deps() {
}
PATCHES=(
- "${FILESDIR}"/${PN}-2022.01.13-gentoo.patch
- "${FILESDIR}"/${PN}-2022.07.16-gcc13.patch
- "${FILESDIR}"/${P}-test.patch
+ "${FILESDIR}"/${PN}-2023.11.02-gentoo.patch
)
src_prepare() {
diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest
index 537d3f459c6a..edf24ff03da4 100644
--- a/dev-libs/FBGEMM/Manifest
+++ b/dev-libs/FBGEMM/Manifest
@@ -1,2 +1,2 @@
-DIST FBGEMM-2023.02.10.tar.gz 854918 BLAKE2B
2af11baf95c1f33e1b1dd6f2a51dde2c991ff0f606402a7aaa539b7bc505c3707cafaa96d8f742c91672ec09a1f18a69f0e69c012b6db11d5297d602b8f4860c
SHA512
a59d928150d674c56b5d38f73e62b5f4e2b527ea1f7ebb891ea1d3356e4183e0f469d145fca37fcb1c85f8773cf54226a8e41389fe9783474c457a7bd31846d6
DIST FBGEMM-2023.11.02.tar.gz 895265 BLAKE2B
0f884147a86881159485680f1cb0c7b7e65bba5a98e62c38534041264f920e08a268e348e3d82ba3d246226a10f592d86dc37bce0cfa42c72dad478041a6c807
SHA512
030f27a120586240c5f80026bd033cf6fedbe1ae12a667308d33d6321f2334021d474a3625795d1f34734336b688b19c09134e10d5cc8dec86e84485de298584
+DIST FBGEMM-2023.12.01.tar.gz 1004090 BLAKE2B
dc19ebee06bccb888e5d03606168c7439ce8c96303a697056edd22d3a3a6ff4f4f3ddf5371d50aa774890ca1ad66d665f5e54976dc1b8da841759a3f4d64c4d7
SHA512
ab37964326d2cbbcbf0f2c722675d1f059407fc3185275d37f2e04f3e516fe0733ac1fb35351fc7e7c308e9c0da40811d3657a10a3696cb7648494df79408aab
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..
--- 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()
-
--
[gentoo-commits] repo/gentoo:master commit in: dev-libs/FBGEMM/, dev-libs/FBGEMM/files/
commit: cfba1140f658bf94ac22b666be7c2e630c12a02a
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Mar 11 17:34:22 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Mar 11 17:35:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfba1140
dev-libs/FBGEMM: fix build with gcc-13
Closes: https://bugs.gentoo.org/894628
Signed-off-by: Alfredo Tupone gentoo.org>
dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild| 54 --
dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild | 1 +
dev-libs/FBGEMM/Manifest | 1 -
.../FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch | 10
4 files changed, 11 insertions(+), 55 deletions(-)
diff --git a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild
b/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild
deleted file mode 100644
index a505928cb56c..
--- a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 flag-o-matic cmake
-
-CommitId=135412d2646f3bd753c8f1cfd33616110bbccd27
-
-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="test"
-
-DEPEND="
- ~dev-libs/asmjit-2021.11.13
- dev-libs/cpuinfo
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- test? ( dev-cpp/gtest )
- ${PYTHON_DEPS}
-"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
- # Bug #855668
- filter-lto
-
- rm test/RowWiseSparseAdagradFusedTest.cc || die
- rm test/SparseAdagradTest.cc || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DFBGEMM_LIBRARY_TYPE=shared
- -DFBGEMM_BUILD_BENCHMARKS=OFF
- -DFBGEMM_BUILD_TESTS=$(usex test ON OFF)
- )
- cmake_src_configure
-}
diff --git a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild
b/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild
index 9a2f09a92e45..b2c8f05937d7 100644
--- a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild
+++ b/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}"/${PN}-${CommitId}
PATCHES=(
"${FILESDIR}"/${PN}-2022.01.13-gentoo.patch
+ "${FILESDIR}"/${P}-gcc13.patch
)
src_prepare() {
diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest
index 5fd675cbb2ad..70bae9073b04 100644
--- a/dev-libs/FBGEMM/Manifest
+++ b/dev-libs/FBGEMM/Manifest
@@ -1,2 +1 @@
-DIST FBGEMM-2022.01.13.tar.gz 532297 BLAKE2B
bced7e1a1712351a87762e8d0a28ed3bbc5678c8ce70b440e769e53dc15f68e3ec8c89df9307f33da788bd376613720892493c0b519d3860a6e2edb48de1fdba
SHA512
a416c2c11b0e6798e0dbb376050ead79cb602cd4f0e41b6109eeefe3e939e410adf0ce828d1224a358eb8245a935cc431d8023ccc396f08ca88276fb91c66157
DIST FBGEMM-2022.07.16.tar.gz 744470 BLAKE2B
d1ee51ad72a22fb1b7abaefe330f70e27bc5d6dfda2587373d7e0209aef099ab10c8772612a9786fc2bd760f66154053b9e6c9a6b7f3c82ed2114536f7b30213
SHA512
7d245ea47c57c2da0555693624c45c8585aab5d1b171c9f3b909e140d9d0964cb9cf8f029c291c45f8070d5cfad6f7116e606fdd4120b2223279e39d4ba3f189
diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch
b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch
new file mode 100644
index ..cba259688d96
--- /dev/null
+++ b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch
@@ -0,0 +1,10 @@
+--- 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 {
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/FBGEMM/, dev-libs/FBGEMM/files/
commit: ff3bb714f637923918628adf1a7395df9101a55c
Author: Alfredo Tupone gentoo org>
AuthorDate: Tue May 24 07:01:02 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Tue May 24 07:01:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3bb714
dev-libs/FBGEMM: add to tree
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild | 47
dev-libs/FBGEMM/Manifest | 1 +
.../FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch| 65 ++
dev-libs/FBGEMM/metadata.xml | 11
4 files changed, 124 insertions(+)
diff --git a/dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild
b/dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild
new file mode 100644
index ..51c233d44e8d
--- /dev/null
+++ b/dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+CommitId=135412d2646f3bd753c8f1cfd33616110bbccd27
+
+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="test"
+
+DEPEND="
+ dev-libs/asmjit
+ dev-libs/cpuinfo
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+ rm test/RowWiseSparseAdagradFusedTest.cc || die
+ rm test/SparseAdagradTest.cc || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DFBGEMM_LIBRARY_TYPE=shared
+ -DFBGEMM_BUILD_BENCHMARKS=OFF
+ -DFBGEMM_BUILD_TESTS=$(usex test ON OFF)
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest
new file mode 100644
index ..397db1e2a3bd
--- /dev/null
+++ b/dev-libs/FBGEMM/Manifest
@@ -0,0 +1 @@
+DIST FBGEMM-2022.01.13.tar.gz 532297 BLAKE2B
bced7e1a1712351a87762e8d0a28ed3bbc5678c8ce70b440e769e53dc15f68e3ec8c89df9307f33da788bd376613720892493c0b519d3860a6e2edb48de1fdba
SHA512
a416c2c11b0e6798e0dbb376050ead79cb602cd4f0e41b6109eeefe3e939e410adf0ce828d1224a358eb8245a935cc431d8023ccc396f08ca88276fb91c66157
diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch
b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch
new file mode 100644
index ..e2aacd3f65ef
--- /dev/null
+++ b/dev-libs/FBGEMM/files/FBGEMM-2022.01.13-gentoo.patch
@@ -0,0 +1,65 @@
+--- a/CMakeLists.txt 2022-05-21 13:13:50.806813151 +0200
b/CMakeLists.txt 2022-05-21 13:16:46.448969453 +0200
+@@ -165,7 +165,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"
+@@ -184,7 +184,7 @@
+ set_property(TARGET asmjit PROPERTY POSITION_INDEPENDENT_CODE ON)
+ 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"
+@@ -261,7 +261,6 @@
+
+ target_link_libraries(fbgemm $
+ $)
+-add_dependencies(fbgemm asmjit cpuinfo)
+
+ install(TARGETS fbgemm EXPORT fbgemmLibraryConfig
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -268,6 +268,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)
+@@ -62,7 +62,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.cc2022-05-24 08:19:00.639462626 +0200
b/src/PackMatrix.cc2022-05-24 08:27:59.127720548 +0200
+@@ -30,6 +30,7 @@
+ }
+
+ template
++FBGEMM_API
+ int PackMatrix::packedBufferSize(
+ int rows,
