Skip to content

fix(AABBTree): wrong parallelization scheme in containing_boxes(..) #1207

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(AABBTree): wrong parallelization scheme in containing_boxes(..) #1207

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
8 changes: 4 additions & 4 deletions include/geode/geometry/detail/aabb_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ namespace geode
return morton_mapping< dimension >( points );
}() )
{
index_t depth = 1;
if( bboxes.empty() )
{
tree_.resize( ROOT_INDEX );
Expand All @@ -90,7 +91,7 @@ namespace geode
const auto [max_node_index, max_depth] =
max_node_index_recursive( ROOT_INDEX, 0, bboxes.size(), 0 );
tree_.resize( ROOT_INDEX + max_node_index );
depth_ = max_depth;
depth = max_depth;
initialize_tree_recursive(
bboxes, ROOT_INDEX, 0, bboxes.size() );
}
Expand All @@ -102,7 +103,7 @@ namespace geode
else
{
const auto nb_async_depth = std::log2( grain );
async_depth_ = depth_ - nb_async_depth;
async_depth_ = depth - nb_async_depth;
}
}

Expand Down Expand Up @@ -523,7 +524,7 @@ namespace geode
}
const auto it = get_recursive_iterators(
node_index, element_begin, element_end );
if( depth_ > async_depth_ )
if( depth > async_depth_ )
{
containing_boxes_recursive( it.child_left, element_begin,
it.element_middle, depth + 1, query, result, mutex );
Expand All @@ -545,7 +546,6 @@ namespace geode
private:
std::vector< BoundingBox< dimension > > tree_;
std::vector< index_t > mapping_morton_;
index_t depth_{ 1 };
index_t async_depth_{ 0 };
};

Expand Down
Loading