Skip to content

SparseShape ctor taking scaled norms zeroes out values below threshold #275

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
May 24, 2021
Merged

SparseShape ctor taking scaled norms zeroes out values below threshold #275

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
14 changes: 9 additions & 5 deletions src/TiledArray/sparse_shape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,14 @@ class SparseShape {
return result_size_vectors;
}

decltype(zero_tile_count_) compute_zero_tile_count() {
/// @brief screens out zero tiles by zeroing out the norms of tiles below
/// the threshold
/// @return the number of zero tiles
auto screen_out_zero_tiles() {
decltype(zero_tile_count_) zero_tile_count = 0;
for (auto&& n : tile_norms_) {
for (auto& n : tile_norms_) {
if (n < threshold()) {
n = 0;
++zero_tile_count;
}
}
Expand Down Expand Up @@ -308,7 +312,7 @@ class SparseShape {
zero_tile_count_ = scale_tile_norms<ScaleBy::InverseVolume>(
tile_norms_, size_vectors_.get());
} else {
zero_tile_count_ = compute_zero_tile_count();
zero_tile_count_ = screen_out_zero_tiles();
}
}

Expand Down Expand Up @@ -382,7 +386,7 @@ class SparseShape {
tile_norms_, size_vectors_.get());
;
} else {
zero_tile_count_ = compute_zero_tile_count();
zero_tile_count_ = screen_out_zero_tiles();
}
}

Expand All @@ -406,7 +410,7 @@ class SparseShape {
const TiledRange& trange)
: SparseShape(tile_norms, trange) {
world.gop.max(tile_norms_.data(), tile_norms_.size());
zero_tile_count_ = compute_zero_tile_count();
zero_tile_count_ = screen_out_zero_tiles();
}

/// Copy constructor
Expand Down