boost/compute
2
0
Fork 0
mirror of https://github.com/boostorg/compute.git synced 2026-02-18 14:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #525 from haahh/pr_vector_custom_alloc

Browse Source 
Vector with custom allocator fix
This commit is contained in:
Kyle Lutz
2015-10-10 09:16:11 -07:00
parent bc83a43045 afd09bcd7d
commit 781cf302cb
2 changed files with 132 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
test/test_vector.cpp
View File

@@ -19,6 +19,7 @@
#include <boost/compute/algorithm/fill.hpp>
#include <boost/compute/algorithm/find.hpp>
#include <boost/compute/algorithm/remove.hpp>
#include <boost/compute/allocator/pinned_allocator.hpp>
#include <boost/compute/container/vector.hpp>
#include "check_macros.hpp"
@@ -184,11 +185,27 @@ BOOST_AUTO_TEST_CASE(max_size)
BOOST_AUTO_TEST_CASE(move_ctor)
{
int data[] = { 11, 12, 13, 14 };
bc::vector<int> a(data, data + 4);
bc::vector<int> a(data, data + 4, queue);
BOOST_CHECK_EQUAL(a.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, a, (11, 12, 13, 14));
bc::vector<int> b(std::move(a));
BOOST_CHECK(a.size() == 0);
BOOST_CHECK(a.get_buffer().get() == 0);
BOOST_CHECK_EQUAL(b.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, b, (11, 12, 13, 14));
}
BOOST_AUTO_TEST_CASE(move_ctor_custom_alloc)
{
int data[] = { 11, 12, 13, 14 };
bc::vector<int, bc::pinned_allocator<int> > a(data, data + 4, queue);
BOOST_CHECK_EQUAL(a.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, a, (11, 12, 13, 14));
bc::vector<int, bc::pinned_allocator<int> > b(std::move(a));
BOOST_CHECK(a.size() == 0);
BOOST_CHECK(a.get_buffer().get() == 0);
BOOST_CHECK_EQUAL(b.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, b, (11, 12, 13, 14));
}
@@ -330,4 +347,92 @@ BOOST_AUTO_TEST_CASE(resize_throw_exception)
CHECK_RANGE_EQUAL(int, 8, vec, (1, 2, 3, 4, 5, 6, 7, 8));
}
BOOST_AUTO_TEST_CASE(copy_ctor_custom_alloc)
{
int data[] = { 11, 12, 13, 14 };
bc::vector<int, bc::pinned_allocator<int> > a(data, data + 4, queue);
BOOST_CHECK_EQUAL(a.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, a, (11, 12, 13, 14));
bc::vector<int, bc::pinned_allocator<int> > b(a, queue);
BOOST_CHECK_EQUAL(b.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, b, (11, 12, 13, 14));
}
BOOST_AUTO_TEST_CASE(copy_ctor_different_alloc)
{
int data[] = { 11, 12, 13, 14 };
bc::vector<int> a(data, data + 4, queue);
BOOST_CHECK_EQUAL(a.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, a, (11, 12, 13, 14));
bc::vector<int, bc::pinned_allocator<int> > b(a, queue);
BOOST_CHECK_EQUAL(b.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, b, (11, 12, 13, 14));
std::vector<int> host_vector;
host_vector.push_back(1);
host_vector.push_back(9);
host_vector.push_back(7);
host_vector.push_back(9);
bc::vector<int, bc::pinned_allocator<int> > c(host_vector, queue);
BOOST_CHECK_EQUAL(c.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, c, (1, 9, 7, 9));
}
BOOST_AUTO_TEST_CASE(assignment_operator)
{
int adata[] = { 11, 12, 13, 14 };
bc::vector<int> a(adata, adata + 4, queue);
BOOST_CHECK_EQUAL(a.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, a, (11, 12, 13, 14));
bc::vector<int> b = a;
BOOST_CHECK_EQUAL(b.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, b, (11, 12, 13, 14));
bc::vector<int, bc::pinned_allocator<int> > c = b;
BOOST_CHECK_EQUAL(c.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, c, (11, 12, 13, 14));
int ddata[] = { 21, 22, 23 };
bc::vector<int, bc::pinned_allocator<int> > d(ddata, ddata + 3, queue);
BOOST_CHECK_EQUAL(d.size(), size_t(3));
CHECK_RANGE_EQUAL(int, 3, d, (21, 22, 23));
a = d;
BOOST_CHECK_EQUAL(a.size(), size_t(3));
CHECK_RANGE_EQUAL(int, 3, a, (21, 22, 23));
std::vector<int> host_vector;
host_vector.push_back(1);
host_vector.push_back(9);
host_vector.push_back(7);
host_vector.push_back(9);
d = host_vector;
BOOST_CHECK_EQUAL(d.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, d, (1, 9, 7, 9));
}
BOOST_AUTO_TEST_CASE(swap_ctor_custom_alloc)
{
int adata[] = { 11, 12, 13, 14 };
bc::vector<int, bc::pinned_allocator<int> > a(adata, adata + 4, queue);
BOOST_CHECK_EQUAL(a.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, a, (11, 12, 13, 14));
int bdata[] = { 21, 22, 23 };
bc::vector<int, bc::pinned_allocator<int> > b(bdata, bdata + 3, queue);
BOOST_CHECK_EQUAL(b.size(), size_t(3));
CHECK_RANGE_EQUAL(int, 3, b, (21, 22, 23));
a.swap(b);
BOOST_CHECK_EQUAL(a.size(), size_t(3));
CHECK_RANGE_EQUAL(int, 3, a, (21, 22, 23));
BOOST_CHECK_EQUAL(b.size(), size_t(4));
CHECK_RANGE_EQUAL(int, 4, b, (11, 12, 13, 14));
}
BOOST_AUTO_TEST_SUITE_END()