Skip to content

eigen {matrix,vector}_to_array UT needs to replicate the data... #319

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
merged 1 commit into from
Nov 29, 2021
Merged

eigen {matrix,vector}_to_array UT needs to replicate the data... #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions src/TiledArray/conversions/eigen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ void counted_tensor_to_eigen_submatrix(const T& tensor,
/// \param trange The tiled range of the new array
/// \param matrix The Eigen matrix to be copied
/// \param replicated if true, the result will be replicated
/// [default = true].
/// [default = false].
/// \param pmap the process map object [default=null]; initialized to the
/// default if \p replicated is false, or a replicated pmap if \p replicated
/// is true; ignored if \p replicated is true and \c world.size()>1
Expand All @@ -412,13 +412,14 @@ A eigen_to_array(World& world, const typename A::trange_type& trange,
std::shared_ptr<typename A::pmap_interface> pmap = {}) {
typedef typename A::index1_type size_type;
// Check that trange matches the dimensions of other
const auto rank = trange.tiles_range().rank();
const auto rank = trange.tiles_range().rank();

TA_ASSERT(rank == 1 || rank == 2 &&
"TiledArray::eigen_to_array(): The number of dimensions in "
"trange must match that of the Eigen matrix.");
TA_ASSERT(rank == 1 ||
rank == 2 &&
"TiledArray::eigen_to_array(): The number of dimensions in "
"trange must match that of the Eigen matrix.");

if(rank == 2) {
if (rank == 2) {
TA_ASSERT(
trange.elements_range().extent(0) == size_type(matrix.rows()) &&
"TiledArray::eigen_to_array(): The number of rows in trange is not "
Expand All @@ -433,7 +434,7 @@ A eigen_to_array(World& world, const typename A::trange_type& trange,
"TiledArray::eigen_to_array(): The size of trange must be equal to the "
"matrix size.");
}

// Create a new tensor
if (replicated && (world.size() > 1))
pmap = std::static_pointer_cast<typename A::pmap_interface>(
Expand Down
7 changes: 5 additions & 2 deletions tests/eigen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,10 @@ BOOST_AUTO_TEST_CASE(tensor_to_submatrix) {
}

BOOST_AUTO_TEST_CASE(matrix_to_array) {
// Fill the matrix with random data
// Fill the matrix with random data and replicate across the world
matrix = decltype(matrix)::Random(matrix.rows(), matrix.cols());
GlobalFixture::world->gop.broadcast(matrix.data(),
matrix.rows() * matrix.cols(), 0);

// Copy matrix to array
BOOST_CHECK_NO_THROW(
Expand All @@ -175,8 +177,9 @@ BOOST_AUTO_TEST_CASE(matrix_to_array) {
}

BOOST_AUTO_TEST_CASE(vector_to_array) {
// Fill the vector with random data
// Fill the vector with random data and replicate across the world
vector = Eigen::VectorXi::Random(vector.size());
GlobalFixture::world->gop.broadcast(vector.data(), vector.size(), 0);

// Convert the vector to an array
BOOST_CHECK_NO_THROW((array1 = eigen_to_array<TArrayI>(*GlobalFixture::world,
Expand Down