From 4fda055ddb59d274a4c1189f9818b6cba6de0517 Mon Sep 17 00:00:00 2001 From: Jon Malkin <786705+jmalkin@users.noreply.github.com> Date: Wed, 29 Nov 2023 23:59:50 -0800 Subject: [PATCH 1/3] Minor tweak to ebpps items to string to help the method work with non-char types --- sampling/include/ebpps_sample_impl.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sampling/include/ebpps_sample_impl.hpp b/sampling/include/ebpps_sample_impl.hpp index afa4dcac..f379841b 100644 --- a/sampling/include/ebpps_sample_impl.hpp +++ b/sampling/include/ebpps_sample_impl.hpp @@ -178,7 +178,11 @@ string ebpps_sample::to_string() const { uint32_t idx = 0; for (const T& item : data_) oss << "\t" << idx++ << ":\t" << item << std::endl; - oss << " partial: " << (bool(partial_item_) ? (*partial_item_) : "NULL") << std::endl; + oss << " partial: "; + if (bool(partial_item_)) + oss << (*partial_item_) << std::endl; + else + oss << "NULL" << std::endl; return oss.str(); } From ffbfce6686c3f9dfeb27a9f0584a67e698838b68 Mon Sep 17 00:00:00 2001 From: Jon Malkin <786705+jmalkin@users.noreply.github.com> Date: Fri, 1 Dec 2023 20:49:34 -0800 Subject: [PATCH 2/3] fix kil_helper to avoid in-place std::move calls which breack nanobind ref counting (and perhaps other similar objects) --- kll/include/kll_helper_impl.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kll/include/kll_helper_impl.hpp b/kll/include/kll_helper_impl.hpp index e763c575..bb92bdc7 100644 --- a/kll/include/kll_helper_impl.hpp +++ b/kll/include/kll_helper_impl.hpp @@ -230,7 +230,8 @@ kll_helper::compress_result kll_helper::general_compress(uint16_t k, uint8_t m, // move level over as is // make sure we are not moving data upwards if (raw_beg < out_levels[current_level]) throw std::logic_error("wrong move"); - std::move(items + raw_beg, items + raw_lim, items + out_levels[current_level]); + if (raw_beg != out_levels[current_level]) + std::move(items + raw_beg, items + raw_lim, items + out_levels[current_level]); out_levels[current_level + 1] = out_levels[current_level] + raw_pop; } else { // The sketch is too full AND this level is too full, so we compact it @@ -243,7 +244,8 @@ kll_helper::compress_result kll_helper::general_compress(uint16_t k, uint8_t m, const auto half_adj_pop = adj_pop / 2; if (odd_pop) { // move one guy over - items[out_levels[current_level]] = std::move(items[raw_beg]); + if (out_levels[current_level] != raw_beg) + items[out_levels[current_level]] = std::move(items[raw_beg]); out_levels[current_level + 1] = out_levels[current_level] + 1; } else { // even number of items out_levels[current_level + 1] = out_levels[current_level]; From 247b4c4310bd03c6ebe9468f8340f8ff8fbd5e80 Mon Sep 17 00:00:00 2001 From: Jon Malkin <786705+jmalkin@users.noreply.github.com> Date: Wed, 13 Dec 2023 23:28:25 -0800 Subject: [PATCH 3/3] cherry pick a couple bugfixes --- version.cfg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.cfg.in b/version.cfg.in index 0062ac97..6b244dcd 100644 --- a/version.cfg.in +++ b/version.cfg.in @@ -1 +1 @@ -5.0.0 +5.0.1