commit: 94af83db65c127f8c62e890f7b5b5d2d820b1108
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 20:47:07 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 20:47:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94af83db
sci-ml/XNNPACK: better fix src_test
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
...4.02.29.ebuild => XNNPACK-2024.02.29-r1.ebuild} | 38 ++++++++------------
...4.11.08.ebuild => XNNPACK-2024.11.08-r1.ebuild} | 42 ++++++----------------
.../XNNPACK/files/XNNPACK-2022.02.17-gentoo.patch | 12 -------
3 files changed, 25 insertions(+), 67 deletions(-)
diff --git a/sci-ml/XNNPACK/XNNPACK-2024.02.29.ebuild
b/sci-ml/XNNPACK/XNNPACK-2024.02.29-r1.ebuild
similarity index 87%
rename from sci-ml/XNNPACK/XNNPACK-2024.02.29.ebuild
rename to sci-ml/XNNPACK/XNNPACK-2024.02.29-r1.ebuild
index df861572d607..a5fd72f0c3d9 100644
--- a/sci-ml/XNNPACK/XNNPACK-2024.02.29.ebuild
+++ b/sci-ml/XNNPACK/XNNPACK-2024.02.29-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64"
IUSE="+assembly jit +memopt +sparse static-libs test"
RDEPEND="
- >=dev-libs/cpuinfo-2023.11.04
+ dev-libs/cpuinfo
dev-libs/pthreadpool
"
DEPEND="${RDEPEND}
@@ -31,28 +31,6 @@ BDEPEND="test? ( dev-cpp/gtest )"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( static-libs )"
-src_prepare() {
- dropTest=(
- fully-connected-test
- fully-connected-nc-test
- subgraph-fp16-test
- static-reshape-test
- qd8-f16-qc8w-gemm-minmax-test
- qd8-f32-qc8w-gemm-minmax-test
- qd8-f16-qc4w-gemm-minmax-test
- qd8-f32-qc4w-gemm-minmax-test
- )
- for id in ${dropTest[@]}
- do
- sed -i \
- -e "/ADD_TEST(NAME ${id}/d" \
- CMakeLists.txt \
- || die
- done
-
- cmake_src_prepare
-}
-
src_configure() {
# -Werror=lto-type-mismatch
# https://bugs.gentoo.org/933414
@@ -74,5 +52,17 @@ src_configure() {
)
cmake_src_configure
- cd "${BUILD_DIR}"
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ fully-connected-test
+ fully-connected-nc-test
+ subgraph-fp16-test
+ qd8-f16-qc8w-gemm-minmax-test
+ qd8-f32-qc8w-gemm-minmax-test
+ qd8-f16-qc4w-gemm-minmax-test
+ qd8-f32-qc4w-gemm-minmax-test
+ )
+ cmake_src_test
}
diff --git a/sci-ml/XNNPACK/XNNPACK-2024.11.08.ebuild
b/sci-ml/XNNPACK/XNNPACK-2024.11.08-r1.ebuild
similarity index 72%
rename from sci-ml/XNNPACK/XNNPACK-2024.11.08.ebuild
rename to sci-ml/XNNPACK/XNNPACK-2024.11.08-r1.ebuild
index 07fb67e6db37..86c6084cc83f 100644
--- a/sci-ml/XNNPACK/XNNPACK-2024.11.08.ebuild
+++ b/sci-ml/XNNPACK/XNNPACK-2024.11.08-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64"
IUSE="+assembly jit +memopt +sparse static-libs test"
RDEPEND="
- >=dev-libs/cpuinfo-2023.11.04
+ dev-libs/cpuinfo
dev-libs/pthreadpool
"
DEPEND="${RDEPEND}
@@ -33,36 +33,6 @@ REQUIRED_USE="test? ( static-libs )"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-src_prepare() {
- dropTest=(
- fully-connected-test
- fully-connected-nc-test
- subgraph-fp16-test
- static-reshape-test
- qd8-f16-qc8w-gemm-minmax-test
- qd8-f32-qc8w-gemm-minmax-test
- qd8-f16-qc4w-gemm-minmax-test
- qd8-f32-qc4w-gemm-minmax-test
- unary-elementwise-nc-test
- )
- for id in ${dropTest[@]}
- do
- sed -i \
- -e "/ADD_TEST(NAME ${id}/d" \
- CMakeLists.txt \
- || die
- done
- sed -i \
- -e "/f32-vrsubc/d" \
- -e "/f16-vsqr/d" \
- -e "/f16-vlrelu/d" \
- -e "/f32-f16-vcvt/d" \
- CMakeLists.txt \
- || die
-
- cmake_src_prepare
-}
-
src_configure() {
# -Werror=lto-type-mismatch
# https://bugs.gentoo.org/933414
@@ -84,3 +54,13 @@ src_configure() {
cmake_src_configure
}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ unary-elementwise-nc-test
+ f32-f16-vcvt-test
+ f16-vlrelu-test
+ f16-vsqr-test
+ )
+ cmake_src_test
+}
diff --git a/sci-ml/XNNPACK/files/XNNPACK-2022.02.17-gentoo.patch
b/sci-ml/XNNPACK/files/XNNPACK-2022.02.17-gentoo.patch
deleted file mode 100644
index f07ba08edf56..000000000000
--- a/sci-ml/XNNPACK/files/XNNPACK-2022.02.17-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt 2022-05-10 08:26:00.636788471 +0200
-+++ b/CMakeLists.txt 2022-05-10 08:26:57.097938381 +0200
-@@ -6696,9 +6696,6 @@
- # ---[ Build google test
- IF(NOT TARGET gtest)
- SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-- ADD_SUBDIRECTORY(
-- "${GOOGLETEST_SOURCE_DIR}"
-- "${CMAKE_BINARY_DIR}/googletest")
- ENDIF()
-
- ADD_LIBRARY(gemm-microkernel-tester STATIC test/gemm-microkernel-tester.cc)
