Skip to content
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.

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

Internal/nested sweep/2 level cuts #687

Merged
merged 5 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@

- Fixed overflow error when a single BDD's width outgrows 32 bits (96 GiB).

- Fixed Outer Reduce in Nested Sweeping framework crashes due to assuming its priority queues are
(like the regular Reduce) only inducing a 1-level cut on the input.

- Fixed "Not enough phase 1 memory for 128 KB items and an open stream!" error
messages when running `bdd_exists(f, ...)` and `bdd_forall(f, ...)` with
exclusively external memory data structures.
Expand Down
6 changes: 1 addition & 5 deletions src/adiar/internal/algorithms/nested_sweeping.h
Original file line number Diff line number Diff line change
Expand Up @@ -2147,11 +2147,7 @@ namespace adiar::internal
const tpie::memory_size_type outer_roots_memory_fits =
internal_roots_sorter_t::memory_fits(outer_pq_memory);

size_t pq_roots_bound = dag->max_1level_cut;
if constexpr (nesting_policy::fast_reduce) {
// If 'fast_reduce' will be used, then the priority queue is a 2-level cut
pq_roots_bound = (pq_roots_bound * 3u) / 2u;
}
const size_t pq_roots_bound = (dag->max_1level_cut * 3u) / 2u;

const size_t outer_pq_roots_max =
ep.template get<exec_policy::memory>() == exec_policy::memory::Internal
Expand Down
3 changes: 1 addition & 2 deletions src/adiar/internal/io/levelized_file_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ namespace adiar::internal
{
if (!f->exists()) f->touch();

for (size_t s_idx = 0; s_idx < streams; s_idx++)
_streams[s_idx].attach(f->_files[s_idx], f);
for (size_t s_idx = 0; s_idx < streams; s_idx++) _streams[s_idx].attach(f->_files[s_idx], f);
}

////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
Loading
Loading