Skip to content

480 storage scheme selection and instantiation #67

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
djelovina merged 11 commits into from
Sep 7, 2022
Merged

480 storage scheme selection and instantiation #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8c021e
Add formulation for packed format and clean up the doxygen for storag…
Sep 5, 2022
2560a9d
Implement factory classes for storage polynomials
Sep 6, 2022
06e3c33
Add mechanism to select polynomial type based on static matrix proper…
Sep 6, 2022
bbc91b8
Change AMF Factory FromPolynomial to take PolyFactory as template par…
Sep 6, 2022
4590112
Change the type of dynamic poly coefficients to a signed integer type…
Sep 6, 2022
88efa14
Move storage dimension calculation to poly factories
Sep 6, 2022
88a2a3e
Add a definition of abstract poly factory.
Sep 7, 2022
46ef1fc
Reimplement Packed factories
Sep 7, 2022
f11e541
Add stub for banded factory
Sep 7, 2022
439c2af
Use enums as template parameters instead of bools for better readability
Sep 7, 2022
fb68cdc
Add unit test for storage polynomials
Sep 7, 2022
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
98 changes: 57 additions & 41 deletions include/alp/reference/matrix.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,32 +800,48 @@ namespace alp {
*
*/
template< typename Structure, typename ImfR, typename ImfC, enum Backend backend >
struct PolyFactory {};
struct determine_poly_factory {};

/** Specialization for matrices */
template< typename Structure, enum Backend backend >
struct PolyFactory< Structure, imf::Id, imf::Id, backend > {
/** Specialization for general matrix */
template< enum Backend backend >
struct determine_poly_factory< structures::General, imf::Id, imf::Id, backend > {

typedef storage::polynomials::FullFactory<> factory_type;
};

/** \internal Currently the type is hard-coded. \todo Implement proper logic */
typedef storage::polynomials::Full_type type;
/** Specialization for square matrix */
template< enum Backend backend >
struct determine_poly_factory< structures::Square, imf::Id, imf::Id, backend > {

static type Create( const size_t nrows, const size_t ncols ) {
(void)nrows;
return type( 0, 0, 0, ncols, 1, 0 );
}
typedef storage::polynomials::FullFactory<> factory_type;
};

/** Specialization for upper-triangular matrix */
template< enum Backend backend >
struct determine_poly_factory< structures::UpperTriangular, imf::Id, imf::Id, backend > {

typedef storage::polynomials::PackedFactory< storage::UPPER, storage::ROW_WISE > factory_type;
};

/** Specialization for lower-triangular matrix */
template< enum Backend backend >
struct determine_poly_factory< structures::LowerTriangular, imf::Id, imf::Id, backend > {

typedef storage::polynomials::PackedFactory< storage::LOWER, storage::ROW_WISE > factory_type;
};

/** Specialization for symmetric matrix */
template< enum Backend backend >
struct determine_poly_factory< structures::Symmetric, imf::Id, imf::Id, backend > {

typedef storage::polynomials::PackedFactory< storage::UPPER, storage::ROW_WISE > factory_type;
};

/** Specialization for vectors */
template< typename Structure, enum Backend backend >
struct PolyFactory< Structure, imf::Id, imf::Zero, backend > {

typedef storage::polynomials::Vector_type type;
struct determine_poly_factory< Structure, imf::Id, imf::Zero, backend > {

static type Create( const size_t nrows, const size_t ncols ) {
(void)nrows;
(void)ncols;
return type( 0, 0, 0, 1, 0, 0 );
}
typedef storage::polynomials::ArrayFactory factory_type;
};

/**
Expand Down Expand Up @@ -909,7 +925,7 @@ namespace alp {
);

typedef typename storage::AMFFactory::FromPolynomial<
typename PolyFactory< Structure, imf::Id, ImfC, reference >::type
typename determine_poly_factory< Structure, imf::Id, ImfC, reference >::factory_type
>::amf_type type;
};

Expand All @@ -923,7 +939,7 @@ namespace alp {
);

typedef typename storage::AMFFactory::FromPolynomial<
storage::polynomials::None_type
storage::polynomials::NoneFactory
>::amf_type type;
};

Expand All @@ -941,7 +957,7 @@ namespace alp {
internal::is_view_over_functor< View >::value,
internal::FunctorBasedMatrix< T, ImfR, ImfC, typename View::applied_to >,
internal::StorageBasedMatrix< T,
typename internal::determine_amf_type< structures::General, View, ImfR, ImfC, reference >::type,
typename internal::determine_amf_type< Structure, View, ImfR, ImfC, reference >::type,
internal::requires_allocation< View >::value
>
>::type type;
Expand Down Expand Up @@ -1070,11 +1086,11 @@ namespace alp {
*/
Matrix( const size_t rows, const size_t cols, const size_t cap = 0 ) :
base_type(
storage::AMFFactory::FromPolynomial< typename base_type::amf_type::mapping_polynomial_type >::Create(
storage::AMFFactory::FromPolynomial<
typename internal::determine_poly_factory< structure, ImfR, ImfC, reference >::factory_type
>::Create(
ImfR( rows ),
ImfC( cols ),
internal::PolyFactory< structures::General, ImfR, ImfC, reference >::Create( rows, cols ),
rows * cols
ImfC( cols )
)
) {

Expand Down Expand Up @@ -1312,11 +1328,11 @@ namespace alp {
*/
Matrix( const size_t rows, const size_t cols, const size_t cap = 0 ) :
base_type(
storage::AMFFactory::FromPolynomial< typename base_type::amf_type::mapping_polynomial_type >::Create(
storage::AMFFactory::FromPolynomial<
typename internal::determine_poly_factory< structure, ImfR, ImfC, reference >::factory_type
>::Create(
ImfR( rows ),
ImfC( cols ),
internal::PolyFactory< structure, ImfR, ImfC, reference >::Create( rows, cols ),
rows * cols
ImfC( cols )
)
) {
(void)cap;
Expand Down Expand Up @@ -1550,11 +1566,11 @@ namespace alp {
*/
Matrix( const size_t dim, const size_t cap = 0 ) :
base_type(
storage::AMFFactory::FromPolynomial< typename base_type::amf_type::mapping_polynomial_type >::Create(
storage::AMFFactory::FromPolynomial<
typename internal::determine_poly_factory< structure, ImfR, ImfC, reference >::factory_type
>::Create(
ImfR( dim ),
ImfC( dim ),
internal::PolyFactory< structures::Square, ImfR, ImfC, reference >::Create( dim, dim ),
dim * dim
ImfC( dim )
)
) {

Expand Down Expand Up @@ -1770,11 +1786,11 @@ namespace alp {
*/
Matrix( const size_t dim, const size_t cap = 0 ) :
base_type(
storage::AMFFactory::FromPolynomial< typename base_type::amf_type::mapping_polynomial_type >::Create(
storage::AMFFactory::FromPolynomial<
typename internal::determine_poly_factory< structure, ImfR, ImfC, reference >::factory_type
>::Create(
ImfR( dim ),
ImfC( dim ),
internal::PolyFactory< structures::Symmetric, ImfR, ImfC, reference >::Create( dim, dim ),
dim * dim
ImfC( dim )
)
) {

Expand Down Expand Up @@ -1992,11 +2008,11 @@ namespace alp {
*/
Matrix( const size_t dim, const size_t cap = 0 ) :
base_type(
storage::AMFFactory::FromPolynomial< typename base_type::amf_type::mapping_polynomial_type >::Create(
storage::AMFFactory::FromPolynomial<
typename internal::determine_poly_factory< structure, ImfR, ImfC, reference >::factory_type
>::Create(
ImfR( dim ),
ImfC( dim ),
internal::PolyFactory< structures::UpperTriangular, ImfR, ImfC, reference >::Create( dim, dim ),
dim * dim
ImfC( dim )
)
) {

Expand Down
Loading