Skip to content

Bump blacspp + use new cmake modules #11

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
wavefunction91 merged 4 commits into from
Jun 16, 2021
Merged

Bump blacspp + use new cmake modules #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04a018c
[CMAKE] Pin to https://github.com/wavefunction91/blacspp/pull/15
wavefunction91 Feb 13, 2021
1152672
Fix access of isrc/jsrc in BlockCyclicMatrix
wavefunction91 May 5, 2021
664b89e
[BUGFIX] Swap source and current process indices in dimension from DE…
May 27, 2021
ccabf54
Merge pull request #13 from wavefunction91/bugfix/dims-from-desc
wavefunction91 May 28, 2021
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
4 changes: 2 additions & 2 deletions include/scalapackpp/block_cyclic_matrix.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ class BlockCyclicMatrix {
inline auto n_local() const { return N_local_; }
inline auto mb() const { return dist_.mb(); }
inline auto nb() const { return dist_.nb(); }
inline auto isrc() const { return dist_.isrc_; }
inline auto jsrc() const { return dist_.jsrc_; }
inline auto isrc() const { return dist_.isrc(); }
inline auto jsrc() const { return dist_.jsrc(); }

inline auto& desc() const { return desc_; }
inline auto data() const { return local_data_.data(); }
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if( NOT TARGET blacspp::blacspp )
include( FetchContent )
FetchContent_Declare( blacspp
GIT_REPOSITORY https://github.com/wavefunction91/blacspp.git
GIT_TAG 1b7f70286081f8909502312b6e54df616788b5d5
GIT_TAG b87b02bc2cb5ba86b3df690dd89bf0df695a3437
)
FetchContent_MakeAvailable( blacspp )

Expand Down
4 changes: 2 additions & 2 deletions src/information.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int64_t local_row_from_desc( int64_t M, const scalapack_desc& desc ) {
const auto RSRC_A = desc[internal::_RSRC_A];

auto grid_dim = blacspp::wrappers::grid_info( ICXT_A );
return numroc( M, MB_A, RSRC_A, grid_dim.my_row, grid_dim.np_row );
return numroc( M, MB_A, grid_dim.my_row, RSRC_A, grid_dim.np_row );
}

int64_t local_col_from_desc( int64_t N, const scalapack_desc& desc ) {
Expand All @@ -53,7 +53,7 @@ int64_t local_col_from_desc( int64_t N, const scalapack_desc& desc ) {
const auto CSRC_A = desc[internal::_CSRC_A];

auto grid_dim = blacspp::wrappers::grid_info( ICXT_A );
return numroc( N, NB_A, CSRC_A, grid_dim.my_col, grid_dim.np_col );
return numroc( N, NB_A, grid_dim.my_col, CSRC_A, grid_dim.np_col );
}


Expand Down