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

Experiment/v2.0.0/no cuts or random access #684

Closed
wants to merge 2 commits into from
Closed
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
4 changes: 2 additions & 2 deletions src/adiar/exec_policy.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,12 @@ namespace adiar
////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief `access` (default `Auto`).
////////////////////////////////////////////////////////////////////////////////////////////////
access _access = access::Auto;
access _access = access::Priority_Queue;

////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief `memory` (default `Auto`).
////////////////////////////////////////////////////////////////////////////////////////////////
memory _memory = memory::Auto;
memory _memory = memory::External;

////////////////////////////////////////////////////////////////////////////////////////////////
/// \brief `quantify` algorithm (default `Nested`).
Expand Down
2 changes: 1 addition & 1 deletion src/adiar/internal/data_structures/sorter.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ namespace adiar::internal
const tpie::memory_size_type maximum_phase1 = (memory_bytes >> 4) / (number_of_sorters - 1);

const tpie::memory_size_type phase1 =
std::max(minimum_phase1, std::min(maximum_phase1, no_elements_memory));
std::max(minimum_phase1, maximum_phase1);

// -----------------------------------------------------------------------
// Phase 3 : Top-most and final merging of partial lists.
Expand Down
Loading