songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update cutoffs under which sequential version is used regardless of tag 

(after some experiments using random points in 2D/3D)
This commit is contained in:
Mael Rouxel-Labbé 2020-01-02 13:33:56 +01:00
parent bfeb617786
commit af1ae5114f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spatial_sorting/include/CGAL/Hilbert_sort_median_2.h
View File

@ -164,7 +164,7 @@ public:
RandomAccessIterator m0 = begin, m4 = end; RandomAccessIterator m0 = begin, m4 = end;
if((end - begin) > 1024){ if((end - begin) > 8192){ // 2^13, empirically a good cutoff
RandomAccessIterator m1, m2, m3; RandomAccessIterator m1, m2, m3;
m2 = internal::hilbert_split (m0, m4, Cmp< x, upx> (_k)); m2 = internal::hilbert_split (m0, m4, Cmp< x, upx> (_k));

3
Spatial_sorting/include/CGAL/Hilbert_sort_median_3.h
View File

@ -179,14 +179,13 @@ public:
if ((end - begin) <= _limit) return; if ((end - begin) <= _limit) return;
RandomAccessIterator m0 = begin, m8 = end; RandomAccessIterator m0 = begin, m8 = end;
if((end - begin) > 1024){ if((end - begin) > 2048){ // 2^11, empirically a good cutoff
RandomAccessIterator m1, m2, m3, m4, m5, m6, m7; RandomAccessIterator m1, m2, m3, m4, m5, m6, m7;
m4 = internal::hilbert_split(m0, m8, Cmp<x, upx>(_k)); m4 = internal::hilbert_split(m0, m8, Cmp<x, upx>(_k));
tbb::parallel_invoke(Hilbert_split<RandomAccessIterator,Cmp<y, upy> >(m2, m0, m4, Cmp<y, upy>(_k)), tbb::parallel_invoke(Hilbert_split<RandomAccessIterator,Cmp<y, upy> >(m2, m0, m4, Cmp<y, upy>(_k)),
Hilbert_split<RandomAccessIterator,Cmp<y, !upy> >(m6, m4, m8, Cmp<y, !upy>(_k))); Hilbert_split<RandomAccessIterator,Cmp<y, !upy> >(m6, m4, m8, Cmp<y, !upy>(_k)));
tbb::parallel_invoke(Hilbert_split<RandomAccessIterator,Cmp<z, upz> >(m1, m0, m2, Cmp<z, upz>(_k)), tbb::parallel_invoke(Hilbert_split<RandomAccessIterator,Cmp<z, upz> >(m1, m0, m2, Cmp<z, upz>(_k)),
Hilbert_split<RandomAccessIterator,Cmp<z, !upz> >(m3, m2, m4, Cmp<z, !upz>(_k)), Hilbert_split<RandomAccessIterator,Cmp<z, !upz> >(m3, m2, m4, Cmp<z, !upz>(_k)),
Hilbert_split<RandomAccessIterator,Cmp<z, upz> >(m5, m4, m6, Cmp<z, upz>(_k)), Hilbert_split<RandomAccessIterator,Cmp<z, upz> >(m5, m4, m6, Cmp<z, upz>(_k)),