Source: rocblas
Version: 5.5.1+dfsg-3
Severity: normal
Tags: patch
Control: block 1018679 by -1
Dear maintainer,
libmsgpack-dev's C++ bindings were split out to a separate binary
package -- libmsgpack-cxx-dev -- in 4.1.1-1 to follow upstream's
separation of the project. rocblas Build-Depends on libmsgpack-dev and
uses the C++ library, so it needs to switch to libmsgpack-cxx-dev.
The pending 6.x version of msgpack-cxx (currently in experimental) also
changed the CMake config name to msgpack-cxx. This has been accounted
for upstream.
I've attached a patch which addresses both of these points.
-- System Information:
Debian Release: trixie/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), (1,
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.6.13-amd64 (SMP w/4 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diffstat for rocblas-5.5.1+dfsg rocblas-5.5.1+dfsg
control | 2 -
patches/0020-msgpack-names.patch | 22 ++++++++++++++++++++
patches/0021-msgpack-cxx-support.patch | 35 +++++++++++++++++++++++++++++++++
patches/series | 2 +
5 files changed, 67 insertions(+), 1 deletion(-)
diff -Nru rocblas-5.5.1+dfsg/debian/control rocblas-5.5.1+dfsg/debian/control
--- rocblas-5.5.1+dfsg/debian/control 2023-09-19 04:28:14.000000000 -0400
+++ rocblas-5.5.1+dfsg/debian/control 2024-01-27 09:04:18.000000000 -0500
@@ -21,7 +21,7 @@
rocminfo,
patchelf,
rocm-cmake (>= 5.3.0),
- libmsgpack-dev,
+ libmsgpack-cxx-dev,
libblas-dev,
libgtest-dev
Build-Depends-Indep: dh-sequence-sphinxdoc <!nodoc>,
diff -Nru rocblas-5.5.1+dfsg/debian/patches/0020-msgpack-names.patch
rocblas-5.5.1+dfsg/debian/patches/0020-msgpack-names.patch
--- rocblas-5.5.1+dfsg/debian/patches/0020-msgpack-names.patch 1969-12-31
19:00:00.000000000 -0500
+++ rocblas-5.5.1+dfsg/debian/patches/0020-msgpack-names.patch 2024-01-27
09:04:20.000000000 -0500
@@ -0,0 +1,22 @@
+From c1fa5b358d8cbe601754ef5ea4b695d895a34f62 Mon Sep 17 00:00:00 2001
+From: Torre Zuk <42548444+torre...@users.noreply.github.com>
+Date: Tue, 28 Nov 2023 09:02:43 -0700
+Subject: [PATCH] fix for newer windows vcpkg msgpack (#1827)
+
+---
+ Tensile/Source/lib/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Tensile/Source/lib/CMakeLists.txt
b/Tensile/Source/lib/CMakeLists.txt
+index f8cc527c83..d3f4b697fb 100644
+--- a/tensile/Tensile/Source/lib/CMakeLists.txt
++++ b/tensile/Tensile/Source/lib/CMakeLists.txt
+@@ -98,7 +98,7 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+ endif()
+
+ if(TENSILE_USE_MSGPACK)
+- find_package(msgpack REQUIRED)
++ find_package(msgpack REQUIRED NAMES msgpack msgpack-c)
+ target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
+
+ if(TARGET msgpackc-cxx)
diff -Nru rocblas-5.5.1+dfsg/debian/patches/0021-msgpack-cxx-support.patch
rocblas-5.5.1+dfsg/debian/patches/0021-msgpack-cxx-support.patch
--- rocblas-5.5.1+dfsg/debian/patches/0021-msgpack-cxx-support.patch
1969-12-31 19:00:00.000000000 -0500
+++ rocblas-5.5.1+dfsg/debian/patches/0021-msgpack-cxx-support.patch
2024-01-27 09:04:20.000000000 -0500
@@ -0,0 +1,35 @@
+From 0d942a6a8bfa8557171716dbcc1236adc806c9c5 Mon Sep 17 00:00:00 2001
+From: Torre Zuk <42548444+torre...@users.noreply.github.com>
+Date: Wed, 6 Dec 2023 13:14:49 -0700
+Subject: [PATCH] another vcpkg version package name fix (#1836)
+
+* more vcpkg package options
+
+---------
+
+Co-authored-by: Zuk <torre...@amd.com>
+---
+ Tensile/Source/lib/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Tensile/Source/lib/CMakeLists.txt
b/Tensile/Source/lib/CMakeLists.txt
+index d3f4b697fb..3fa647d6ec 100644
+--- a/tensile/Tensile/Source/lib/CMakeLists.txt
++++ b/tensile/Tensile/Source/lib/CMakeLists.txt
+@@ -98,13 +98,15 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+ endif()
+
+ if(TENSILE_USE_MSGPACK)
+- find_package(msgpack REQUIRED NAMES msgpack msgpack-c)
++ find_package(msgpack REQUIRED NAMES msgpack msgpack-cxx msgpack-c)
+ target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
+
+ if(TARGET msgpackc-cxx)
+ get_target_property(msgpack_inc msgpackc-cxx
INTERFACE_INCLUDE_DIRECTORIES)
+ elseif(TARGET msgpackc)
+ get_target_property(msgpack_inc msgpackc
INTERFACE_INCLUDE_DIRECTORIES)
++ elseif(TARGET msgpack-cxx)
++ get_target_property(msgpack_inc msgpack-cxx
INTERFACE_INCLUDE_DIRECTORIES)
+ endif()
+
+ if(DEFINED msgpack_inc)
diff -Nru rocblas-5.5.1+dfsg/debian/patches/series
rocblas-5.5.1+dfsg/debian/patches/series
--- rocblas-5.5.1+dfsg/debian/patches/series 2023-09-19 04:28:14.000000000
-0400
+++ rocblas-5.5.1+dfsg/debian/patches/series 2024-01-27 09:04:20.000000000
-0500
@@ -17,3 +17,5 @@
0017-print-kernel-name-for-missing-attribute-error.patch
0018-verbose-tensile-source-kernel-build.patch
0019-remove-x86-intrinsics.patch
+0020-msgpack-names.patch
+0021-msgpack-cxx-support.patch
