Skip to content

Evaleev/fix/tensorimpl distributed ctor #278

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
evaleev merged 3 commits into from
May 30, 2021
Merged

Evaleev/fix/tensorimpl distributed ctor #278

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
df2be87
SparseShape::is_replicated fixed to produce same result on all ranks
evaleev May 27, 2021
d749a42
TensorImpl distributed ctor by default replicates shape across all ranks
evaleev May 27, 2021
81d9f1f
Merge branch 'master' into evaleev/fix/tensorimpl-distributed-ctor
evaleev May 30, 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
9 changes: 7 additions & 2 deletions src/TiledArray/sparse_shape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,10 +1627,15 @@ bool is_replicated(World& world, const SparseShape<T>& shape) {
const auto volume = shape.data().size();
std::vector<T> data(shape.data().data(), shape.data().data() + volume);
world.gop.max(data.data(), volume);
bool result = true;
for (size_t i = 0; i != data.size(); ++i) {
if (data[i] != shape.data()[i]) return false;
if (data[i] != shape.data()[i]) {
result = false;
break;
}
}
return true;
world.gop.logic_and(&result, 1);
return result;
}

#ifndef TILEDARRAY_HEADER_ONLY
Expand Down
13 changes: 10 additions & 3 deletions src/TiledArray/tensor_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,20 @@ class TensorImpl : private NO_DEFAULTS {
/// \param trange The tiled range for this tensor
/// \param shape The shape of this tensor
/// \param pmap The tile-process map
/// \param replicate_shape if true, will replicate the shape from rank 0, else
/// will use as is, but assert that the data is _bitwise_ identical
/// between ranks
/// \throw TiledArray::Exception When the size of shape is not equal to
/// zero
TensorImpl(World& world, const trange_type& trange, const shape_type& shape,
const std::shared_ptr<pmap_interface>& pmap)
const std::shared_ptr<pmap_interface>& pmap,
bool replicate_shape = true)
: world_(world), trange_(trange), shape_(shape), pmap_(pmap) {
// ensure that shapes are identical on every rank
if (replicate_shape)
world.gop.broadcast_serializable(shape_, 0);
else
TA_ASSERT(is_replicated(world, shape_));
// Validate input data.
TA_ASSERT(pmap_);
TA_ASSERT(pmap_->size() == trange_.tiles_range().volume());
Expand All @@ -75,8 +84,6 @@ class TensorImpl : private NO_DEFAULTS {
TA_ASSERT(pmap_->procs() ==
typename pmap_interface::size_type(world_.size()));
TA_ASSERT(shape_.validate(trange_.tiles_range()));
// ensure that shapes are identical on every rank
TA_ASSERT(is_replicated(world, shape));
}

/// Virtual destructor
Expand Down