Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Span: use size_t' for index_type, add front' and `back'. (#4935)

Browse Source 
* Use `size_t' for index_type.  Add `front' and `back'.

* Remove a batch of `static_cast'.
This commit is contained in:
Jiaming Yuan
2019-10-14 09:13:33 -04:00
committed by GitHub
parent a9053aff83
commit b61d534472
9 changed files with 160 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/cpp/common/test_span.cc
View File

@@ -98,7 +98,8 @@ TEST(Span, FromPtrLen) {
}
{
EXPECT_ANY_THROW(Span<float> tmp (arr, -1););
auto lazy = [=]() {Span<float const, 16> tmp (arr, 5);};
EXPECT_ANY_THROW(lazy());
}
// dynamic extent
@@ -298,6 +299,32 @@ TEST(Span, Obversers) {
ASSERT_EQ(status, 1);
}
TEST(Span, FrontBack) {
{
float arr[4] {0, 1, 2, 3};
Span<float, 4> s(arr);
ASSERT_EQ(s.front(), 0);
ASSERT_EQ(s.back(), 3);
}
{
std::vector<double> arr {0, 1, 2, 3};
Span<double> s(arr);
ASSERT_EQ(s.front(), 0);
ASSERT_EQ(s.back(), 3);
}
{
Span<float, 0> s;
EXPECT_ANY_THROW(s.front());
EXPECT_ANY_THROW(s.back());
}
{
Span<float> s;
EXPECT_ANY_THROW(s.front());
EXPECT_ANY_THROW(s.back());
}
}
TEST(Span, FirstLast) {
// static extent
{
@@ -310,11 +337,11 @@ TEST(Span, FirstLast) {
ASSERT_EQ(first.size(), 4);
ASSERT_EQ(first.data(), arr);
for (int64_t i = 0; i < first.size(); ++i) {
for (size_t i = 0; i < first.size(); ++i) {
ASSERT_EQ(first[i], arr[i]);
}
EXPECT_ANY_THROW(s.first<-1>());
auto constexpr kOne = static_cast<Span<float, 4>::index_type>(-1);
EXPECT_ANY_THROW(s.first<kOne>());
EXPECT_ANY_THROW(s.first<17>());
EXPECT_ANY_THROW(s.first<32>());
}
@@ -329,11 +356,11 @@ TEST(Span, FirstLast) {
ASSERT_EQ(last.size(), 4);
ASSERT_EQ(last.data(), arr + 12);
for (int64_t i = 0; i < last.size(); ++i) {
for (size_t i = 0; i < last.size(); ++i) {
ASSERT_EQ(last[i], arr[i+12]);
}
EXPECT_ANY_THROW(s.last<-1>());
auto constexpr kOne = static_cast<Span<float, 4>::index_type>(-1);
EXPECT_ANY_THROW(s.last<kOne>());
EXPECT_ANY_THROW(s.last<17>());
EXPECT_ANY_THROW(s.last<32>());
}
@@ -348,7 +375,7 @@ TEST(Span, FirstLast) {
ASSERT_EQ(first.size(), 4);
ASSERT_EQ(first.data(), s.data());
for (int64_t i = 0; i < first.size(); ++i) {
for (size_t i = 0; i < first.size(); ++i) {
ASSERT_EQ(first[i], s[i]);
}
@@ -368,7 +395,7 @@ TEST(Span, FirstLast) {
ASSERT_EQ(last.size(), 4);
ASSERT_EQ(last.data(), s.data() + 12);
for (int64_t i = 0; i < last.size(); ++i) {
for (size_t i = 0; i < last.size(); ++i) {
ASSERT_EQ(s[12 + i], last[i]);
}
@@ -397,7 +424,8 @@ TEST(Span, Subspan) {
EXPECT_ANY_THROW(s1.subspan(-1, 0));
EXPECT_ANY_THROW(s1.subspan(16, 0));
EXPECT_ANY_THROW(s1.subspan<-1>());
auto constexpr kOne = static_cast<Span<int, 4>::index_type>(-1);
EXPECT_ANY_THROW(s1.subspan<kOne>());
EXPECT_ANY_THROW(s1.subspan<16>());
}

43
tests/cpp/common/test_span.cu
View File

@@ -240,16 +240,16 @@ TEST(GPUSpan, ElementAccess) {
}
__global__ void TestFirstDynamicKernel(Span<float> _span) {
_span.first<-1>();
_span.first<static_cast<Span<float>::index_type>(-1)>();
}
__global__ void TestFirstStaticKernel(Span<float> _span) {
_span.first(-1);
_span.first(static_cast<Span<float>::index_type>(-1));
}
__global__ void TestLastDynamicKernel(Span<float> _span) {
_span.last<-1>();
_span.last<static_cast<Span<float>::index_type>(-1)>();
}
__global__ void TestLastStaticKernel(Span<float> _span) {
_span.last(-1);
_span.last(static_cast<Span<float>::index_type>(-1));
}
TEST(GPUSpan, FirstLast) {
@@ -312,6 +312,41 @@ TEST(GPUSpan, FirstLast) {
output = testing::internal::GetCapturedStdout();
}
__global__ void TestFrontKernel(Span<float> _span) {
_span.front();
}
__global__ void TestBackKernel(Span<float> _span) {
_span.back();
}
TEST(GPUSpan, FrontBack) {
dh::safe_cuda(cudaSetDevice(0));
Span<float> s;
auto lambda_test_front = [=]() {
// make sure the termination happens inside this test.
try {
TestFrontKernel<<<1, 1>>>(s);
dh::safe_cuda(cudaDeviceSynchronize());
dh::safe_cuda(cudaGetLastError());
} catch (dmlc::Error const& e) {
std::terminate();
}
};
EXPECT_DEATH(lambda_test_front(), "");
auto lambda_test_back = [=]() {
try {
TestBackKernel<<<1, 1>>>(s);
dh::safe_cuda(cudaDeviceSynchronize());
dh::safe_cuda(cudaGetLastError());
} catch (dmlc::Error const& e) {
std::terminate();
}
};
EXPECT_DEATH(lambda_test_back(), "");
}
__global__ void TestSubspanDynamicKernel(Span<float> _span) {
_span.subspan(16, 0);