Skip to content

Distributed size for concurrent ordered containers #1803

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

Merged
kboyarinov merged 20 commits into from
Feb 24, 2026
Merged

Distributed size for concurrent ordered containers #1803

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
31313e2
Add distributed size wrapper
kboyarinov Jul 29, 2025
a1a9c6f
Add folding
kboyarinov Jul 31, 2025
598f986
Combined
kboyarinov Jul 31, 2025
eca2760
Complete implementation
kboyarinov Aug 4, 2025
66e3f36
Update copyright, fix combine_each
kboyarinov Aug 4, 2025
0b58389
Remove newline from test
kboyarinov Aug 4, 2025
9355827
Introduce preview feature
kboyarinov Aug 27, 2025
dbe4bbd
Add missed UXL copyright
kboyarinov Aug 27, 2025
1d16491
Remove preview macros
kboyarinov Nov 27, 2025
1579aad
Merge remote-tracking branch 'origin/master' into dev/kboyarinov/dist…
kboyarinov Nov 27, 2025
c9810c7
Rebase to master, increase namespace version
kboyarinov Nov 27, 2025
72b6db7
Discard changes in tests
kboyarinov Nov 27, 2025
92f3b96
Remove macro from the test config
kboyarinov Nov 27, 2025
e8c2713
Update Natvis to display distributed size correctly (#1918)
isaevil Dec 8, 2025
f1b46bf
Merge remote-tracking branch 'origin/master' into dev/kboyarinov/dist…
kboyarinov Feb 5, 2026
7b49167
Partially address review comments
kboyarinov Feb 17, 2026
81ad273
Fix copyrights
kboyarinov Feb 17, 2026
e5fbbb8
Add UXL copyright to Natvis
kboyarinov Feb 17, 2026
694e251
Add comments
kboyarinov Feb 18, 2026
0073b35
Update include/oneapi/tbb/detail/_concurrent_skip_list.h
kboyarinov Feb 19, 2026
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
19 changes: 10 additions & 9 deletions include/oneapi/tbb/concurrent_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright (c) 2019-2021 Intel Corporation
Copyright (c) 2019-2025 Intel Corporation
Copyright (c) 2025 UXL Foundation Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -26,7 +27,7 @@

namespace tbb {
namespace detail {
namespace d2 {
namespace d3 {

template<typename Key, typename Value, typename KeyCompare, typename RandomGenerator,
typename Allocator, bool AllowMultimapping>
Expand Down Expand Up @@ -68,8 +69,8 @@ template <typename Key, typename Value, typename Compare, typename Allocator>
class concurrent_multimap;

template <typename Key, typename Value, typename Compare = std::less<Key>, typename Allocator = tbb::tbb_allocator<std::pair<const Key, Value>>>
class concurrent_map : public concurrent_skip_list<map_traits<Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, false>> {
using base_type = concurrent_skip_list<map_traits<Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, false>>;
class concurrent_map : public concurrent_skip_list<map_traits<Key, Value, Compare, geometric_level_generator<32>, Allocator, false>> {
using base_type = concurrent_skip_list<map_traits<Key, Value, Compare, geometric_level_generator<32>, Allocator, false>>;
public:
using key_type = Key;
using mapped_type = Value;
Expand Down Expand Up @@ -218,8 +219,8 @@ void swap( concurrent_map<Key, Value, Compare, Allocator>& lhs,
}

template <typename Key, typename Value, typename Compare = std::less<Key>, typename Allocator = tbb::tbb_allocator<std::pair<const Key, Value>>>
class concurrent_multimap : public concurrent_skip_list<map_traits<Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, true>> {
using base_type = concurrent_skip_list<map_traits<Key, Value, Compare, concurrent_geometric_level_generator<32>, Allocator, true>>;
class concurrent_multimap : public concurrent_skip_list<map_traits<Key, Value, Compare, geometric_level_generator<32>, Allocator, true>> {
using base_type = concurrent_skip_list<map_traits<Key, Value, Compare, geometric_level_generator<32>, Allocator, true>>;
public:
using key_type = Key;
using mapped_type = Value;
Expand Down Expand Up @@ -335,13 +336,13 @@ void swap( concurrent_multimap<Key, Value, Compare, Allocator>& lhs,
lhs.swap(rhs);
}

} // namespace d2
} // namespace d3
} // namespace detail

inline namespace v1 {

using detail::d2::concurrent_map;
using detail::d2::concurrent_multimap;
using detail::d3::concurrent_map;
using detail::d3::concurrent_multimap;
using detail::split;

} // inline namespace v1
Expand Down
19 changes: 10 additions & 9 deletions include/oneapi/tbb/concurrent_set.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright (c) 2019-2021 Intel Corporation
Copyright (c) 2019-2025 Intel Corporation
Copyright (c) 2025 UXL Foundation Contributors
Copy link
Copy Markdown
Contributor

@aleksei-fedotov aleksei-fedotov Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the copyright is outdated hier and in other files.

Copy link
Copy Markdown
Contributor Author

@kboyarinov kboyarinov Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -25,7 +26,7 @@

namespace tbb {
namespace detail {
namespace d2 {
namespace d3 {

template<typename Key, typename KeyCompare, typename RandomGenerator, typename Allocator, bool AllowMultimapping>
struct set_traits {
Expand All @@ -52,8 +53,8 @@ template <typename Key, typename Compare, typename Allocator>
class concurrent_multiset;

template <typename Key, typename Compare = std::less<Key>, typename Allocator = tbb::tbb_allocator<Key>>
class concurrent_set : public concurrent_skip_list<set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, false>> {
using base_type = concurrent_skip_list<set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, false>>;
class concurrent_set : public concurrent_skip_list<set_traits<Key, Compare, geometric_level_generator<32>, Allocator, false>> {
using base_type = concurrent_skip_list<set_traits<Key, Compare, geometric_level_generator<32>, Allocator, false>>;
public:
using key_type = Key;
using value_type = typename base_type::value_type;
Expand Down Expand Up @@ -153,8 +154,8 @@ void swap( concurrent_set<Key, Compare, Allocator>& lhs,
}

template <typename Key, typename Compare = std::less<Key>, typename Allocator = tbb::tbb_allocator<Key>>
class concurrent_multiset : public concurrent_skip_list<set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, true>> {
using base_type = concurrent_skip_list<set_traits<Key, Compare, concurrent_geometric_level_generator<32>, Allocator, true>>;
class concurrent_multiset : public concurrent_skip_list<set_traits<Key, Compare, geometric_level_generator<32>, Allocator, true>> {
using base_type = concurrent_skip_list<set_traits<Key, Compare, geometric_level_generator<32>, Allocator, true>>;
public:
using key_type = Key;
using value_type = typename base_type::value_type;
Expand Down Expand Up @@ -252,13 +253,13 @@ void swap( concurrent_multiset<Key, Compare, Allocator>& lhs,
lhs.swap(rhs);
}

} // namespace d2
} // namespace d3
} // namespace detail

inline namespace v1 {

using detail::d2::concurrent_set;
using detail::d2::concurrent_multiset;
using detail::d3::concurrent_set;
using detail::d3::concurrent_multiset;
using detail::split;

} // inline namespace v1
Expand Down
Loading
Loading