Skip to content

Feature/mat refactor #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 17, 2025
Merged

Feature/mat refactor #72

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8aeb466
decomposed mutiplication
orange-cpp Sep 17, 2025
68ec42d
added space
orange-cpp Sep 17, 2025
874b028
removed unused var
orange-cpp Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 34 additions & 21 deletions include/omath/linear_algebra/mat.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,28 +155,11 @@ namespace omath
constexpr Mat<Rows, OtherColumns, Type, StoreType>
operator*(const Mat<Columns, OtherColumns, Type, StoreType>& other) const
{
Mat<Rows, OtherColumns, Type, StoreType> result;

if constexpr (StoreType == MatStoreType::ROW_MAJOR)
for (std::size_t i = 0; i < Rows; ++i)
for (std::size_t k = 0; k < Columns; ++k)
{
const Type aik = at(i, k);
for (std::size_t j = 0; j < OtherColumns; ++j)
result.at(i, j) += aik * other.at(k, j);
}
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
for (std::size_t j = 0; j < OtherColumns; ++j)
for (std::size_t k = 0; k < Columns; ++k)
{
const Type bkj = other.at(k, j);
for (std::size_t i = 0; i < Rows; ++i)
result.at(i, j) += at(i, k) * bkj;
}
else
std::unreachable();

return result;
return cache_friendly_multiply_row_major(other);
if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
return cache_friendly_multiply_col_major(other);
std::unreachable();
}

constexpr Mat& operator*=(const Type& f) noexcept
Expand Down Expand Up @@ -378,6 +361,36 @@ namespace omath

private:
std::array<Type, Rows * Columns> m_data;

template<size_t OtherColumns> [[nodiscard]]
constexpr Mat<Rows, OtherColumns, Type, MatStoreType::ROW_MAJOR>
cache_friendly_multiply_row_major(const Mat<Columns, OtherColumns, Type, MatStoreType::ROW_MAJOR>& other) const
{
Mat<Rows, OtherColumns, Type, MatStoreType::ROW_MAJOR> result;
for (std::size_t i = 0; i < Rows; ++i)
for (std::size_t k = 0; k < Columns; ++k)
{
const Type aik = at(i, k);
for (std::size_t j = 0; j < OtherColumns; ++j)
result.at(i, j) += aik * other.at(k, j);
}
return result;
}

template<size_t OtherColumns> [[nodiscard]]
constexpr Mat<Rows, OtherColumns, Type, MatStoreType::COLUMN_MAJOR> cache_friendly_multiply_col_major(
const Mat<Columns, OtherColumns, Type, MatStoreType::COLUMN_MAJOR>& other) const
{
Mat<Rows, OtherColumns, Type, MatStoreType::COLUMN_MAJOR> result;
for (std::size_t j = 0; j < OtherColumns; ++j)
for (std::size_t k = 0; k < Columns; ++k)
{
const Type bkj = other.at(k, j);
for (std::size_t i = 0; i < Rows; ++i)
result.at(i, j) += at(i, k) * bkj;
}
return result;
}
};

template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR> [[nodiscard]]
Expand Down
Loading