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

Use dynamic types for array interface columns instead of templates (#5108)

Browse Source
This commit is contained in:
Rory Mitchell
2019-12-21 16:08:10 +13:00
committed by GitHub
parent b915788708
commit 3d04a8cc97
4 changed files with 149 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/cpp/data/test_simple_csr_source.cu
View File

@@ -23,21 +23,21 @@ TEST(ArrayInterfaceHandler, Error) {
auto const& column_obj = get<Object>(column);
// missing version
EXPECT_THROW(ArrayInterfaceHandler::ExtractArray<float>(column_obj), dmlc::Error);
EXPECT_THROW(Columnar c(column_obj), dmlc::Error);
column["version"] = Integer(static_cast<Integer::Int>(1));
// missing data
EXPECT_THROW(ArrayInterfaceHandler::ExtractArray<float>(column_obj), dmlc::Error);
EXPECT_THROW(Columnar c(column_obj), dmlc::Error);
column["data"] = j_data;
// missing typestr
EXPECT_THROW(ArrayInterfaceHandler::ExtractArray<float>(column_obj), dmlc::Error);
EXPECT_THROW(Columnar c(column_obj), dmlc::Error);
column["typestr"] = String("<f4");
// nullptr is not valid
EXPECT_THROW(ArrayInterfaceHandler::ExtractArray<float>(column_obj), dmlc::Error);
EXPECT_THROW(Columnar c(column_obj), dmlc::Error);
thrust::device_vector<float> d_data(kRows);
j_data = {Json(Integer(reinterpret_cast<Integer::Int>(d_data.data().get()))),
Json(Boolean(false))};
column["data"] = j_data;
EXPECT_NO_THROW(ArrayInterfaceHandler::ExtractArray<float>(column_obj));
EXPECT_NO_THROW(Columnar c(column_obj));
std::vector<Json> j_mask_shape {Json(Integer(static_cast<Integer::Int>(kRows - 1)))};
column["mask"] = Object();
@@ -46,7 +46,7 @@ TEST(ArrayInterfaceHandler, Error) {
column["mask"]["typestr"] = String("<i1");
column["mask"]["version"] = Integer(static_cast<Integer::Int>(1));
// shape of mask and data doesn't match.
EXPECT_THROW(ArrayInterfaceHandler::ExtractArray<float>(column_obj), dmlc::Error);
EXPECT_THROW(Columnar c(column_obj), dmlc::Error);
}
template <typename T>
@@ -75,6 +75,23 @@ Json GenerateDenseColumn(std::string const& typestr, size_t kRows,
return column;
}
void TestGetElement() {
thrust::device_vector<float> data;
auto j_column = GenerateDenseColumn("<f4", 3, &data);
auto const& column_obj = get<Object const>(j_column);
Columnar foreign_column(column_obj);
EXPECT_NO_THROW({
dh::LaunchN(0, 1, [=] __device__(size_t idx) {
KERNEL_CHECK(foreign_column.GetElement(0) == 0.0f);
KERNEL_CHECK(foreign_column.GetElement(1) == 2.0f);
KERNEL_CHECK(foreign_column.GetElement(2) == 4.0f);
});
});
}
TEST(Columnar, GetElement) { TestGetElement(); }
void TestDenseColumn(std::unique_ptr<data::SimpleCSRSource> const& source,
size_t n_rows, size_t n_cols) {
auto const& data = source->page_.data.HostVector();
@@ -384,4 +401,4 @@ TEST(SimpleCSRSource, Types) {
TestDenseColumn(source, kRows, kCols);
}
} // namespace xgboost
} // namespace xgboost