Skip to content

[LinearAlgebra] Factorize matrix bloc trait using concept #6122

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

Open
alxbilger wants to merge 12 commits into
base: master
Choose a base branch
from
+6 −76
Open

[LinearAlgebra] Factorize matrix bloc trait using concept #6122

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c76138a
[Type] Introduce a trait to define mapping between numeric types and …
alxbilger May 22, 2026
47dae79
use TypeTrait in DataTypeInfo
alxbilger May 22, 2026
81058a4
use TypeTrait in matrix_bloc_traits
alxbilger May 22, 2026
a25d2f3
use TypeTrait in EigenSparseMatrix
alxbilger May 22, 2026
4542318
use TypeTrait in EigenVector
alxbilger May 22, 2026
fd6e633
missing includes
alxbilger May 22, 2026
65045f1
use concept to factorize
alxbilger May 22, 2026
3d75150
missing header
alxbilger May 22, 2026
ae6bbc5
fix wrong return
alxbilger May 22, 2026
090aa6a
[LinearAlgebra] Factorize matrix bloc trait using concept
alxbilger May 22, 2026
bb2c1bc
Merge branch 'master' into matrixtrait
hugtalbot May 28, 2026
793adf2
Merge remote-tracking branch 'upstream/master' into matrixtrait
alxbilger Jun 3, 2026
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
82 changes: 6 additions & 76 deletions Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/matrix_bloc_traits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,49 +194,14 @@ class matrix_bloc_traits < sofa::type::Vec<N, T>, IndexType >
}
};

template <typename IndexType>
class matrix_bloc_traits < float, IndexType >
template <class T, typename IndexType> requires std::is_scalar_v<T>
class matrix_bloc_traits < T, IndexType >
{
public:
typedef float Block;
typedef Block BlockTranspose;

typedef float Real;
enum { NL = 1 };
enum { NC = 1 };
static Real& v(Block& b, IndexType, IndexType) { return b; }
static const Real& v(const Block& b, IndexType, IndexType) { return b; }
static void vset(Block& b, int, int, Real val) { b = val; }
static void vadd(Block& b, int, int, Real val) { b += val; }
static void clear(Block& b) { b = 0; }
static bool empty(const Block& b)
{
return b == 0;
}
static void invert(Block& result, const Block& b) { result = 1.0f/b; }

static void split_row_index(IndexType& index, IndexType& modulo) { bloc_index_func<NL, IndexType>::split(index, modulo); }
static void split_col_index(IndexType& index, IndexType& modulo) { bloc_index_func<NC, IndexType>::split(index, modulo); }

template<class TSubBlock, std::enable_if_t<std::is_scalar_v<TSubBlock>, bool> = true>
static void subBlock(const Block& b, IndexType row, IndexType col, TSubBlock& subBlock)
{
subBlock = v(b, row, col);
}

static const std::string Name() { return sofa::type::TypeTrait<Real>::name(); }
static sofa::linearalgebra::BaseMatrix::ElementType getElementType() { return sofa::linearalgebra::BaseMatrix::ELEMENT_FLOAT; }
static IndexType getElementSize() { return sizeof(Real); }
};

template <typename IndexType>
class matrix_bloc_traits < double, IndexType >
{
public:
typedef double Block;
typedef T Block;
typedef Block BlockTranspose;

typedef double Real;
typedef T Real;
enum { NL = 1 };
enum { NC = 1 };
static Real& v(Block& b, IndexType, IndexType) { return b; }
Expand All @@ -248,7 +213,7 @@ class matrix_bloc_traits < double, IndexType >
{
return b == 0;
}
static void invert(Block& result, const Block& b) { result = 1.0/b; }
static void invert(Block& result, const Block& b) { result = static_cast<Real>(1.0) / b; }

template<class TSubBlock, std::enable_if_t<std::is_scalar_v<TSubBlock>, bool> = true>
static void subBlock(const Block& b, IndexType row, IndexType col, TSubBlock& subBlock)
Expand All @@ -260,42 +225,7 @@ class matrix_bloc_traits < double, IndexType >
static void split_col_index(IndexType& index, IndexType& modulo) { bloc_index_func<NC, IndexType>::split(index, modulo); }

static sofa::linearalgebra::BaseMatrix::ElementType getElementType() { return sofa::linearalgebra::BaseMatrix::ELEMENT_FLOAT; }
static const std::string Name() { return sofa::type::TypeTrait<Real>::name(); }
static const std::string Name() { return sofa::type::TypeTrait<Real>::GetTypeName(); }
};

template <typename IndexType>
class matrix_bloc_traits < int, IndexType >
{
public:
typedef float Block;
typedef Block BlockTranspose;

typedef float Real;
enum { NL = 1 };
enum { NC = 1 };
static Real& v(Block& b, int, int) { return b; }
static const Real& v(const Block& b, int, int) { return b; }
static void vset(Block& b, int, int, Real val) { b = val; }
static void vadd(Block& b, int, int, Real val) { b += val; }
static void clear(Block& b) { b = 0; }
static bool empty(const Block& b)
{
return b == 0;
}
static void invert(Block& result, const Block& b) { result = 1.0f/b; }

template<class TSubBlock, std::enable_if_t<std::is_scalar_v<TSubBlock>, bool> = true>
static void subBlock(const Block& b, IndexType row, IndexType col, TSubBlock& subBlock)
{
subBlock = v(b, row, col);
}

static void split_row_index(int& index, int& modulo) { bloc_index_func<NL, IndexType>::split(index, modulo); }
static void split_col_index(int& index, int& modulo) { bloc_index_func<NC, IndexType>::split(index, modulo); }

static sofa::linearalgebra::BaseMatrix::ElementType getElementType() { return sofa::linearalgebra::BaseMatrix::ELEMENT_INT; }
static const std::string Name() { return sofa::type::TypeTrait<Real>::name(); }
};


} // namespace sofa::linearalgebra
Loading