Patch Detail
Show a patch.
GET /api/1.1/patches/22040/?format=api
{ "id": 22040, "url": "https://patchwork.libcamera.org/api/1.1/patches/22040/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22040/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20241120142807.2093301-10-stefan.klug@ideasonboard.com>", "date": "2024-11-20T14:27:56", "name": "[v3,9/9] libipa: Drop Matrix class", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a9ba5829688d33e28c34d7e24ad53ac5a291cd5e", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/1.1/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/users/17/?format=api", "username": "epaul", "first_name": "Paul", "last_name": "Elder", "email": "paul.elder@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/22040/mbox/", "series": [ { "id": 4809, "url": "https://patchwork.libcamera.org/api/1.1/series/4809/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4809", "date": "2024-11-20T14:27:47", "name": "Move Matrix class from libipa to libcamera", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4809/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22040/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22040/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 B0503C330E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 20 Nov 2024 14:28:41 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 30E2965F7E;\n\tWed, 20 Nov 2024 15:28:41 +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 0213965F72\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 20 Nov 2024 15:28:37 +0100 (CET)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:bbd:82cc:f3f3:e12e])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D1697928;\n\tWed, 20 Nov 2024 15:28:18 +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=\"p7+GuAXu\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1732112898;\n\tbh=VD8EWJFf5tkybIjbEssIQunl80bc7lT62TlVQKJRdWs=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=p7+GuAXuEjiTPuB97xZaJ6/vzB3Rq0vuqOV+/RTrC6yBJP0E/aLDriA07f9uaDVrl\n\t+T7giiUP/inaYh1shywQyMDmrNnrbDX2Is6KXBXg4Q194zGMgyn3fjzzZgYEOl7X+F\n\taB93Ciasevnb0CAM+7II/3uPROQlPda0gwY/vG7I=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v3 9/9] libipa: Drop Matrix class", "Date": "Wed, 20 Nov 2024 15:27:56 +0100", "Message-ID": "<20241120142807.2093301-10-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20241120142807.2093301-1-stefan.klug@ideasonboard.com>", "References": "<20241120142807.2093301-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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "There are no users of the libipa::Matrix class anymore. Drop it.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/libipa/matrix.cpp | 149 ---------------------------\n src/ipa/libipa/matrix.h | 203 -------------------------------------\n src/ipa/libipa/meson.build | 2 -\n 3 files changed, 354 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 <paul.elder@ideasonboard.com>\n- *\n- * Matrix and related operations\n- */\n-\n-#include \"matrix.h\"\n-\n-#include <libcamera/base/log.h>\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<T> &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<const T, Cols> 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<T, Rows, Cols> &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<U, Rows, Cols> operator*(T d, const Matrix<U, Rows, Cols> &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<U, Rows, Cols> operator*(const Matrix<U, Rows, Cols> &m, T d)\n- * \\copydoc operator*(T d, const Matrix<U, Rows, Cols> &m)\n- */\n-\n-/**\n- * \\fn Matrix<T, R1, C2> operator*(const Matrix<T, R1, C1> &m1, const Matrix<T, R2, C2> &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<T, Rows, Cols> operator+(const Matrix<T, Rows, Cols> &m1, const Matrix<T, Rows, Cols> &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 <paul.elder@ideasonboard.com>\n- *\n- * Matrix and related operations\n- */\n-#pragma once\n-\n-#include <algorithm>\n-#include <sstream>\n-#include <vector>\n-\n-#include <libcamera/base/log.h>\n-#include <libcamera/base/span.h>\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<typename T, unsigned int Rows, unsigned int Cols,\n-\t std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr>\n-#else\n-template<typename T, unsigned int Rows, unsigned int Cols>\n-#endif /* __DOXYGEN__ */\n-class Matrix\n-{\n-public:\n-\tMatrix()\n-\t{\n-\t\tdata_.fill(static_cast<T>(0));\n-\t}\n-\n-\tMatrix(const std::vector<T> &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<T>(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<const T, Cols> operator[](size_t i) const\n-\t{\n-\t\treturn Span<const T, Cols>{ &data_.data()[i * Cols], Cols };\n-\t}\n-\n-\tSpan<T, Cols> operator[](size_t i)\n-\t{\n-\t\treturn Span<T, Cols>{ &data_.data()[i * Cols], Cols };\n-\t}\n-\n-#ifndef __DOXYGEN__\n-\ttemplate<typename U, std::enable_if_t<std::is_arithmetic_v<U>>>\n-#else\n-\ttemplate<typename U>\n-#endif /* __DOXYGEN__ */\n-\tMatrix<T, Rows, Cols> &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<T, Rows * Cols> data_;\n-};\n-\n-#ifndef __DOXYGEN__\n-template<typename T, typename U, unsigned int Rows, unsigned int Cols,\n-\t std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr>\n-#else\n-template<typename T, typename U, unsigned int Rows, unsigned int Cols>\n-#endif /* __DOXYGEN__ */\n-Matrix<U, Rows, Cols> operator*(T d, const Matrix<U, Rows, Cols> &m)\n-{\n-\tMatrix<U, Rows, Cols> 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<typename T, typename U, unsigned int Rows, unsigned int Cols,\n-\t std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr>\n-#else\n-template<typename T, typename U, unsigned int Rows, unsigned int Cols>\n-#endif /* __DOXYGEN__ */\n-Matrix<U, Rows, Cols> operator*(const Matrix<U, Rows, Cols> &m, T d)\n-{\n-\treturn d * m;\n-}\n-\n-#ifndef __DOXYGEN__\n-template<typename T,\n-\t unsigned int R1, unsigned int C1,\n-\t unsigned int R2, unsigned int C2,\n-\t std::enable_if_t<C1 == R2> * = nullptr>\n-#else\n-template<typename T, unsigned int R1, unsigned int C1, unsigned int R2, unsigned in C2>\n-#endif /* __DOXYGEN__ */\n-Matrix<T, R1, C2> operator*(const Matrix<T, R1, C1> &m1, const Matrix<T, R2, C2> &m2)\n-{\n-\tMatrix<T, R1, C2> 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<typename T, unsigned int Rows, unsigned int Cols>\n-Matrix<T, Rows, Cols> operator+(const Matrix<T, Rows, Cols> &m1, const Matrix<T, Rows, Cols> &m2)\n-{\n-\tMatrix<T, Rows, Cols> 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<typename T, unsigned int Rows, unsigned int Cols>\n-std::ostream &operator<<(std::ostream &out, const ipa::Matrix<T, Rows, Cols> &m)\n-{\n-\tout << m.toString();\n-\treturn out;\n-}\n-\n-template<typename T, unsigned int Rows, unsigned int Cols>\n-struct YamlObject::Getter<ipa::Matrix<T, Rows, Cols>> {\n-\tstd::optional<ipa::Matrix<T, Rows, Cols>> 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<T, Rows, Cols> 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<T>();\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 788d037a6fad..93ae25da5e83 100644\n--- a/src/ipa/libipa/meson.build\n+++ b/src/ipa/libipa/meson.build\n@@ -10,7 +10,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@@ -26,7 +25,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',\n", "prefixes": [ "v3", "9/9" ] }