{"id":20004,"url":"https://patchwork.libcamera.org/api/1.1/patches/20004/?format=json","web_url":"https://patchwork.libcamera.org/patch/20004/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240507061016.1716450-2-paul.elder@ideasonboard.com>","date":"2024-05-07T06:10:14","name":"[v3,1/3] ipa: libipa: Add Matrix class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"42bfb9e622ef185d735f554f0a02de6829a05e02","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20004/mbox/","series":[{"id":4290,"url":"https://patchwork.libcamera.org/api/1.1/series/4290/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4290","date":"2024-05-07T06:10:13","name":"ipa: rkisp1: Add crosstalk algorithm","version":3,"mbox":"https://patchwork.libcamera.org/series/4290/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20004/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20004/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id A3A25C328F\n\tfor ;\n\tTue, 7 May 2024 06:10:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9FCF7633FA;\n\tTue, 7 May 2024 08:10:35 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 24047633DF\n\tfor ;\n\tTue, 7 May 2024 08:10:34 +0200 (CEST)","from neptunite.hamster-moth.ts.net\n\t(h175-177-049-156.catv02.itscom.jp [175.177.49.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 51DB83D5;\n\tTue, 7 May 2024 08:10:31 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"NSMqBq4P\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1715062232;\n\tbh=hwiBWuyMwn+gwH0q0udnQLs1JJLEaRP1aKYdzQZb3D0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=NSMqBq4PuE3VCdO52mtw4UExiRtgN+foRjQzQhYvnxu3ya72t0amhhaKEO+K0vESn\n\tIHxjtuFbHBq/16cBMYr919J1R5Oq5oU45TEZMZ2FLfoxRk3f0rfZO3lgIq8R71SnvB\n\tI06WzCtf3hxHB0g5IaEzi50VV2oLy5mkVsTPHvFI=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ","Subject":"[PATCH v3 1/3] ipa: libipa: Add Matrix class","Date":"Tue, 7 May 2024 15:10:14 +0900","Message-Id":"<20240507061016.1716450-2-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.39.2","In-Reply-To":"<20240507061016.1716450-1-paul.elder@ideasonboard.com>","References":"<20240507061016.1716450-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a class to represent a Matrix object and operations for adding\nmatrices, multipling a matrix by a scalar, and multiplying two matrices.\n\nSigned-off-by: Paul Elder \n---\nChanges in v3:\n- fix template parameters of operator* to allow different types for the\n scalar multiplier and the matrix's number type\n- clear data in constructors\n- fix assert in constructor\n\nChanges v2:\n- make rows and columns into template arguments\n- initialize to identity matrix on construction\n- add getter and setter\n- change from struct to class\n- fix matrix multiplication\n- clean up unused includes\n- avoid dereferencing an absent std::optional\n---\n src/ipa/libipa/matrix.cpp | 17 +++++\n src/ipa/libipa/matrix.h | 146 +++++++++++++++++++++++++++++++++++++\n src/ipa/libipa/meson.build | 2 +\n 3 files changed, 165 insertions(+)\n create mode 100644 src/ipa/libipa/matrix.cpp\n create mode 100644 src/ipa/libipa/matrix.h","diff":"diff --git a/src/ipa/libipa/matrix.cpp b/src/ipa/libipa/matrix.cpp\nnew file mode 100644\nindex 00000000..c222c3f0\n--- /dev/null\n+++ b/src/ipa/libipa/matrix.cpp\n@@ -0,0 +1,17 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2019, Raspberry Pi Ltd\n+ * Copyright (C) 2024, Paul Elder \n+ *\n+ * matrix.cpp - Matrix and related operations\n+ */\n+\n+#include \"matrix.h\"\n+\n+#include \n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(Matrix)\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/matrix.h b/src/ipa/libipa/matrix.h\nnew file mode 100644\nindex 00000000..bbdb838b\n--- /dev/null\n+++ b/src/ipa/libipa/matrix.h\n@@ -0,0 +1,146 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2019, Raspberry Pi Ltd\n+ * Copyright (C) 2024, Paul Elder \n+ *\n+ * matrix.cpp - Matrix and related operations\n+ */\n+#pragma once\n+\n+#include \n+#include \n+#include \n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(Matrix)\n+\n+namespace ipa {\n+\n+template> * = nullptr>\n+class Matrix\n+{\n+public:\n+\tMatrix()\n+\t{\n+\t\tdata_.clear();\n+\t\tfor (unsigned int i = 0; i < R; i++)\n+\t\t\tfor (unsigned int j = 0; j < C; j++)\n+\t\t\t\tdata_.push_back(static_cast(i == j));\n+\t};\n+\n+\tMatrix(const std::vector &data)\n+\t{\n+\t\tASSERT(data.size() == R * C);\n+\n+\t\tdata_.clear();\n+\t\tfor (const T &x : data)\n+\t\t\tdata_.push_back(x);\n+\t}\n+\n+\t~Matrix(){};\n+\n+\tint readYaml(const libcamera::YamlObject &yaml)\n+\t{\n+\t\tif (yaml.size() != R * C) {\n+\t\t\tLOG(Matrix, Error)\n+\t\t\t\t<< \"Wrong number of values in matrix: expected \"\n+\t\t\t\t<< R * C << \", got \" << yaml.size();\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tunsigned int i = 0;\n+\t\tfor (const auto &x : yaml.asList()) {\n+\t\t\tauto value = x.get();\n+\t\t\tif (!value) {\n+\t\t\t\tLOG(Matrix, Error) << \"Failed to read matrix value\";\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tdata_[i++] = *value;\n+\t\t}\n+\n+\t\treturn 0;\n+\t}\n+\n+\tconst std::string toString() const\n+\t{\n+\t\tstd::stringstream ss;\n+\t\tss << \"Matrix { \";\n+\t\tfor (unsigned int i = 0; i < R; i++) {\n+\t\t\tss << \"[ \";\n+\t\t\tfor (unsigned int j = 0; j < C; j++) {\n+\t\t\t\tss << get(i, j);\n+\t\t\t\tss << ((j + 1 < C) ? \", \" : \" \");\n+\t\t\t}\n+\t\t\tss << ((i + 1 < R) ? \"], \" : \"]\");\n+\t\t}\n+\t\tss << \" }\";\n+\n+\t\treturn ss.str();\n+\t}\n+\n+\tconst T &get(unsigned int i, unsigned int j) const { return data_.at(i * C + j); }\n+\tvoid set(unsigned int i, unsigned int j, T value) { data_[i * C + j] = value; }\n+\n+private:\n+\tstd::vector data_;\n+};\n+\n+template && std::is_arithmetic_v> * = nullptr>\n+Matrix operator*(T d, const Matrix &m)\n+{\n+\tMatrix result;\n+\n+\tfor (unsigned int i = 0; i < R; i++)\n+\t\tfor (unsigned int j = 0; j < C; j++)\n+\t\t\tresult.set(i, j, d * m.get(i, j));\n+\n+\treturn result;\n+}\n+\n+template && C1 == R2> * = nullptr>\n+Matrix operator*(const Matrix &m1, const Matrix &m2)\n+{\n+\tMatrix result;\n+\n+\tfor (unsigned int i = 0; i < R1; i++) {\n+\t\tfor (unsigned int j = 0; j < C2; j++) {\n+\t\t\tT sum = 0;\n+\n+\t\t\tfor (unsigned int k = 0; k < C1; k++)\n+\t\t\t\tsum += m1.get(i, k) * m2.get(k, j);\n+\n+\t\t\tresult.set(i, j, sum);\n+\t\t}\n+\t}\n+\n+\treturn result;\n+}\n+\n+template> * = nullptr>\n+Matrix operator+(const Matrix &m1, const Matrix &m2)\n+{\n+\tMatrix result;\n+\n+\tfor (unsigned int i = 0; i < R; i++)\n+\t\tfor (unsigned int j = 0; j < C; j++)\n+\t\t\tresult.set(i, j, m1.get(i, j) + m2.get(i, j));\n+\n+\treturn result;\n+}\n+\n+} /* namespace ipa */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build\nindex 1b3faf8d..1e34355f 100644\n--- a/src/ipa/libipa/meson.build\n+++ b/src/ipa/libipa/meson.build\n@@ -7,6 +7,7 @@ libipa_headers = files([\n 'exposure_mode_helper.h',\n 'fc_queue.h',\n 'histogram.h',\n+ 'matrix.h',\n 'module.h',\n 'pwl.h',\n ])\n@@ -18,6 +19,7 @@ libipa_sources = files([\n 'exposure_mode_helper.cpp',\n 'fc_queue.cpp',\n 'histogram.cpp',\n+ 'matrix.cpp',\n 'module.cpp',\n 'pwl.cpp'\n ])\n","prefixes":["v3","1/3"]}