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

Implement Empty method for host device vector. (#5781)

Browse Source 
* Fix accessing nullptr.
This commit is contained in:
Jiaming Yuan 2020-06-13 19:02:26 +08:00 committed by GitHub
parent 306e38ff31
commit 1fa84b61c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/xgboost/host_device_vector.h
View File

@ -95,6 +95,7 @@ class HostDeviceVector {
HostDeviceVector<T>& operator=(const HostDeviceVector<T>&) = delete; HostDeviceVector<T>& operator=(const HostDeviceVector<T>&) = delete;
HostDeviceVector<T>& operator=(HostDeviceVector<T>&&); HostDeviceVector<T>& operator=(HostDeviceVector<T>&&);
bool Empty() const { return Size() == 0; }
size_t Size() const; size_t Size() const;
int DeviceIdx() const; int DeviceIdx() const;
common::Span<T> DeviceSpan(); common::Span<T> DeviceSpan();

4
src/common/host_device_vector.cu
View File

@ -59,7 +59,9 @@ class HostDeviceVectorImpl {
} }
} }
size_t Size() const { return HostCanRead() ? data_h_.size() : data_d_->size(); } size_t Size() const {
return HostCanRead() ? data_h_.size() : data_d_ ? data_d_->size() : 0;
}
int DeviceIdx() const { return device_; } int DeviceIdx() const { return device_; }

7
tests/cpp/common/test_host_device_vector.cu
View File

@ -176,6 +176,13 @@ TEST(HostDeviceVector, Span) {
ASSERT_TRUE(vec.HostCanWrite()); ASSERT_TRUE(vec.HostCanWrite());
} }
TEST(HostDeviceVector, Empty) {
HostDeviceVector<float> vec {1.0f, 2.0f, 3.0f, 4.0f};
HostDeviceVector<float> another { std::move(vec) };
ASSERT_FALSE(another.Empty());
ASSERT_TRUE(vec.Empty());
}
TEST(HostDeviceVector, MGPU_Basic) { // NOLINT TEST(HostDeviceVector, MGPU_Basic) { // NOLINT
if (AllVisibleGPUs() < 2) { if (AllVisibleGPUs() < 2) {
LOG(WARNING) << "Not testing in multi-gpu environment."; LOG(WARNING) << "Not testing in multi-gpu environment.";