Skip to content
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

Adds ability to specify default values in ygm::container::map #267

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Adds ability to specify default values in ygm::container::map #267

Show file tree
Hide file tree
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
67 changes: 44 additions & 23 deletions include/ygm/container/map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,21 @@ class map

map() = delete;

map(ygm::comm& comm) : m_comm(comm), pthis(this), partitioner(comm) {
map(ygm::comm& comm)
: m_comm(comm), pthis(this), partitioner(comm), m_default_value() {
pthis.check(m_comm);
}

map(ygm::comm& comm, const mapped_type& default_value)
: m_comm(comm),
pthis(this),
partitioner(comm),
m_default_value(default_value) {
pthis.check(m_comm);
}

map(ygm::comm& comm, std::initializer_list<std::pair<Key, Value>> l)
: m_comm(comm), pthis(this), partitioner(comm) {
: m_comm(comm), pthis(this), partitioner(comm), m_default_value() {
pthis.check(m_comm);
if (m_comm.rank0()) {
for (const std::pair<Key, Value>& i : l) {
Expand All @@ -67,11 +76,11 @@ class map
}

template <typename STLContainer>
map(ygm::comm& comm,
const STLContainer& cont) requires detail::STLContainer<STLContainer> &&
std::convertible_to<typename STLContainer::value_type,
std::pair<Key, Value>>
: m_comm(comm), pthis(this), partitioner(comm) {
map(ygm::comm& comm, const STLContainer& cont)
requires detail::STLContainer<STLContainer> &&
std::convertible_to<typename STLContainer::value_type,
std::pair<Key, Value>>
: m_comm(comm), pthis(this), partitioner(comm), m_default_value() {
pthis.check(m_comm);

for (const std::pair<Key, Value>& i : cont) {
Expand All @@ -81,10 +90,10 @@ class map
}

template <typename YGMContainer>
map(ygm::comm& comm,
const YGMContainer& yc) requires detail::HasForAll<YGMContainer> &&
detail::SingleItemTuple<typename YGMContainer::for_all_args>
: m_comm(comm), pthis(this), partitioner(comm) {
map(ygm::comm& comm, const YGMContainer& yc)
requires detail::HasForAll<YGMContainer> &&
detail::SingleItemTuple<typename YGMContainer::for_all_args>
: m_comm(comm), pthis(this), partitioner(comm), m_default_value() {
pthis.check(m_comm);

yc.for_all([this](const std::pair<Key, Value>& value) {
Expand All @@ -103,7 +112,7 @@ class map
using detail::base_batch_erase_key_value<map<Key, Value>,
for_all_args>::erase;

void local_insert(const key_type& key) { m_local_map[key]; }
void local_insert(const key_type& key) { local_insert(key, m_default_value); }

void local_erase(const key_type& key) { m_local_map.erase(key); }

Expand Down Expand Up @@ -331,6 +340,7 @@ class map

ygm::comm& m_comm;
std::unordered_map<key_type, mapped_type> m_local_map;
mapped_type m_default_value;
typename ygm::ygm_ptr<self_type> pthis;
};

Expand Down Expand Up @@ -368,12 +378,21 @@ class multimap

multimap() = delete;

multimap(ygm::comm& comm) : m_comm(comm), pthis(this), partitioner(comm) {
multimap(ygm::comm& comm)
: m_comm(comm), pthis(this), partitioner(comm), m_default_value() {
pthis.check(m_comm);
}

multimap(ygm::comm& comm, const mapped_type& default_value)
: m_comm(comm),
pthis(this),
partitioner(comm),
m_default_value(default_value) {
pthis.check(m_comm);
}

multimap(ygm::comm& comm, std::initializer_list<std::pair<Key, Value>> l)
: m_comm(comm), pthis(this), partitioner(comm) {
: m_comm(comm), pthis(this), partitioner(comm), m_default_value() {
pthis.check(m_comm);
if (m_comm.rank0()) {
for (const std::pair<Key, Value>& i : l) {
Expand All @@ -383,10 +402,11 @@ class multimap
}

template <typename STLContainer>
multimap(ygm::comm& comm, const STLContainer& cont) requires
detail::STLContainer<STLContainer> && std::convertible_to<
typename STLContainer::value_type, std::pair<Key, Value>>
: m_comm(comm), pthis(this), partitioner(comm) {
multimap(ygm::comm& comm, const STLContainer& cont)
requires detail::STLContainer<STLContainer> &&
std::convertible_to<typename STLContainer::value_type,
std::pair<Key, Value>>
: m_comm(comm), pthis(this), partitioner(comm), m_default_value() {
pthis.check(m_comm);

for (const std::pair<Key, Value>& i : cont) {
Expand All @@ -396,10 +416,10 @@ class multimap
}

template <typename YGMContainer>
multimap(ygm::comm& comm,
const YGMContainer& yc) requires detail::HasForAll<YGMContainer> &&
detail::SingleItemTuple<typename YGMContainer::for_all_args>
: m_comm(comm), pthis(this), partitioner(comm) {
multimap(ygm::comm& comm, const YGMContainer& yc)
requires detail::HasForAll<YGMContainer> &&
detail::SingleItemTuple<typename YGMContainer::for_all_args>
: m_comm(comm), pthis(this), partitioner(comm), m_default_value() {
pthis.check(m_comm);

yc.for_all([this](const std::pair<Key, Value>& value) {
Expand All @@ -413,7 +433,7 @@ class multimap

void local_insert(const key_type& key) {
if (m_local_map.count(key) == 0) {
m_local_map.insert({key, mapped_type()});
m_local_map.insert({key, m_default_value});
}
}

Expand Down Expand Up @@ -624,6 +644,7 @@ class multimap

ygm::comm& m_comm;
std::unordered_multimap<key_type, mapped_type> m_local_map;
mapped_type m_default_value;
typename ygm::ygm_ptr<self_type> pthis;
};

Expand Down
21 changes: 21 additions & 0 deletions test/test_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,27 @@ int main(int argc, char **argv) {
YGM_ASSERT_RELEASE(smap.size() == 0);
}

//
// Test default value
{
ygm::container::map<std::string, std::string> smap(world, "NOT FOUND");

smap.async_insert("dog", "cat");

world.barrier();

if (world.rank0()) {
smap.async_visit("dog", [](const auto &k, const auto &v) {
YGM_ASSERT_RELEASE(v == "cat");
});
smap.async_visit("not inserted", [](const auto &k, const auto &v) {
YGM_ASSERT_RELEASE(v == "NOT FOUND");
});
}

YGM_ASSERT_RELEASE(smap.size() == 2);
}

// //
// // Test async_insert_else_visit
// {
Expand Down