Skip to content

455 revise matrix access call stack for dense alp #23

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
3 commits merged into from
Jun 9, 2022
Merged

455 revise matrix access call stack for dense alp #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42e6c3b
Static cast to a reference instead of a type
Jun 8, 2022
94efac9
Fix code style in IMF classes
Jun 9, 2022
2b23167
Remove unnecessary const qualifier
Jun 9, 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
6 changes: 3 additions & 3 deletions include/alp/imf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,20 @@ namespace alp {

std::vector< size_t > select;

size_t map( size_t i ) const {
size_t map( const size_t i ) const {
#ifdef _DEBUG
std::cout << "Calling Select map.\n";
#endif
return select.at( i );
}

Select(size_t N, std::vector< size_t > &select): IMF( select.size(), N ), select( select ) {
Select( size_t N, std::vector< size_t > &select ): IMF( select.size(), N ), select( select ) {
//if ( *std::max_element( select.cbegin(), select.cend() ) >= N) {
// throw std::runtime_error("IMF Select beyond range.");
//}
}

Select(size_t N, std::vector< size_t > &&select): IMF( select.size(), N ), select( select ) {
Select( size_t N, std::vector< size_t > &&select ): IMF( select.size(), N ), select( select ) {
#ifdef _DEBUG
std::cout << "Select move constructor\n";
#endif
Expand Down
14 changes: 7 additions & 7 deletions include/alp/reference/matrix.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,12 +1665,12 @@ namespace alp {

template< typename MatrixType >
bool getInitialized( const MatrixType &A ) noexcept {
return static_cast< const MatrixBase< typename MatrixType::base_type > >( A ).template getInitialized();
return static_cast< const MatrixBase< typename MatrixType::base_type > & >( A ).template getInitialized();
}

template< typename MatrixType >
void setInitialized( MatrixType &A, const bool initialized ) noexcept {
return static_cast< MatrixBase< typename MatrixType::base_type > >( A ).template setInitialized( initialized );
return static_cast< MatrixBase< typename MatrixType::base_type > & >( A ).template setInitialized( initialized );
}

template< typename DerivedMatrix >
Expand All @@ -1694,13 +1694,13 @@ namespace alp {
*/
template< typename MatrixType >
const typename MatrixType::access_type access( const MatrixType &A, const typename MatrixType::storage_index_type &storageIndex ) {
return static_cast< const MatrixBase< typename MatrixType::base_type > >( A ).template access< const typename MatrixType::access_type, typename MatrixType::storage_index_type >( storageIndex );
return static_cast< const MatrixBase< typename MatrixType::base_type > & >( A ).template access< typename MatrixType::access_type, typename MatrixType::storage_index_type >( storageIndex );
}

/** Non-constant variant. **/
template< typename MatrixType >
typename MatrixType::access_type access( MatrixType &A, const typename MatrixType::storage_index_type &storageIndex ) {
return static_cast< MatrixBase< typename MatrixType::base_type > >( A ).template access< typename MatrixType::access_type, typename MatrixType::storage_index_type >( storageIndex );
return static_cast< MatrixBase< typename MatrixType::base_type > & >( A ).template access< typename MatrixType::access_type, typename MatrixType::storage_index_type >( storageIndex );
}

/** Return a storage index in the physical layout.
Expand All @@ -1721,7 +1721,7 @@ namespace alp {
*/
template< typename MatrixType >
typename MatrixType::storage_index_type getStorageIndex( const MatrixType &A, const size_t i, const size_t j, const size_t s, const size_t P ) {
return static_cast< const MatrixBase< typename MatrixType::base_type > >( A ).template getStorageIndex< typename MatrixType::storage_index_type >( i, j, s, P );
return static_cast< const MatrixBase< typename MatrixType::base_type > & >( A ).template getStorageIndex< typename MatrixType::storage_index_type >( i, j, s, P );
}

/** Return a pair of coordinates in logical layout.
Expand Down Expand Up @@ -1755,8 +1755,8 @@ namespace alp {

template< typename D, typename Structure, typename View, typename ImfR, typename ImfC >
std::pair< size_t, size_t > dims( const Matrix< D, Structure, Density::Dense, View, ImfR, ImfC, reference > & A ) noexcept {
return internal::dims( static_cast< internal::MatrixBase<
typename Matrix< D, Structure, Density::Dense, View, ImfR, ImfC, reference >::base_type > > ( A ) );
return internal::dims( static_cast< const internal::MatrixBase<
typename Matrix< D, Structure, Density::Dense, View, ImfR, ImfC, reference >::base_type > & > ( A ) );
}

} // namespace alp
Expand Down