feat(delete): add macro to avoid enable size opt in batch deleet

Author: RomaLzhih

CMakeLists.txt

@@ -25,6 +25,7 @@ option(CGAL "" OFF)
 option(MEMCHECK "" OFF)
 option(JEMA "" OFF)
 option(CCP "" OFF)
+option(DISABLE_BATCH_DELETE_SIZE_OPT "" OFF)
 
 
 if(CILKPLUS)
@@ -33,6 +34,8 @@ elseif(OPENCILK)
 	add_compile_options(-DPARLAY_OPENCILK -DCILK -fopencilk)
 elseif(SERIAL)
 	add_compile_options(-DPARLAY_SEQUENTIAL)
+elseif(DISABLE_BATCH_DELETE_SIZE_OPT)
+	add_compile_options(-DDISABLE_BATCH_DELETE_SIZE_OPT)
 else()
 	add_compile_options(-pthread)
 endif()

include/psi/base_tree_impl/tree_op/flatten.hpp

@@ -19,8 +19,12 @@ template <typename Point, typename DerivedTree, uint_fast8_t kSkHeight,
 template <SupportsForceParallel Interior, bool granularity>
 inline bool BaseTree<Point, DerivedTree, kSkHeight,
                      kImbaRatio>::ForceParallelRecursion(Interior const* TI) {
+#ifndef DISABLE_BATCH_DELETE_SIZE_OPT
   return (granularity && TI->size > kSerialBuildCutoff) ||
          (!granularity && TI->ForceParallel());
+#else
+  return (granularity) || (!granularity && TI->ForceParallel());
+#endif  // !DISABLE_BATCH_DELETE_SIZE_OPT
 }
 
 template <typename Point, typename DerivedTree, uint_fast8_t kSkHeight,

include/psi/kd_tree_impl/kd_batch_delete.hpp

@@ -65,6 +65,7 @@ KdTree<Point, SplitRule, LeafAugType, InteriorAugType, kSkHeight, kImbaRatio>::
     }
   }
 
+#ifndef DISABLE_BATCH_DELETE_SIZE_OPT
   // INFO: it can be used to accelerate the whole deletion process
   if (n == T->size) {
     if (has_tomb) {  // rebuild this subtree
@@ -84,6 +85,7 @@ KdTree<Point, SplitRule, LeafAugType, InteriorAugType, kSkHeight, kImbaRatio>::
     T->size = 0;
     return NodeBox(T, BT::GetEmptyBox());
   }
+#endif
 
   if (T->is_leaf) {
     return BT::template DeletePoints4Leaf<Leaf, NodeBox>(T, In);
@@ -216,8 +218,13 @@ KdTree<Point, SplitRule, LeafAugType, InteriorAugType, kSkHeight, kImbaRatio>::
     assert(IT.tags[IT.rev_tag[i]].second == BT::kBucketNum + 3);
 
     if (IT.tags[IT.rev_tag[i]].first->size == 0) {  // NOTE: empty
+#ifndef DISABLE_BATCH_DELETE_SIZE_OPT
       BT::template DeleteTreeRecursive<Leaf, Interior, false>(
           IT.tags[IT.rev_tag[i]].first);
+#else
+      BT::template DeleteTreeRecursive<Leaf, Interior, true>(
+          IT.tags[IT.rev_tag[i]].first);
+#endif
       IT.tags[IT.rev_tag[i]].first = AllocEmptyLeafNode<Slice, Leaf>();
     } else {  // NOTE: rebuild
       assert(BT::WithinBox(

include/psi/orth_tree_impl/orth_batch_delete.hpp

@@ -52,6 +52,7 @@ Node* OrthTree<Point, SplitRule, LeafAugType, InteriorAugType, kMD, kSkHeight,
 
   // INFO: delete the whole tree directly if its size equals to the input size,
   // can be used to accelerate the whole deletion process
+#ifndef DISABLE_BATCH_DELETE_SIZE_OPT
   if (n == T->size) {
     if (has_tomb) {
       BT::template DeleteTreeRecursive<Leaf, Interior>(T);
@@ -64,6 +65,7 @@ Node* OrthTree<Point, SplitRule, LeafAugType, InteriorAugType, kMD, kSkHeight,
     T->size = 0;
     return T;
   }
+#endif
 
   if (T->is_leaf) {
     return BT::template DeletePoints4Leaf<Leaf, Node*>(T, In);
@@ -159,8 +161,15 @@ Node* OrthTree<Point, SplitRule, LeafAugType, InteriorAugType, kMD, kSkHeight,
     assert(IT.tags[IT.rev_tag[i]].second == BT::kBucketNum + 3);
 
     if (IT.tags[IT.rev_tag[i]].first->size == 0) {  // NOTE: empty
+
+#ifndef DISABLE_BATCH_DELETE_SIZE_OPT
       BT::template DeleteTreeRecursive<Leaf, Interior, false>(
           IT.tags[IT.rev_tag[i]].first);
+#else
+      BT::template DeleteTreeRecursive<Leaf, Interior, true>(
+          IT.tags[IT.rev_tag[i]].first);
+#endif
+
       IT.tags[IT.rev_tag[i]].first = AllocEmptyLeafNode<Slice, Leaf>();
     } else {  // NOTE: rebuild
       assert(BT::WithinBox(