sci-libs/caffe2: fix xnnpack use

Resolve https://bugs.gentoo.org/943501 Signed-off-by: wangjiezhe <wangjiezhe@gmail.com>
wangjiezhe · Jan 3, 2025 · 9d0a0a6 · 9d0a0a6
1 parent f3c9405
commit 9d0a0a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/sci-libs/caffe2/caffe2-2.5.1-r4.ebuild b/sci-libs/caffe2/caffe2-2.5.1-r4.ebuild
@@ -146,6 +146,7 @@ PATCHES=(
 	# "${FILESDIR}"/${PN}-2.4.0-cutlass-3.5.0.patch
 	# "${FILESDIR}"/${PN}-2.4.1-cutlass-3.5.1.patch
 	"${FILESDIR}"/${P}-cuda.patch
+	"${FILESDIR}"/${P}-xnnpack.patch
 )
 
 src_prepare() {

diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-xnnpack.patch b/sci-libs/caffe2/files/caffe2-2.5.1-xnnpack.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index 44eed3a831b..a5dc9753bed 100644
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -569,7 +569,7 @@ if(USE_XNNPACK AND NOT USE_SYSTEM_XNNPACK)
+
+   include_directories(SYSTEM ${XNNPACK_INCLUDE_DIR})
+   list(APPEND Caffe2_DEPENDENCY_LIBS XNNPACK)
+-elseif(NOT TARGET XNNPACK AND USE_SYSTEM_XNNPACK)
++elseif(NOT TARGET XNNPACK AND USE_XNNPACK AND USE_SYSTEM_XNNPACK)
+   add_library(XNNPACK SHARED IMPORTED)
+   find_library(XNNPACK_LIBRARY XNNPACK)
+   set_property(TARGET XNNPACK PROPERTY IMPORTED_LOCATION "${XNNPACK_LIBRARY}")