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

Fixed single-GPU tests. (#4053)

Browse Source 
- ./testxgboost (without filters) failed if run on a multi-GPU machine because
  the memory was allocated on the current device, but device 0
  was always passed into LaunchN
This commit is contained in:
Andy Adinets 2019-01-11 08:33:15 +01:00 committed by Rory Mitchell
parent 5f151c5cf3
commit 0f8af85f64
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/cpp/common/test_gpu_compressed_iterator.cu
View File

@ -32,6 +32,7 @@ struct ReadSymbolFunction {
}; };
TEST(CompressedIterator, TestGPU) { TEST(CompressedIterator, TestGPU) {
dh::safe_cuda(cudaSetDevice(0));
std::vector<int> test_cases = {1, 3, 426, 21, 64, 256, 100000, INT32_MAX}; std::vector<int> test_cases = {1, 3, 426, 21, 64, 256, 100000, INT32_MAX};
int num_elements = 1000; int num_elements = 1000;
int repetitions = 1000; int repetitions = 1000;

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

@ -86,12 +86,14 @@ TEST(GPUSpan, FromOther) {
} }
TEST(GPUSpan, Assignment) { TEST(GPUSpan, Assignment) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestAssignment{status.data()}); dh::LaunchN(0, 16, TestAssignment{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
} }
TEST(GPUSpan, TestStatus) { TEST(GPUSpan, TestStatus) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestTestStatus{status.data()}); dh::LaunchN(0, 16, TestTestStatus{status.data()});
ASSERT_EQ(status.get(), -1); ASSERT_EQ(status.get(), -1);
@ -112,6 +114,7 @@ struct TestEqual {
}; };
TEST(GPUSpan, WithTrust) { TEST(GPUSpan, WithTrust) {
dh::safe_cuda(cudaSetDevice(0));
// Not adviced to initialize span with host_vector, since h_vec.data() is // Not adviced to initialize span with host_vector, since h_vec.data() is
// a host function. // a host function.
thrust::host_vector<float> h_vec (16); thrust::host_vector<float> h_vec (16);
@ -148,12 +151,14 @@ TEST(GPUSpan, WithTrust) {
} }
TEST(GPUSpan, BeginEnd) { TEST(GPUSpan, BeginEnd) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestBeginEnd{status.data()}); dh::LaunchN(0, 16, TestBeginEnd{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
} }
TEST(GPUSpan, RBeginREnd) { TEST(GPUSpan, RBeginREnd) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestRBeginREnd{status.data()}); dh::LaunchN(0, 16, TestRBeginREnd{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
@ -185,12 +190,14 @@ TEST(GPUSpan, Modify) {
} }
TEST(GPUSpan, Observers) { TEST(GPUSpan, Observers) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestObservers{status.data()}); dh::LaunchN(0, 16, TestObservers{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
} }
TEST(GPUSpan, Compare) { TEST(GPUSpan, Compare) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestIterCompare{status.data()}); dh::LaunchN(0, 16, TestIterCompare{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
@ -208,6 +215,7 @@ struct TestElementAccess {
}; };
TEST(GPUSpan, ElementAccess) { TEST(GPUSpan, ElementAccess) {
dh::safe_cuda(cudaSetDevice(0));
EXPECT_DEATH({ EXPECT_DEATH({
thrust::host_vector<float> h_vec (16); thrust::host_vector<float> h_vec (16);
InitializeRange(h_vec.begin(), h_vec.end()); InitializeRange(h_vec.begin(), h_vec.end());
@ -318,36 +326,42 @@ TEST(GPUSpan, Subspan) {
} }
TEST(GPUSpanIter, Construct) { TEST(GPUSpanIter, Construct) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestIterConstruct{status.data()}); dh::LaunchN(0, 16, TestIterConstruct{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
} }
TEST(GPUSpanIter, Ref) { TEST(GPUSpanIter, Ref) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestIterRef{status.data()}); dh::LaunchN(0, 16, TestIterRef{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
} }
TEST(GPUSpanIter, Calculate) { TEST(GPUSpanIter, Calculate) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestIterCalculate{status.data()}); dh::LaunchN(0, 16, TestIterCalculate{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
} }
TEST(GPUSpanIter, Compare) { TEST(GPUSpanIter, Compare) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestIterCompare{status.data()}); dh::LaunchN(0, 16, TestIterCompare{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
} }
TEST(GPUSpan, AsBytes) { TEST(GPUSpan, AsBytes) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestAsBytes{status.data()}); dh::LaunchN(0, 16, TestAsBytes{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);
} }
TEST(GPUSpan, AsWritableBytes) { TEST(GPUSpan, AsWritableBytes) {
dh::safe_cuda(cudaSetDevice(0));
TestStatus status; TestStatus status;
dh::LaunchN(0, 16, TestAsWritableBytes{status.data()}); dh::LaunchN(0, 16, TestAsWritableBytes{status.data()});
ASSERT_EQ(status.get(), 1); ASSERT_EQ(status.get(), 1);