On Fri, Nov 01, 2024 at 09:31:29AM +0800, Bo YU wrote:
I have tested the patch on my Unmatched.
Oops, I uploaded my old patch, so please ignore the patch in previous email. this one is right.
diff -Nru onednn-3.5.3/debian/changelog onednn-3.5.3/debian/changelog
--- onednn-3.5.3/debian/changelog 2024-10-30 12:17:58.000000000 +0800
+++ onednn-3.5.3/debian/changelog 2024-10-31 16:45:53.000000000 +0800
@@ -1,3 +1,11 @@
+onednn (3.5.3-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS on riscv64. (Closes: #-1)
+ * Build on riscv64 with default toolchain.
+
+ -- Bo YU <tsu.y...@gmail.com> Thu, 31 Oct 2024 16:45:53 +0800
+
onednn (3.5.3-4) unstable; urgency=medium
* Team upload.
diff -Nru onednn-3.5.3/debian/control onednn-3.5.3/debian/control
--- onednn-3.5.3/debian/control 2024-10-28 20:11:30.000000000 +0800
+++ onednn-3.5.3/debian/control 2024-10-31 16:45:53.000000000 +0800
@@ -8,7 +8,6 @@
libtbb-dev,
ninja-build,
libsimde-dev (>= 0.7.0),
- clang [riscv64],
Standards-Version: 4.7.0
Homepage: https://github.com/oneapi-src/oneDNN
Rules-Requires-Root: no
diff -Nru onednn-3.5.3/debian/patches/disable-rvv-riscv64.patch
onednn-3.5.3/debian/patches/disable-rvv-riscv64.patch
--- onednn-3.5.3/debian/patches/disable-rvv-riscv64.patch 1970-01-01
08:00:00.000000000 +0800
+++ onednn-3.5.3/debian/patches/disable-rvv-riscv64.patch 2024-10-31
16:45:53.000000000 +0800
@@ -0,0 +1,19 @@
+Description: not enable DNNL_RISCV_USE_RVV_INTRINSICS
+Author: Bo YU <tsu.y...@gmail.com>
+Forwarded: not-needed
+Last-Update: 2024-10-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: b/cmake/platform.cmake
+===================================================================
+--- a/cmake/platform.cmake
++++ b/cmake/platform.cmake
+@@ -434,7 +434,7 @@
+ set(CAN_COMPILE_RVV_INTRINSICS FALSE)
+ endif()
+
+- set(DNNL_RISCV_USE_RVV_INTRINSICS ${CAN_COMPILE_RVV_INTRINSICS})
++ #set(DNNL_RISCV_USE_RVV_INTRINSICS ${CAN_COMPILE_RVV_INTRINSICS})
+ if (${DNNL_RISCV_USE_RVV_INTRINSICS})
+ add_definitions(-DDNNL_RISCV_USE_RVV_INTRINSICS)
+ endif()
diff -Nru onednn-3.5.3/debian/patches/series onednn-3.5.3/debian/patches/series
--- onednn-3.5.3/debian/patches/series 2024-09-12 21:34:38.000000000 +0800
+++ onednn-3.5.3/debian/patches/series 2024-10-31 16:44:20.000000000 +0800
@@ -1 +1,2 @@
add-primitive-header-on-rv64.patch
+disable-rvv-riscv64.patch
diff -Nru onednn-3.5.3/debian/rules onednn-3.5.3/debian/rules
--- onednn-3.5.3/debian/rules 2024-10-30 12:13:47.000000000 +0800
+++ onednn-3.5.3/debian/rules 2024-10-31 16:45:53.000000000 +0800
@@ -6,13 +6,6 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
#export CLICOLOR_FORCE=ON
-# riscv64 related, see #1080206
-ifeq ($(DEB_BUILD_ARCH), riscv64)
-export DEB_BUILD_MAINT_OPTIONS += optimize=-lto
-export CC=clang
-export CXX=clang++
-endif
-
# tests can take ~60% build time
BUILD_TEST=OFF
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
signature.asc
Description: PGP signature
