From patchwork Thu Apr 3 15:49:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 23123 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D7302C327D for ; Thu, 3 Apr 2025 15:49:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 92682689F4; Thu, 3 Apr 2025 17:49:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="B5veR5re"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C4E3D689B0 for ; Thu, 3 Apr 2025 17:49:55 +0200 (CEST) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:6d9d:9854:3fc1:4bb2]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 230168FA; Thu, 3 Apr 2025 17:48:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1743695282; bh=mtbnJFQv/Y2YhJwnkiiTJr0KzlkWp0aEySUOnnfgGe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B5veR5reK9otmbwpaB9BZp6Rb1kR5lyDcMsCJjRi0SWjibBe5A8dz/TMMQ6mqnDNp gpv8T5iZW6oGdroGXbWUE13Rmfs+YtL4goaSmx9sfCWmBaapLA21bPlvVRQCSPKSBk 07WP0FIkvSEkXi3+IX8j6ccQh/JWc6gzG/UH0rAM= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug , Laurent Pinchart , Kieran Bingham Subject: [PATCH v3 07/16] libcamera: matrix: Extend multiplication operator to heterogenous types Date: Thu, 3 Apr 2025 17:49:12 +0200 Message-ID: <20250403154925.382973-8-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250403154925.382973-1-stefan.klug@ideasonboard.com> References: <20250403154925.382973-1-stefan.klug@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Laurent Pinchart It is useful to multiply matrices of heterogneous types, for instance float and double. Extend the multiplication operator to support this, avoiding the need to convert one of the matrices. The type of the returned matrix is selected automatically to avoid loosing precision. Signed-off-by: Laurent Pinchart Signed-off-by: Stefan Klug Acked-by: Kieran Bingham --- Changes in v2: - Added this patch Changes in v3: - Added my SoB tag - Collected tags --- include/libcamera/internal/matrix.h | 10 ++++++---- src/libcamera/matrix.cpp | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/libcamera/internal/matrix.h b/include/libcamera/internal/matrix.h index a07a47701336..47513b9950e4 100644 --- a/include/libcamera/internal/matrix.h +++ b/include/libcamera/internal/matrix.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -152,15 +153,16 @@ Matrix operator*(const Matrix &m, T d) return d * m; } -template -constexpr Matrix operator*(const Matrix &m1, const Matrix &m2) +template +constexpr Matrix, R1, C2> operator*(const Matrix &m1, + const Matrix &m2) { static_assert(C1 == R2, "Matrix dimensions must match for multiplication"); - Matrix result; + Matrix, R1, C2> result; for (unsigned int i = 0; i < R1; i++) { for (unsigned int j = 0; j < C2; j++) { - T sum = 0; + std::common_type_t sum = 0; for (unsigned int k = 0; k < C1; k++) sum += m1[i][k] * m2[k][j]; diff --git a/src/libcamera/matrix.cpp b/src/libcamera/matrix.cpp index 68fc1b7bd5ac..ed22263b58f8 100644 --- a/src/libcamera/matrix.cpp +++ b/src/libcamera/matrix.cpp @@ -138,11 +138,12 @@ LOG_DEFINE_CATEGORY(Matrix) */ /** - * \fn Matrix operator*(const Matrix &m1, const Matrix &m2) + * \fn operator*(const Matrix &m1, const Matrix &m2) * \brief Matrix multiplication - * \tparam T Type of numerical values in the matrices + * \tparam T1 Type of numerical values in the first matrix * \tparam R1 Number of rows in the first matrix * \tparam C1 Number of columns in the first matrix + * \tparam T2 Type of numerical values in the secont matrix * \tparam R2 Number of rows in the second matrix * \tparam C2 Number of columns in the second matrix * \param m1 Multiplicand matrix