{"id":21959,"url":"https://patchwork.libcamera.org/api/1.1/patches/21959/?format=json","web_url":"https://patchwork.libcamera.org/patch/21959/","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":"<20241118150528.1856797-5-stefan.klug@ideasonboard.com>","date":"2024-11-18T15:05:07","name":"[4/4] libipa: Remove Matrix class from libipa","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a9627b26608d12e450d9a136755bb2de7b0c6fa5","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21959/mbox/","series":[{"id":4797,"url":"https://patchwork.libcamera.org/api/1.1/series/4797/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4797","date":"2024-11-18T15:05:03","name":"Move Matrix class from libipa to libcamera","version":1,"mbox":"https://patchwork.libcamera.org/series/4797/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21959/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21959/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 14FC6C32EF\n\tfor ;\n\tMon, 18 Nov 2024 15:05:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8DA01658E5;\n\tMon, 18 Nov 2024 16:05:56 +0100 (CET)","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 E9EBB658E7\n\tfor ;\n\tMon, 18 Nov 2024 16:05:53 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:4424:4869:bb88:5c61])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E6155316;\n\tMon, 18 Nov 2024 16:05:36 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"uJd8G1uA\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1731942337;\n\tbh=+C930OzhSf2VC1TlwBSXsGcAWjhAf4zUaPM1q1MlTTw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=uJd8G1uAQR66qSpvzU9y5KBQ9hbfeVkpzuGP5tlmuTzNQ6uIcUeWdcGH60OFR6Bo6\n\tQ3JmXGlTvG91X6gHYVcIRX8jqg4yx96zyYBZfx9CFG+uMYavcpuy8ckVFxul2zb4LO\n\tnzzUv/YeNBHnHlxgUn7intOd9cRSflBaQP3Pgwgw=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH 4/4] libipa: Remove Matrix class from libipa","Date":"Mon, 18 Nov 2024 16:05:07 +0100","Message-ID":"<20241118150528.1856797-5-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20241118150528.1856797-1-stefan.klug@ideasonboard.com>","References":"<20241118150528.1856797-1-stefan.klug@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":"Now, that the matrix class in libcamera is in place, use it in all\nplaces where the libipa::Matrix class was used and drop the latter.\n\nSigned-off-by: Stefan Klug \n---\n src/ipa/libipa/matrix.cpp | 149 -----------------------\n src/ipa/libipa/matrix.h | 203 --------------------------------\n src/ipa/libipa/meson.build | 2 -\n src/ipa/libipa/vector.h | 3 +-\n src/ipa/rkisp1/algorithms/ccm.h | 3 +-\n src/ipa/rkisp1/ipa_context.h | 2 +-\n 6 files changed, 4 insertions(+), 358 deletions(-)\n delete mode 100644 src/ipa/libipa/matrix.cpp\n delete mode 100644 src/ipa/libipa/matrix.h","diff":"diff --git a/src/ipa/libipa/matrix.cpp b/src/ipa/libipa/matrix.cpp\ndeleted file mode 100644\nindex 8346f0d34160..000000000000\n--- a/src/ipa/libipa/matrix.cpp\n+++ /dev/null\n@@ -1,149 +0,0 @@\n-/* SPDX-License-Identifier: LGPL-2.1-or-later */\n-/*\n- * Copyright (C) 2024, Paul Elder \n- *\n- * Matrix and related operations\n- */\n-\n-#include \"matrix.h\"\n-\n-#include \n-\n-/**\n- * \\file matrix.h\n- * \\brief Matrix class\n- */\n-\n-namespace libcamera {\n-\n-LOG_DEFINE_CATEGORY(Matrix)\n-\n-namespace ipa {\n-\n-/**\n- * \\class Matrix\n- * \\brief Matrix class\n- * \\tparam T Type of numerical values to be stored in the matrix\n- * \\tparam Rows Number of rows in the matrix\n- * \\tparam Cols Number of columns in the matrix\n- */\n-\n-/**\n- * \\fn Matrix::Matrix()\n- * \\brief Construct a zero matrix\n- */\n-\n-/**\n- * \\fn Matrix::Matrix(const std::vector &data)\n- * \\brief Construct a matrix from supplied data\n- * \\param[in] data Data from which to construct a matrix\n- *\n- * \\a data is a one-dimensional vector and will be turned into a matrix in\n- * row-major order. The size of \\a data must be equal to the product of the\n- * number of rows and columns of the matrix (Rows x Cols).\n- */\n-\n-/**\n- * \\fn Matrix::identity()\n- * \\brief Construct an identity matrix\n- */\n-\n-/**\n- * \\fn Matrix::toString()\n- * \\brief Assemble and return a string describing the matrix\n- * \\return A string describing the matrix\n- */\n-\n-/**\n- * \\fn Span Matrix::operator[](size_t i) const\n- * \\brief Index to a row in the matrix\n- * \\param[in] i Index of row to retrieve\n- *\n- * This operator[] returns a Span, which can then be indexed into again with\n- * another operator[], allowing a convenient m[i][j] to access elements of the\n- * matrix. Note that the lifetime of the Span returned by this first-level\n- * operator[] is bound to that of the Matrix itself, so it is not recommended\n- * to save the Span that is the result of this operator[].\n- *\n- * \\return Row \\a i from the matrix, as a Span\n- */\n-\n-/**\n- * \\fn Matrix::operator[](size_t i)\n- * \\copydoc Matrix::operator[](size_t i) const\n- */\n-\n-/**\n- * \\fn Matrix &Matrix::operator*=(U d)\n- * \\brief Multiply the matrix by a scalar in-place\n- * \\tparam U Type of the numerical scalar value\n- * \\param d The scalar multiplier\n- * \\return Product of this matrix and scalar \\a d\n- */\n-\n-/**\n- * \\fn Matrix::Matrix operator*(T d, const Matrix &m)\n- * \\brief Multiply the matrix by a scalar\n- * \\tparam T Type of the numerical scalar value\n- * \\tparam U Type of numerical values in the matrix\n- * \\tparam Rows Number of rows in the matrix\n- * \\tparam Cols Number of columns in the matrix\n- * \\param d The scalar multiplier\n- * \\param m The matrix\n- * \\return Product of scalar \\a d and matrix \\a m\n- */\n-\n-/**\n- * \\fn Matrix::Matrix operator*(const Matrix &m, T d)\n- * \\copydoc operator*(T d, const Matrix &m)\n- */\n-\n-/**\n- * \\fn Matrix operator*(const Matrix &m1, const Matrix &m2)\n- * \\brief Matrix multiplication\n- * \\tparam T Type of numerical values in the matrices\n- * \\tparam R1 Number of rows in the first matrix\n- * \\tparam C1 Number of columns in the first matrix\n- * \\tparam R2 Number of rows in the second matrix\n- * \\tparam C2 Number of columns in the second matrix\n- * \\param m1 Multiplicand matrix\n- * \\param m2 Multiplier matrix\n- * \\return Matrix product of matrices \\a m1 and \\a m2\n- */\n-\n-/**\n- * \\fn Matrix operator+(const Matrix &m1, const Matrix &m2)\n- * \\brief Matrix addition\n- * \\tparam T Type of numerical values in the matrices\n- * \\tparam Rows Number of rows in the matrices\n- * \\tparam Cols Number of columns in the matrices\n- * \\param m1 Summand matrix\n- * \\param m2 Summand matrix\n- * \\return Matrix sum of matrices \\a m1 and \\a m2\n- */\n-\n-#ifndef __DOXYGEN__\n-/*\n- * The YAML data shall be a list of numerical values. Its size shall be equal\n- * to the product of the number of rows and columns of the matrix (Rows x\n- * Cols). The values shall be stored in row-major order.\n- */\n-bool matrixValidateYaml(const YamlObject &obj, unsigned int size)\n-{\n-\tif (!obj.isList())\n-\t\treturn false;\n-\n-\tif (obj.size() != size) {\n-\t\tLOG(Matrix, Error)\n-\t\t\t<< \"Wrong number of values in matrix: expected \"\n-\t\t\t<< size << \", got \" << obj.size();\n-\t\treturn false;\n-\t}\n-\n-\treturn true;\n-}\n-#endif /* __DOXYGEN__ */\n-\n-} /* namespace ipa */\n-\n-} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/matrix.h b/src/ipa/libipa/matrix.h\ndeleted file mode 100644\nindex 5471e6975b74..000000000000\n--- a/src/ipa/libipa/matrix.h\n+++ /dev/null\n@@ -1,203 +0,0 @@\n-/* SPDX-License-Identifier: LGPL-2.1-or-later */\n-/*\n- * Copyright (C) 2024, Paul Elder \n- *\n- * Matrix and related operations\n- */\n-#pragma once\n-\n-#include \n-#include \n-#include \n-\n-#include \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-#ifndef __DOXYGEN__\n-template> * = nullptr>\n-#else\n-template\n-#endif /* __DOXYGEN__ */\n-class Matrix\n-{\n-public:\n-\tMatrix()\n-\t{\n-\t\tdata_.fill(static_cast(0));\n-\t}\n-\n-\tMatrix(const std::vector &data)\n-\t{\n-\t\tstd::copy(data.begin(), data.end(), data_.begin());\n-\t}\n-\n-\tstatic Matrix identity()\n-\t{\n-\t\tMatrix ret;\n-\t\tfor (size_t i = 0; i < std::min(Rows, Cols); i++)\n-\t\t\tret[i][i] = static_cast(1);\n-\t\treturn ret;\n-\t}\n-\n-\t~Matrix() = default;\n-\n-\tconst std::string toString() const\n-\t{\n-\t\tstd::stringstream out;\n-\n-\t\tout << \"Matrix { \";\n-\t\tfor (unsigned int i = 0; i < Rows; i++) {\n-\t\t\tout << \"[ \";\n-\t\t\tfor (unsigned int j = 0; j < Cols; j++) {\n-\t\t\t\tout << (*this)[i][j];\n-\t\t\t\tout << ((j + 1 < Cols) ? \", \" : \" \");\n-\t\t\t}\n-\t\t\tout << ((i + 1 < Rows) ? \"], \" : \"]\");\n-\t\t}\n-\t\tout << \" }\";\n-\n-\t\treturn out.str();\n-\t}\n-\n-\tSpan operator[](size_t i) const\n-\t{\n-\t\treturn Span{ &data_.data()[i * Cols], Cols };\n-\t}\n-\n-\tSpan operator[](size_t i)\n-\t{\n-\t\treturn Span{ &data_.data()[i * Cols], Cols };\n-\t}\n-\n-#ifndef __DOXYGEN__\n-\ttemplate>>\n-#else\n-\ttemplate\n-#endif /* __DOXYGEN__ */\n-\tMatrix &operator*=(U d)\n-\t{\n-\t\tfor (unsigned int i = 0; i < Rows * Cols; i++)\n-\t\t\tdata_[i] *= d;\n-\t\treturn *this;\n-\t}\n-\n-private:\n-\tstd::array data_;\n-};\n-\n-#ifndef __DOXYGEN__\n-template> * = nullptr>\n-#else\n-template\n-#endif /* __DOXYGEN__ */\n-Matrix operator*(T d, const Matrix &m)\n-{\n-\tMatrix result;\n-\n-\tfor (unsigned int i = 0; i < Rows; i++) {\n-\t\tfor (unsigned int j = 0; j < Cols; j++)\n-\t\t\tresult[i][j] = d * m[i][j];\n-\t}\n-\n-\treturn result;\n-}\n-\n-#ifndef __DOXYGEN__\n-template> * = nullptr>\n-#else\n-template\n-#endif /* __DOXYGEN__ */\n-Matrix operator*(const Matrix &m, T d)\n-{\n-\treturn d * m;\n-}\n-\n-#ifndef __DOXYGEN__\n-template * = nullptr>\n-#else\n-template\n-#endif /* __DOXYGEN__ */\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[i][k] * m2[k][j];\n-\n-\t\t\tresult[i][j] = sum;\n-\t\t}\n-\t}\n-\n-\treturn result;\n-}\n-\n-template\n-Matrix operator+(const Matrix &m1, const Matrix &m2)\n-{\n-\tMatrix result;\n-\n-\tfor (unsigned int i = 0; i < Rows; i++) {\n-\t\tfor (unsigned int j = 0; j < Cols; j++)\n-\t\t\tresult[i][j] = m1[i][j] + m2[i][j];\n-\t}\n-\n-\treturn result;\n-}\n-\n-#ifndef __DOXYGEN__\n-bool matrixValidateYaml(const YamlObject &obj, unsigned int size);\n-#endif /* __DOXYGEN__ */\n-\n-} /* namespace ipa */\n-\n-#ifndef __DOXYGEN__\n-template\n-std::ostream &operator<<(std::ostream &out, const ipa::Matrix &m)\n-{\n-\tout << m.toString();\n-\treturn out;\n-}\n-\n-template\n-struct YamlObject::Getter> {\n-\tstd::optional> get(const YamlObject &obj) const\n-\t{\n-\t\tif (!ipa::matrixValidateYaml(obj, Rows * Cols))\n-\t\t\treturn std::nullopt;\n-\n-\t\tipa::Matrix matrix;\n-\t\tT *data = &matrix[0][0];\n-\n-\t\tunsigned int i = 0;\n-\t\tfor (const YamlObject &entry : obj.asList()) {\n-\t\t\tconst auto value = entry.get();\n-\t\t\tif (!value)\n-\t\t\t\treturn std::nullopt;\n-\n-\t\t\tdata[i++] = *value;\n-\t\t}\n-\n-\t\treturn matrix;\n-\t}\n-};\n-#endif /* __DOXYGEN__ */\n-\n-} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build\nindex e78cbcd63633..84cf0c9a00d8 100644\n--- a/src/ipa/libipa/meson.build\n+++ b/src/ipa/libipa/meson.build\n@@ -9,7 +9,6 @@ libipa_headers = files([\n 'histogram.h',\n 'interpolator.h',\n 'lsc_polynomial.h',\n- 'matrix.h',\n 'module.h',\n 'pwl.h',\n 'vector.h',\n@@ -24,7 +23,6 @@ libipa_sources = files([\n 'histogram.cpp',\n 'interpolator.cpp',\n 'lsc_polynomial.cpp',\n- 'matrix.cpp',\n 'module.cpp',\n 'pwl.cpp',\n 'vector.cpp',\ndiff --git a/src/ipa/libipa/vector.h b/src/ipa/libipa/vector.h\nindex 8612a06a2ab2..b4aec8ceeeed 100644\n--- a/src/ipa/libipa/vector.h\n+++ b/src/ipa/libipa/vector.h\n@@ -14,10 +14,9 @@\n #include \n #include \n \n+#include \"libcamera/internal/matrix.h\"\n #include \"libcamera/internal/yaml_parser.h\"\n \n-#include \"matrix.h\"\n-\n namespace libcamera {\n \n LOG_DECLARE_CATEGORY(Vector)\ndiff --git a/src/ipa/rkisp1/algorithms/ccm.h b/src/ipa/rkisp1/algorithms/ccm.h\nindex 46a1416e6be5..a5d9a9a45e5d 100644\n--- a/src/ipa/rkisp1/algorithms/ccm.h\n+++ b/src/ipa/rkisp1/algorithms/ccm.h\n@@ -9,8 +9,9 @@\n \n #include \n \n+#include \"libcamera/internal/matrix.h\"\n+\n #include \"libipa/interpolator.h\"\n-#include \"libipa/matrix.h\"\n \n #include \"algorithm.h\"\n \ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 7b93a9e9461d..12b37d1c73b0 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -21,10 +21,10 @@\n #include \n \n #include \"libcamera/internal/debug_controls.h\"\n+#include \"libcamera/internal/matrix.h\"\n \n #include \n #include \n-#include \n \n namespace libcamera {\n \n","prefixes":["4/4"]}