From 04a018cf24a74bd7d4cec66967c4bec850d8175c Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Sat, 13 Feb 2021 00:12:12 +0000 Subject: [PATCH 1/3] [CMAKE] Pin to https://github.com/wavefunction91/blacspp/pull/15 --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fc55e72..861299d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 ) From 1152672fc1852e5cfbd6510e3c621e0981a207d6 Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Wed, 5 May 2021 20:14:37 +0000 Subject: [PATCH 2/3] Fix access of isrc/jsrc in BlockCyclicMatrix --- include/scalapackpp/block_cyclic_matrix.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/scalapackpp/block_cyclic_matrix.hpp b/include/scalapackpp/block_cyclic_matrix.hpp index 20f797c..691b0c8 100644 --- a/include/scalapackpp/block_cyclic_matrix.hpp +++ b/include/scalapackpp/block_cyclic_matrix.hpp @@ -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(); } From 664b89e5fe7a4e2baad9016fd58b976ae4b558c4 Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Thu, 27 May 2021 12:50:00 -0700 Subject: [PATCH 3/3] [BUGFIX] Swap source and current process indices in dimension from DESC drivers, closes #12 --- src/information.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/information.cxx b/src/information.cxx index 0564a73..8f154e7 100644 --- a/src/information.cxx +++ b/src/information.cxx @@ -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 ) { @@ -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 ); }