From patchwork Fri Apr 5 08:40:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 19847 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 B2F3BC327C for ; Fri, 5 Apr 2024 08:41:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B869461C29; Fri, 5 Apr 2024 10:41:02 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="lT9b1yyj"; 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 580E261C21 for ; Fri, 5 Apr 2024 10:41:01 +0200 (CEST) Received: from pyrite.hamster-moth.ts.net (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E895463B; Fri, 5 Apr 2024 10:40:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1712306423; bh=3sLXFY+CIq9OnanWJwj9mKYaRM2wcu5JPatEZem3R/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lT9b1yyjFRoVs05dznfba6zU0DQs36nn9Hz2YINuORB82RZzZ2Db8O+C2znuJNxLs ecStF8IyN06Eg1QrT/c6BgYU7giFLiQzJZORjXMUAPxEedy6ot5rHPhLnlfmuNFWrB UcKj0tas5QTT56xkNkZYDMKtawmNwlwtUj3IweQw= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder Subject: [PATCH v2 1/3] ipa: libipa: Add Matrix class Date: Fri, 5 Apr 2024 17:40:48 +0900 Message-Id: <20240405084050.1919105-2-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240405084050.1919105-1-paul.elder@ideasonboard.com> References: <20240405084050.1919105-1-paul.elder@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" Add a class to represent a Matrix object and operations for adding matrices, multipling a matrix by a scalar, and multiplying two matrices. Signed-off-by: Paul Elder --- Changes in v2: - clean up unused includes - avoid dereferencing an absent std::optional --- src/ipa/libipa/matrix.cpp | 17 +++++ src/ipa/libipa/matrix.h | 136 +++++++++++++++++++++++++++++++++++++ src/ipa/libipa/meson.build | 2 + 3 files changed, 155 insertions(+) create mode 100644 src/ipa/libipa/matrix.cpp create mode 100644 src/ipa/libipa/matrix.h diff --git a/src/ipa/libipa/matrix.cpp b/src/ipa/libipa/matrix.cpp new file mode 100644 index 00000000..c222c3f0 --- /dev/null +++ b/src/ipa/libipa/matrix.cpp @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2019, Raspberry Pi Ltd + * Copyright (C) 2024, Paul Elder + * + * matrix.cpp - Matrix and related operations + */ + +#include "matrix.h" + +#include + +namespace libcamera { + +LOG_DEFINE_CATEGORY(Matrix) + +} /* namespace libcamera */ diff --git a/src/ipa/libipa/matrix.h b/src/ipa/libipa/matrix.h new file mode 100644 index 00000000..f5520260 --- /dev/null +++ b/src/ipa/libipa/matrix.h @@ -0,0 +1,136 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2019, Raspberry Pi Ltd + * Copyright (C) 2024, Paul Elder + * + * matrix.cpp - Matrix and related operations + */ +#pragma once + +#include +#include +#include + +#include + +#include "libcamera/internal/yaml_parser.h" + +namespace libcamera { + +LOG_DECLARE_CATEGORY(Matrix) + +namespace ipa { + +template +struct Matrix { +public: + Matrix(){}; + ~Matrix(){}; + + Matrix(const unsigned int &_rows, const unsigned int &_cols, + const std::vector &_data) + : rows(_rows), cols(_cols) + { + for (const T &x : _data) + data.push_back(x); + + while (rows * cols < data.size()) + data.push_back(0); + } + + int readYaml(unsigned int _rows, unsigned int _cols, + const libcamera::YamlObject &yaml) + { + rows = _rows; + cols = _cols; + + if (yaml.size() != rows * cols) { + LOG(Matrix, Error) + << "Wrong number of values in matrix: expected " + << rows * cols << ", got " << yaml.size(); + return -EINVAL; + } + + for (const auto &x : yaml.asList()) { + auto value = x.get(); + if (!value) { + LOG(Matrix, Error) << "Failed to read matrix value"; + return -EINVAL; + } + data.push_back(*value); + } + + return 0; + } + + const std::string toString() const + { + std::stringstream ss; + ss << "Matrix { "; + for (unsigned int i = 0; i < rows; i++) { + ss << "[ "; + for (unsigned int j = 0; j < cols; j++) { + ss << data[i * cols + j]; + ss << ((j + 1 < cols) ? ", " : " "); + } + ss << ((i + 1 < rows) ? "], " : "]"); + } + ss << " }"; + + return ss.str(); + } + + const T &operator[](unsigned int i) const { return data.at(i); } + + unsigned int rows; + unsigned int cols; + std::vector data; +}; + +template +Matrix operator*(T d, const Matrix &m) +{ + std::vector result(m.data.size()); + + for (const T &x : m.data) + result.push_back(d * x); + + return Matrix(m.rows, m.cols, result); +} + +template +Matrix operator*(const Matrix &m1, const Matrix &m2) +{ + ASSERT(m1.cols == m2.rows); + + std::vector result(m1.rows * m2.cols); + + for (unsigned int i = 0; i < m1.rows; i++) { + T sum = 0; + + for (unsigned int j = 0; j < m2.cols; j++) + sum += m1[i * m1.cols + j] * m2[j * m2.cols + i]; + + result.push_back(sum); + } + + return Matrix(m1.rows, m2.cols, result); +} + +template +Matrix operator+(const Matrix &m1, const Matrix &m2) +{ + ASSERT(m1.cols == m2.cols && m1.rows == m2.rows); + + unsigned int len = m1.rows * m1.cols; + std::vector result(len); + + for (unsigned int i = 0; i < len; i++) + result[i] = m1[i] + m2[i]; + + return Matrix(m1.rows, m1.cols, result); +} + +} /* namespace ipa */ + +} /* namespace libcamera */ diff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build index 817a09cf..5d5ba5e5 100644 --- a/src/ipa/libipa/meson.build +++ b/src/ipa/libipa/meson.build @@ -6,6 +6,7 @@ libipa_headers = files([ 'exposure_mode_helper.h', 'fc_queue.h', 'histogram.h', + 'matrix.h', 'module.h', 'pwl.h', ]) @@ -16,6 +17,7 @@ libipa_sources = files([ 'exposure_mode_helper.cpp', 'fc_queue.cpp', 'histogram.cpp', + 'matrix.cpp', 'module.cpp', 'pwl.cpp' ])