Skip to content
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

Feat: Dedicated row and column getters #140

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+192 −55
Draft

Feat: Dedicated row and column getters #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion frontend/array_cmath/include/algebra/array_cmath.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ namespace getter {
/// @{

using cmath::storage::block;
using cmath::storage::column;
using cmath::storage::element;
using cmath::storage::row;
using cmath::storage::set_block;
using cmath::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/eigen_eigen/include/algebra/eigen_eigen.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ namespace getter {
/// @{

using eigen::storage::block;
using eigen::storage::column;
using eigen::storage::element;
using eigen::storage::row;
using eigen::storage::set_block;
using eigen::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/eigen_generic/include/algebra/eigen_generic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ namespace getter {
/// @{

using eigen::storage::block;
using eigen::storage::column;
using eigen::storage::element;
using eigen::storage::row;
using eigen::storage::set_block;
using eigen::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/fastor_fastor/include/algebra/fastor_fastor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ namespace getter {
/// @{

using fastor::storage::block;
using fastor::storage::column;
using fastor::storage::element;
using fastor::storage::row;
using fastor::storage::set_block;
using fastor::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/smatrix_generic/include/algebra/smatrix_generic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ namespace getter {
/// @{

using smatrix::storage::block;
using smatrix::storage::column;
using smatrix::storage::element;
using smatrix::storage::row;
using smatrix::storage::set_block;
using smatrix::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/smatrix_smatrix/include/algebra/smatrix_smatrix.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ namespace getter {
/// @{

using smatrix::storage::block;
using smatrix::storage::column;
using smatrix::storage::element;
using smatrix::storage::row;
using smatrix::storage::set_block;
using smatrix::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/vc_aos/include/algebra/vc_aos.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ namespace getter {
/// @{

using vc_aos::storage::block;
using vc_aos::storage::column;
using vc_aos::storage::element;
using vc_aos::storage::row;
using vc_aos::storage::set_block;
using vc_aos::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/vc_aos_generic/include/algebra/vc_aos_generic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ namespace getter {
/// @{

using vc_aos::storage::block;
using vc_aos::storage::column;
using vc_aos::storage::element;
using vc_aos::storage::row;
using vc_aos::storage::set_block;
using vc_aos::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/vc_soa/include/algebra/vc_soa.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ namespace getter {
/// @{

using vc_soa::storage::block;
using vc_soa::storage::column;
using vc_soa::storage::element;
using vc_soa::storage::row;
using vc_soa::storage::set_block;
using vc_soa::storage::vector;

/// @}

Expand Down
3 changes: 2 additions & 1 deletion frontend/vecmem_cmath/include/algebra/vecmem_cmath.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ namespace getter {
/// @{

using cmath::storage::block;
using cmath::storage::column;
using cmath::storage::element;
using cmath::storage::row;
using cmath::storage::set_block;
using cmath::storage::vector;

/// @}

Expand Down
41 changes: 36 additions & 5 deletions storage/cmath/include/algebra/storage/impl/cmath_getter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,31 @@ struct block_getter {
return submatrix;
}

/// Operator producing a vector out of a const matrix
/// Operator producing a row vector out of a const matrix
template <std::size_t SIZE, std::size_t ROWS, std::size_t COLS,
concepts::scalar scalar_t,
template <typename, std::size_t> class array_t>
ALGEBRA_HOST_DEVICE inline array_t<scalar_t, SIZE> vector(
ALGEBRA_HOST_DEVICE inline array_t<scalar_t, SIZE> row(
const array_t<array_t<scalar_t, ROWS>, COLS> &m, std::size_t row,
std::size_t col) {

assert(col + SIZE <= COLS);
assert(row < ROWS);

array_t<scalar_t, SIZE> subvector{};

for (std::size_t icol = col; icol < col + SIZE; ++icol) {
subvector[icol - col] = m[icol][row];
}

return subvector;
}

/// Operator producing a column vector out of a const matrix
template <std::size_t SIZE, std::size_t ROWS, std::size_t COLS,
concepts::scalar scalar_t,
template <typename, std::size_t> class array_t>
ALGEBRA_HOST_DEVICE inline array_t<scalar_t, SIZE> column(
const array_t<array_t<scalar_t, ROWS>, COLS> &m, std::size_t row,
std::size_t col) {

Expand All @@ -196,15 +216,26 @@ ALGEBRA_HOST_DEVICE decltype(auto) block(const input_matrix_type &m,
return block_getter().template operator()<ROWS, COLS>(m, row, col);
}

/// Function extracting a vector from a matrix
/// Function extracting a row vector from a matrix
template <std::size_t SIZE, std::size_t ROWS, std::size_t COLS,
concepts::scalar scalar_t,
template <typename, std::size_t> class array_t>
ALGEBRA_HOST_DEVICE inline array_t<scalar_t, SIZE> row(
const array_t<array_t<scalar_t, ROWS>, COLS> &m, std::size_t row,
std::size_t col) {

return block_getter().template row<SIZE>(m, row, col);
}

/// Function extracting a column vector from a matrix
template <std::size_t SIZE, std::size_t ROWS, std::size_t COLS,
concepts::scalar scalar_t,
template <typename, std::size_t> class array_t>
ALGEBRA_HOST_DEVICE inline array_t<scalar_t, SIZE> vector(
ALGEBRA_HOST_DEVICE inline array_t<scalar_t, SIZE> column(
const array_t<array_t<scalar_t, ROWS>, COLS> &m, std::size_t row,
std::size_t col) {

return block_getter().template vector<SIZE>(m, row, col);
return block_getter().template column<SIZE>(m, row, col);
}

/// Sets a matrix of dimension @tparam ROW and @tparam COL as submatrix of
Expand Down
48 changes: 45 additions & 3 deletions storage/common/include/algebra/storage/matrix_getter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,18 +178,42 @@ struct block_getter {
return res_m;
}

/// Get a vector of a const matrix
/// Get a row vector of a const matrix
template <std::size_t SIZE, std::size_t ROWS, std::size_t COLS,
concepts::scalar scalar_t,
template <typename, std::size_t> class array_t>
ALGEBRA_HOST_DEVICE constexpr auto vector(
ALGEBRA_HOST_DEVICE constexpr auto row(
const matrix<array_t, scalar_t, ROWS, COLS> &m, const std::size_t row,
const std::size_t col) noexcept {

static_assert(SIZE <= ROWS);
static_assert(SIZE <= COLS);
assert(row < ROWS);
assert(col + SIZE <= COLS);

using vector_t = algebra::storage::vector<SIZE, scalar_t, array_t>;

vector_t res_v{};

for (std::size_t i = col; i < col + SIZE; ++i) {
res_v[i - col] = m[i][row];
}

return res_v;
}

/// Get a column vector of a const matrix
template <std::size_t SIZE, std::size_t ROWS, std::size_t COLS,
concepts::scalar scalar_t,
template <typename, std::size_t> class array_t>
ALGEBRA_HOST_DEVICE constexpr auto column(
const matrix<array_t, scalar_t, ROWS, COLS> &m, const std::size_t row,
const std::size_t col) noexcept {

static_assert(SIZE <= ROWS);
static_assert(SIZE <= COLS);
assert(row + SIZE <= ROWS);
assert(col <= COLS);
assert(col < COLS);

using input_matrix_t = matrix<array_t, scalar_t, ROWS, COLS>;
using vector_t = algebra::storage::vector<SIZE, scalar_t, array_t>;
Expand Down Expand Up @@ -283,4 +307,22 @@ ALGEBRA_HOST_DEVICE constexpr void set_block(
}
}

template <std::size_t SIZE, std::size_t ROW, std::size_t COL,
concepts::scalar scalar_t,
template <typename, std::size_t> class array_t>
ALGEBRA_HOST_DEVICE constexpr auto row(
const algebra::storage::matrix<array_t, scalar_t, ROW, COL> &m,
const std::size_t row, const std::size_t col) noexcept {
return algebra::storage::block_getter{}.template row<SIZE>(m, row, col);
}

template <std::size_t SIZE, std::size_t ROW, std::size_t COL,
concepts::scalar scalar_t,
template <typename, std::size_t> class array_t>
ALGEBRA_HOST_DEVICE constexpr auto column(
const algebra::storage::matrix<array_t, scalar_t, ROW, COL> &m,
const std::size_t row, const std::size_t col) noexcept {
return algebra::storage::block_getter{}.template column<SIZE>(m, row, col);
}

} // namespace algebra::storage
36 changes: 32 additions & 4 deletions storage/eigen/include/algebra/storage/impl/eigen_getter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,25 @@ struct block_getter {

template <int SIZE, typename derived_type, concepts::index size_type_1,
concepts::index size_type_2>
ALGEBRA_HOST_DEVICE decltype(auto) vector(Eigen::MatrixBase<derived_type> &m,
ALGEBRA_HOST_DEVICE decltype(auto) row(Eigen::MatrixBase<derived_type> &m,
size_type_1 row,
size_type_2 col) const {

return m.template block<1, SIZE>(row, col);
}

template <int SIZE, typename derived_type, concepts::index size_type_1,
concepts::index size_type_2>
ALGEBRA_HOST_DEVICE decltype(auto) row(
const Eigen::MatrixBase<derived_type> &m, size_type_1 row,
size_type_2 col) const {

return m.template block<1, SIZE>(row, col);
}

template <int SIZE, typename derived_type, concepts::index size_type_1,
concepts::index size_type_2>
ALGEBRA_HOST_DEVICE decltype(auto) column(Eigen::MatrixBase<derived_type> &m,
size_type_1 row,
size_type_2 col) const {

Expand All @@ -148,7 +166,7 @@ struct block_getter {

template <int SIZE, typename derived_type, concepts::index size_type_1,
concepts::index size_type_2>
ALGEBRA_HOST_DEVICE decltype(auto) vector(
ALGEBRA_HOST_DEVICE decltype(auto) column(
const Eigen::MatrixBase<derived_type> &m, size_type_1 row,
size_type_2 col) const {

Expand Down Expand Up @@ -176,11 +194,21 @@ ALGEBRA_HOST_DEVICE decltype(auto) block(Eigen::MatrixBase<derived_type> &m,

/// Function extracting a slice from the matrix
template <int SIZE, typename derived_type>
ALGEBRA_HOST_DEVICE inline decltype(auto) vector(
ALGEBRA_HOST_DEVICE inline decltype(auto) row(
const Eigen::MatrixBase<derived_type> &m, std::size_t row,
std::size_t col) {

return block_getter{}.template row<SIZE>(m, static_cast<Eigen::Index>(row),
static_cast<Eigen::Index>(col));
}

/// Function extracting a slice from the matrix
template <int SIZE, typename derived_type>
ALGEBRA_HOST_DEVICE inline decltype(auto) column(
const Eigen::MatrixBase<derived_type> &m, std::size_t row,
std::size_t col) {

return block_getter{}.template vector<SIZE>(m, static_cast<Eigen::Index>(row),
return block_getter{}.template column<SIZE>(m, static_cast<Eigen::Index>(row),
static_cast<Eigen::Index>(col));
}

Expand Down
29 changes: 25 additions & 4 deletions storage/fastor/include/algebra/storage/impl/fastor_getter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,18 @@ struct block_getter {

template <std::size_t SIZE, std::size_t oROWS, std::size_t oCOLS,
concepts::scalar scalar_t>
ALGEBRA_HOST_DEVICE Fastor::Tensor<scalar_t, SIZE> vector(
ALGEBRA_HOST_DEVICE Fastor::Tensor<scalar_t, SIZE> row(
const Fastor::Tensor<scalar_t, oROWS, oCOLS> &m, std::size_t row,
std::size_t col) const {

return Fastor::Tensor<scalar_t, SIZE>(
m(static_cast<int>(row),
Fastor::seq(static_cast<int>(col), static_cast<int>(col + SIZE))));
}

template <std::size_t SIZE, std::size_t oROWS, std::size_t oCOLS,
concepts::scalar scalar_t>
ALGEBRA_HOST_DEVICE Fastor::Tensor<scalar_t, SIZE> column(
const Fastor::Tensor<scalar_t, oROWS, oCOLS> &m, std::size_t row,
std::size_t col) const {

Expand All @@ -163,14 +174,24 @@ ALGEBRA_HOST_DEVICE decltype(auto) block(
return block_getter{}.template operator()<ROWS, COLS>(m, row, col);
}

/// Function extracting a slice from the matrix
/// Function extracting a row vector from the matrix
template <std::size_t SIZE, std::size_t ROWS, std::size_t COLS,
concepts::scalar scalar_t>
ALGEBRA_HOST_DEVICE inline decltype(auto) row(
const Fastor::Tensor<scalar_t, ROWS, COLS> &m, std::size_t row,
std::size_t col) {

return block_getter{}.template row<SIZE>(m, row, col);
}

/// Function extracting a column vector from the matrix
template <std::size_t SIZE, std::size_t ROWS, std::size_t COLS,
concepts::scalar scalar_t>
ALGEBRA_HOST_DEVICE inline decltype(auto) vector(
ALGEBRA_HOST_DEVICE inline decltype(auto) column(
const Fastor::Tensor<scalar_t, ROWS, COLS> &m, std::size_t row,
std::size_t col) {

return block_getter{}.template vector<SIZE>(m, row, col);
return block_getter{}.template column<SIZE>(m, row, col);
}

/// Operator setting a block with a matrix
Expand Down
Loading
Loading