Skip to content

Change vector<T> to use the system-wide default queue #286

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Change vector<T> to use the system-wide default queue #286

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
130 changes: 29 additions & 101 deletions include/boost/compute/container/flat_map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ class flat_map
{
}

flat_map(const flat_map<Key, T> &other)
: m_vector(other.m_vector)
flat_map(const flat_map<Key, T> &other,
command_queue &queue = system::default_queue())
: m_vector(other.m_vector, queue)
{
}

Expand Down Expand Up @@ -153,18 +154,12 @@ class flat_map
return m_vector.capacity();
}

void reserve(size_type size, command_queue &queue)
void reserve(size_type size,
command_queue &queue = system::default_queue())
{
m_vector.reserve(size, queue);
}

void reserve(size_type size)
{
command_queue queue = m_vector.default_queue();
reserve(size, queue);
queue.finish();
}

void shrink_to_fit()
{
m_vector.shrink_to_fit();
Expand All @@ -176,7 +171,8 @@ class flat_map
}

std::pair<iterator, bool>
insert(const value_type &value, command_queue &queue)
insert(const value_type &value,
command_queue &queue = system::default_queue())
{
iterator location = upper_bound(value.first, queue);

Expand All @@ -192,43 +188,21 @@ class flat_map
return std::make_pair(location, true);
}

std::pair<iterator, bool> insert(const value_type &value)
{
command_queue queue = m_vector.default_queue();
std::pair<iterator, bool> result = insert(value, queue);
queue.finish();
return result;
}

iterator erase(const const_iterator &position, command_queue &queue)
iterator erase(const const_iterator &position,
command_queue &queue = system::default_queue())
{
return erase(position, position + 1, queue);
}

iterator erase(const const_iterator &position)
{
command_queue queue = m_vector.default_queue();
iterator iter = erase(position, queue);
queue.finish();
return iter;
}

iterator erase(const const_iterator &first,
const const_iterator &last,
command_queue &queue)
command_queue &queue = system::default_queue())
{
return m_vector.erase(first, last, queue);
}

iterator erase(const const_iterator &first, const const_iterator &last)
{
command_queue queue = m_vector.default_queue();
iterator iter = erase(first, last, queue);
queue.finish();
return iter;
}

size_type erase(const key_type &value, command_queue &queue)
size_type erase(const key_type &value,
command_queue &queue = system::default_queue())
{
iterator position = find(value, queue);

Expand All @@ -241,7 +215,8 @@ class flat_map
}
}

iterator find(const key_type &value, command_queue &queue)
iterator find(const key_type &value,
command_queue &queue = system::default_queue())
{
::boost::compute::get<0> get_key;

Expand All @@ -253,15 +228,8 @@ class flat_map
).base();
}

iterator find(const key_type &value)
{
command_queue queue = m_vector.default_queue();
iterator iter = find(value, queue);
queue.finish();
return iter;
}

const_iterator find(const key_type &value, command_queue &queue) const
const_iterator find(const key_type &value,
command_queue &queue = system::default_queue()) const
{
::boost::compute::get<0> get_key;

Expand All @@ -273,28 +241,14 @@ class flat_map
).base();
}

const_iterator find(const key_type &value) const
{
command_queue queue = m_vector.default_queue();
const_iterator iter = find(value, queue);
queue.finish();
return iter;
}

size_type count(const key_type &value, command_queue &queue) const
size_type count(const key_type &value,
command_queue &queue = system::default_queue()) const
{
return find(value, queue) != end() ? 1 : 0;
}

size_type count(const key_type &value) const
{
command_queue queue = m_vector.default_queue();
size_type result = count(value, queue);
queue.finish();
return result;
}

iterator lower_bound(const key_type &value, command_queue &queue)
iterator lower_bound(const key_type &value,
command_queue &queue = system::default_queue())
{
::boost::compute::get<0> get_key;

Expand All @@ -306,15 +260,8 @@ class flat_map
).base();
}

iterator lower_bound(const key_type &value)
{
command_queue queue = m_vector.default_queue();
iterator iter = lower_bound(value, queue);
queue.finish();
return iter;
}

const_iterator lower_bound(const key_type &value, command_queue &queue) const
const_iterator lower_bound(const key_type &value,
command_queue &queue = system::default_queue()) const
{
::boost::compute::get<0> get_key;

Expand All @@ -326,15 +273,8 @@ class flat_map
).base();
}

const_iterator lower_bound(const key_type &value) const
{
command_queue queue = m_vector.default_queue();
const_iterator iter = lower_bound(value, queue);
queue.finish();
return iter;
}

iterator upper_bound(const key_type &value, command_queue &queue)
iterator upper_bound(const key_type &value,
command_queue &queue = system::default_queue())
{
::boost::compute::get<0> get_key;

Expand All @@ -346,15 +286,8 @@ class flat_map
).base();
}

iterator upper_bound(const key_type &value)
{
command_queue queue = m_vector.default_queue();
iterator iter = upper_bound(value, queue);
queue.finish();
return iter;
}

const_iterator upper_bound(const key_type &value, command_queue &queue) const
const_iterator upper_bound(const key_type &value,
command_queue &queue = system::default_queue()) const
{
::boost::compute::get<0> get_key;

Expand All @@ -366,14 +299,6 @@ class flat_map
).base();
}

const_iterator upper_bound(const key_type &value) const
{
command_queue queue = m_vector.default_queue();
const_iterator iter = upper_bound(value, queue);
queue.finish();
return iter;
}

const mapped_type at(const key_type &key) const
{
const_iterator iter = find(key);
Expand All @@ -391,6 +316,9 @@ class flat_map
iter = insert(std::make_pair(key, mapped_type())).first;
}

// ensure insert() is finished before returning value
system::finish();

size_t index = iter.get_index() * sizeof(value_type) + sizeof(key_type);

return detail::buffer_value<mapped_type>(m_vector.get_buffer(), index);
Expand Down
Loading