feedc0de/GSL
1
0
Fork 0
forked from microsoft/GSL
Code Pull Requests Activity

Building again. Some tests failing.

Browse Source
This commit is contained in:
Neil MacIntosh
2015-10-23 19:49:17 -07:00
parent d0f09e768e
commit ace9ab9d3b
2 changed files with 103 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/array_view_tests.cpp
+54 -199
View File
@@ -227,11 +227,12 @@ SUITE(array_view_tests)
#endif
}
}
template <class Bounds> void fn(Bounds& b) { static_assert(Bounds::static_size == 60, "static bounds is wrong size"); }
TEST (array_view_reshape_test)
{
int a[3][4][5];
auto av = as_array_view(a);
fn(av.bounds());
auto av2 = av.as_array_view(dim<60>());
auto av3 = av2.as_array_view(dim<3>(), dim<4>(), dim<5>());
auto av4 = av3.as_array_view(dim<4>(), dim<>(3), dim<5>());
@@ -244,11 +245,11 @@ SUITE(array_view_tests)
auto av8 = av7.as_array_view<int>();
CHECK(av8.size() == av6.size());
for (auto i = 0; i < av8.size(); i++)
{
CHECK(av8[i] == 1);
}
//CHECK(av8.size() == av6.size());
//for (auto i = 0; i < av8.size(); i++)
//{
// CHECK(av8[i] == 1);
//}
#ifdef CONFIRM_COMPILATION_ERRORS
struct Foo {char c[11];};
@@ -314,7 +315,7 @@ SUITE(array_view_tests)
// From non-cv-qualified source
{
const array_view<int> src{ arr };
const array_view<int> src = arr;
strided_array_view<int, 1> sav{ src, {2, 1} };
CHECK(sav.bounds().index_bounds() == index<1>{ 2 });
@@ -824,13 +825,13 @@ SUITE(array_view_tests)
array_view<int, dynamic_range> av(arr, 8);
size_t a[1] = { 0 };
ptrdiff_t a[1] = { 0 };
index<1> i = a;
CHECK(av[i] == 4);
auto av2 = av.as_array_view(dim<4>(), dim<>(2));
size_t a2[2] = { 0, 1 };
ptrdiff_t a2[2] = { 0, 1 };
index<2> i2 = a2;
CHECK(av2[i2] == 0);
@@ -841,8 +842,8 @@ SUITE(array_view_tests)
TEST(index_operations)
{
size_t a[3] = { 0, 1, 2 };
size_t b[3] = { 3, 4, 5 };
ptrdiff_t a[3] = { 0, 1, 2 };
ptrdiff_t b[3] = { 3, 4, 5 };
index<3> i = a;
index<3> j = b;
@@ -903,12 +904,12 @@ SUITE(array_view_tests)
auto section = av.section({ 0,1 }, { length,1 });
CHECK(section.size() == length);
for (unsigned int i = 0; i < section.size(); ++i)
for (auto i = 0; i < section.size(); ++i)
{
CHECK(section[i][0] == av[i][1]);
}
for (unsigned int i = 0; i < section.size(); ++i)
for (auto i = 0; i < section.size(); ++i)
{
auto idx = index<2>{ i,0 }; // avoid braces inside the CHECK macro
CHECK(section[idx] == av[i][1]);
@@ -916,16 +917,16 @@ SUITE(array_view_tests)
CHECK(section.bounds().index_bounds()[0] == length);
CHECK(section.bounds().index_bounds()[1] == 1);
for (unsigned int i = 0; i < section.bounds().index_bounds()[0]; ++i)
for (auto i = 0; i < section.bounds().index_bounds()[0]; ++i)
{
for (unsigned int j = 0; j < section.bounds().index_bounds()[1]; ++j)
for (auto j = 0; j < section.bounds().index_bounds()[1]; ++j)
{
auto idx = index<2>{ i,j }; // avoid braces inside the CHECK macro
CHECK(section[idx] == av[i][1]);
}
}
size_t idx = 0;
ptrdiff_t idx = 0;
for (auto num : section)
{
CHECK(num == av[idx][1]);
@@ -961,11 +962,11 @@ SUITE(array_view_tests)
TEST(dynamic_array_view_section_iteration)
{
unsigned int height = 4, width = 2;
unsigned int size = height * width;
auto height = 4, width = 2;
auto size = height * width;
auto arr = new int[size];
for (int unsigned i = 0; i < size; ++i)
for (auto i = 0; i < size; ++i)
{
arr[i] = i;
}
@@ -1005,7 +1006,7 @@ SUITE(array_view_tests)
CHECK(strided.size() == length);
CHECK(strided.bounds().index_bounds()[0] == length);
for (unsigned int i = 0; i < strided.size(); ++i)
for (auto i = 0; i < strided.size(); ++i)
{
CHECK(strided[i] == av[2 * i + 1]);
}
@@ -1055,20 +1056,20 @@ SUITE(array_view_tests)
int expected[6] = { 2,3,10,11,18,19 };
auto section = av.section({ 0,1,0 }, { 3,1,2 });
for (unsigned int i = 0; i < section.extent<0>(); ++i)
for (auto i = 0; i < section.extent<0>(); ++i)
{
for (unsigned int j = 0; j < section.extent<1>(); ++j)
for (unsigned int k = 0; k < section.extent<2>(); ++k)
for (auto j = 0; j < section.extent<1>(); ++j)
for (auto k = 0; k < section.extent<2>(); ++k)
{
auto idx = index<3>{ i,j,k }; // avoid braces in the CHECK macro
CHECK(section[idx] == expected[2 * i + 2 * j + k]);
}
}
for (unsigned int i = 0; i < section.extent<0>(); ++i)
for (auto i = 0; i < section.extent<0>(); ++i)
{
for (unsigned int j = 0; j < section.extent<1>(); ++j)
for (unsigned int k = 0; k < section.extent<2>(); ++k)
for (auto j = 0; j < section.extent<1>(); ++j)
for (auto k = 0; k < section.extent<2>(); ++k)
CHECK(section[i][j][k] == expected[2 * i + 2 * j + k]);
}
@@ -1083,10 +1084,10 @@ SUITE(array_view_tests)
TEST(strided_array_view_section_iteration_3d)
{
int arr[3][4][2];
for (int i = 0; i < 3; ++i)
for (auto i = 0; i < 3; ++i)
{
for (int j = 0; j < 4; ++j)
for (unsigned int k = 0; k < 2; ++k)
for (auto j = 0; j < 4; ++j)
for (auto k = 0; k < 2; ++k)
arr[i][j][k] = 8 * i + 2 * j + k;
}
@@ -1098,11 +1099,11 @@ SUITE(array_view_tests)
TEST(dynamic_strided_array_view_section_iteration_3d)
{
unsigned int height = 12, width = 2;
unsigned int size = height * width;
auto height = 12, width = 2;
auto size = height * width;
auto arr = new int[size];
for (int unsigned i = 0; i < size; ++i)
for (auto i = 0; i < size; ++i)
{
arr[i] = i;
}
@@ -1137,7 +1138,7 @@ SUITE(array_view_tests)
X arr[4] = { { 0,1,2 },{ 3,4,5 },{ 6,7,8 },{ 9,10,11 } };
auto s = sizeof(int) / sizeof(byte);
int s = sizeof(int) / sizeof(byte);
auto d2 = 3 * s;
auto d1 = sizeof(int) * 12 / d2;
@@ -1179,152 +1180,6 @@ SUITE(array_view_tests)
}
template<size_t Rank, typename T1, typename T2>
index<Rank, T2> Convert(index<Rank, T1> index)
{
return{ index };
}
TEST(DomainConverters)
{
// to smaller
{
index<2, int> int_index{ 0,1 };
index<2, short> short_index{ int_index };
CHECK(short_index[0] == 0);
CHECK(short_index[1] == 1);
}
// to smaller (failure)
{
index<2, int> big_int_index{ std::numeric_limits<int>::max(), 1 };
CHECK_THROW((Convert<2,int, short int>(big_int_index)), fail_fast);
}
// to same, sign mismatch
{
index<2, int> int_index{ 0,1 };
index<2, unsigned int> uint_index{ int_index };
CHECK(uint_index[0] == 0);
CHECK(uint_index[1] == 1);
}
// to same, sign mismatch, reversed
{
index<2, unsigned int> uint_index{ 0,1 };
index<2, int> int_index{ uint_index };
CHECK(int_index[0] == 0);
CHECK(int_index[1] == 1);
}
// to smaller, sign mismatch
{
index<2, int> int_index{ 0,1 };
index<2, unsigned short> ushort_index{ int_index };
CHECK(ushort_index[0] == 0);
CHECK(ushort_index[1] == 1);
}
// to bigger
{
index<2, int> int_index{ 0,1 };
index<2, long long> longlong_index{ int_index };
CHECK(longlong_index[0] == 0);
CHECK(longlong_index[1] == 1);
}
// to bigger with max index
{
index<2, int> big_int_index{ std::numeric_limits<int>::max(), 1 };
index<2, long long> longlong_index{ big_int_index };
CHECK(longlong_index[0] == std::numeric_limits<int>::max());
CHECK(longlong_index[1] == 1);
}
// to bigger, sign mismatch
{
index<2, int> int_index{ 0,1 };
index<2, unsigned long long> ulonglong_index{ int_index };
CHECK(ulonglong_index[0] == 0);
CHECK(ulonglong_index[1] == 1);
}
}
TEST(DomainConvertersRank1)
{
// to smaller
{
index<1, int> int_index{ 0 };
index<1, short> short_index{ int_index };
CHECK(short_index[0] == 0);
}
// to smaller (failure)
{
index<1, int> big_int_index{ std::numeric_limits<int>::max() };
CHECK_THROW((Convert<1, int, short int>(big_int_index)), fail_fast);
}
// to same, sign mismatch
{
index<1, int> int_index{ 0 };
index<1, unsigned int> uint_index{ int_index };
CHECK(uint_index[0] == 0);
}
// to same, sign mismatch, reversed
{
index<1, unsigned int> uint_index{ 0 };
index<1, int> int_index{ uint_index };
CHECK(int_index[0] == 0);
}
// to smaller, sign mismatch
{
index<1, int> int_index{ 0 };
index<1, unsigned short> ushort_index{ int_index };
CHECK(ushort_index[0] == 0);
}
// to bigger
{
index<1, int> int_index{ 0 };
index<1, long long> longlong_index{ int_index };
CHECK(longlong_index[0] == 0);
}
// to bigger with max index
{
index<1, int> big_int_index{ std::numeric_limits<int>::max() };
index<1, long long> longlong_index{ big_int_index };
CHECK(longlong_index[0] == std::numeric_limits<int>::max());
}
// to bigger, sign mismatch
{
index<1, int> int_index{ 0 };
index<1, unsigned long long> ulonglong_index{ int_index };
CHECK(ulonglong_index[0] == 0);
}
}
TEST(constructors)
{
array_view<int, dynamic_range> av(nullptr);
@@ -1370,7 +1225,7 @@ SUITE(array_view_tests)
int arr[] = {3, 4, 5};
av1 = arr;
array_view<array_view_options<const int, unsigned char>, dynamic_range> av2;
array_view<const int, dynamic_range> av2;
av2 = av1;
}
@@ -1380,21 +1235,21 @@ SUITE(array_view_tests)
{
array_view<int, 5> av = arr;
CHECK((av.first<2>().bounds() == static_bounds<size_t, 2>()));
CHECK((av.first<2>().bounds() == static_bounds<2>()));
CHECK(av.first<2>().length() == 2);
CHECK(av.first(2).length() == 2);
}
{
array_view<int, 5> av = arr;
CHECK((av.first<0>().bounds() == static_bounds<size_t, 0>()));
CHECK((av.first<0>().bounds() == static_bounds<0>()));
CHECK(av.first<0>().length() == 0);
CHECK(av.first(0).length() == 0);
}
{
array_view<int, 5> av = arr;
CHECK((av.first<5>().bounds() == static_bounds<size_t, 5>()));
CHECK((av.first<5>().bounds() == static_bounds<5>()));
CHECK(av.first<5>().length() == 5);
CHECK(av.first(5).length() == 5);
}
@@ -1402,7 +1257,7 @@ SUITE(array_view_tests)
{
array_view<int, 5> av = arr;
#ifdef CONFIRM_COMPILATION_ERRORS
CHECK(av.first<6>().bounds() == static_bounds<size_t, 6>());
CHECK(av.first<6>().bounds() == static_bounds<6>());
CHECK(av.first<6>().length() == 6);
#endif
CHECK_THROW(av.first(6).length(), fail_fast);
@@ -1410,7 +1265,7 @@ SUITE(array_view_tests)
{
array_view<int, dynamic_range> av;
CHECK((av.first<0>().bounds() == static_bounds<size_t, 0>()));
CHECK((av.first<0>().bounds() == static_bounds<0>()));
CHECK(av.first<0>().length() == 0);
CHECK(av.first(0).length() == 0);
}
@@ -1422,21 +1277,21 @@ SUITE(array_view_tests)
{
array_view<int, 5> av = arr;
CHECK((av.last<2>().bounds() == static_bounds<size_t, 2>()));
CHECK((av.last<2>().bounds() == static_bounds<2>()));
CHECK(av.last<2>().length() == 2);
CHECK(av.last(2).length() == 2);
}
{
array_view<int, 5> av = arr;
CHECK((av.last<0>().bounds() == static_bounds<size_t, 0>()));
CHECK((av.last<0>().bounds() == static_bounds<0>()));
CHECK(av.last<0>().length() == 0);
CHECK(av.last(0).length() == 0);
}
{
array_view<int, 5> av = arr;
CHECK((av.last<5>().bounds() == static_bounds<size_t, 5>()));
CHECK((av.last<5>().bounds() == static_bounds<5>()));
CHECK(av.last<5>().length() == 5);
CHECK(av.last(5).length() == 5);
}
@@ -1445,7 +1300,7 @@ SUITE(array_view_tests)
{
array_view<int, 5> av = arr;
#ifdef CONFIRM_COMPILATION_ERRORS
CHECK((av.last<6>().bounds() == static_bounds<size_t, 6>()));
CHECK((av.last<6>().bounds() == static_bounds<6>()));
CHECK(av.last<6>().length() == 6);
#endif
CHECK_THROW(av.last(6).length(), fail_fast);
@@ -1453,7 +1308,7 @@ SUITE(array_view_tests)
{
array_view<int, dynamic_range> av;
CHECK((av.last<0>().bounds() == static_bounds<size_t, 0>()));
CHECK((av.last<0>().bounds() == static_bounds<0>()));
CHECK(av.last<0>().length() == 0);
CHECK(av.last(0).length() == 0);
}
@@ -1462,12 +1317,12 @@ SUITE(array_view_tests)
TEST(custmized_array_view_size)
{
double (*arr)[3][4] = new double[100][3][4];
array_view<array_view_options<double, char>, dynamic_range, 3, 4> av1(arr, (char)10);
array_view<double, dynamic_range, 3, 4> av1(arr, 10);
struct EffectiveStructure
{
double* v1;
char v2;
ptrdiff_t v2;
};
CHECK(sizeof(av1) == sizeof(EffectiveStructure));
@@ -1483,7 +1338,7 @@ SUITE(array_view_tests)
{
array_view<int, 5> av = arr;
CHECK((av.sub<2,2>().bounds() == static_bounds<size_t, 2>()));
CHECK((av.sub<2,2>().bounds() == static_bounds<2>()));
CHECK((av.sub<2,2>().length() == 2));
CHECK(av.sub(2,2).length() == 2);
CHECK(av.sub(2,3).length() == 3);
@@ -1492,14 +1347,14 @@ SUITE(array_view_tests)
{
array_view<int, 5> av = arr;
CHECK((av.sub<0,0>().bounds() == static_bounds<size_t, 0>()));
CHECK((av.sub<0,0>().bounds() == static_bounds<0>()));
CHECK((av.sub<0,0>().length() == 0));
CHECK(av.sub(0,0).length() == 0);
}
{
array_view<int, 5> av = arr;
CHECK((av.sub<0,5>().bounds() == static_bounds<size_t, 5>()));
CHECK((av.sub<0,5>().bounds() == static_bounds<5>()));
CHECK((av.sub<0,5>().length() == 5));
CHECK(av.sub(0,5).length() == 5);
CHECK_THROW(av.sub(0,6).length(), fail_fast);
@@ -1508,7 +1363,7 @@ SUITE(array_view_tests)
{
array_view<int, 5> av = arr;
CHECK((av.sub<5,0>().bounds() == static_bounds<size_t, 0>()));
CHECK((av.sub<5,0>().bounds() == static_bounds<0>()));
CHECK((av.sub<5, 0>().length() == 0));
CHECK(av.sub(5,0).length() == 0);
CHECK_THROW(av.sub(6,0).length(), fail_fast);
@@ -1516,7 +1371,7 @@ SUITE(array_view_tests)
{
array_view<int, dynamic_range> av;
CHECK((av.sub<0,0>().bounds() == static_bounds<size_t, 0>()));
CHECK((av.sub<0,0>().bounds() == static_bounds<0>()));
CHECK((av.sub<0,0>().length() == 0));
CHECK(av.sub(0,0).length() == 0);
CHECK_THROW((av.sub<1,0>().length()), fail_fast);
@@ -1564,7 +1419,7 @@ SUITE(array_view_tests)
void AssertContentsMatch(T a1, U a2)
{
CHECK(a1.length() == a2.length());
for (size_t i = 0; i < a1.length(); ++i)
for (auto i = 0; i < a1.length(); ++i)
CHECK(a1[i] == a2[i]);
}
@@ -1726,7 +1581,7 @@ SUITE(array_view_tests)
CHECK(av1 == av2);
array_view<array_view_options<int, char>, 20> av3 = av1.as_array_view(dim<>(20));
array_view<int, 20> av3 = av1.as_array_view(dim<>(20));
CHECK(av3 == av2 && av3 == av1);
}