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

Fix empty subspan. (#4151)

Browse Source 
* Silent the death tests.
This commit is contained in:
Jiaming Yuan
2019-02-17 04:48:03 +08:00
committed by GitHub
parent ff2d4c99fa
commit 1fe874e58a
3 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,5 +419,29 @@ TEST(Span, AsWritableBytes) {
ASSERT_EQ(status, 1);
}
TEST(Span, Empty) {
{
Span<float> s {nullptr, static_cast<Span<float>::index_type>(0)};
auto res = s.subspan(0);
ASSERT_EQ(res.data(), nullptr);
ASSERT_EQ(res.size(), 0);
res = s.subspan(0, 0);
ASSERT_EQ(res.data(), nullptr);
ASSERT_EQ(res.size(), 0);
}
{
Span<float, 0> s {nullptr, static_cast<Span<float>::index_type>(0)};
auto res = s.subspan(0);
ASSERT_EQ(res.data(), nullptr);
ASSERT_EQ(res.size(), 0);
res = s.subspan(0, 0);
ASSERT_EQ(res.data(), nullptr);
ASSERT_EQ(res.size(), 0);
}
}
} // namespace common
} // namespace xgboost

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

@@ -216,15 +216,20 @@ struct TestElementAccess {
TEST(GPUSpan, ElementAccess) {
dh::safe_cuda(cudaSetDevice(0));
EXPECT_DEATH({
thrust::host_vector<float> h_vec (16);
InitializeRange(h_vec.begin(), h_vec.end());
auto test_element_access = []() {
thrust::host_vector<float> h_vec (16);
InitializeRange(h_vec.begin(), h_vec.end());
thrust::device_vector<float> d_vec (h_vec.size());
thrust::copy(h_vec.begin(), h_vec.end(), d_vec.begin());
thrust::device_vector<float> d_vec (h_vec.size());
thrust::copy(h_vec.begin(), h_vec.end(), d_vec.begin());
Span<float> span (d_vec.data().get(), d_vec.size());
dh::LaunchN(0, 17, TestElementAccess{span});}, "");
Span<float> span (d_vec.data().get(), d_vec.size());
dh::LaunchN(0, 17, TestElementAccess{span});
};
testing::internal::CaptureStdout();
EXPECT_DEATH(test_element_access(), "");
std::string output = testing::internal::GetCapturedStdout();
}
__global__ void test_first_dynamic_kernel(Span<float> _span) {
@@ -253,7 +258,9 @@ TEST(GPUSpan, FirstLast) {
Span<float> span (d_vec.data().get(), d_vec.size());
test_first_dynamic_kernel<<<1, 1>>>(span);
};
testing::internal::CaptureStdout();
EXPECT_DEATH(lambda_first_dy(), "");
std::string output = testing::internal::GetCapturedStdout();
auto lambda_first_static = []() {
thrust::host_vector<float> h_vec (4);
@@ -265,7 +272,9 @@ TEST(GPUSpan, FirstLast) {
Span<float> span (d_vec.data().get(), d_vec.size());
test_first_static_kernel<<<1, 1>>>(span);
};
testing::internal::CaptureStdout();
EXPECT_DEATH(lambda_first_static(), "");
output = testing::internal::GetCapturedStdout();
auto lambda_last_dy = []() {
thrust::host_vector<float> h_vec (4);
@@ -277,7 +286,9 @@ TEST(GPUSpan, FirstLast) {
Span<float> span (d_vec.data().get(), d_vec.size());
test_last_dynamic_kernel<<<1, 1>>>(span);
};
testing::internal::CaptureStdout();
EXPECT_DEATH(lambda_last_dy(), "");
output = testing::internal::GetCapturedStdout();
auto lambda_last_static = []() {
thrust::host_vector<float> h_vec (4);
@@ -289,7 +300,9 @@ TEST(GPUSpan, FirstLast) {
Span<float> span (d_vec.data().get(), d_vec.size());
test_last_static_kernel<<<1, 1>>>(span);
};
testing::internal::CaptureStdout();
EXPECT_DEATH(lambda_last_static(), "");
output = testing::internal::GetCapturedStdout();
}
@@ -310,7 +323,9 @@ TEST(GPUSpan, Subspan) {
Span<float> span (d_vec.data().get(), d_vec.size());
test_subspan_dynamic_kernel<<<1, 1>>>(span);
};
testing::internal::CaptureStdout();
EXPECT_DEATH(lambda_subspan_dynamic(), "");
std::string output = testing::internal::GetCapturedStdout();
auto lambda_subspan_static = []() {
thrust::host_vector<float> h_vec (4);
@@ -322,7 +337,9 @@ TEST(GPUSpan, Subspan) {
Span<float> span (d_vec.data().get(), d_vec.size());
test_subspan_static_kernel<<<1, 1>>>(span);
};
testing::internal::CaptureStdout();
EXPECT_DEATH(lambda_subspan_static(), "");
output = testing::internal::GetCapturedStdout();
}
TEST(GPUSpanIter, Construct) {