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

Increase timeout in C++ tests from 1 to 5 seconds. (#10756)

Browse Source 
To avoid CI failures on FreeBSD.
This commit is contained in:
Jiaming Yuan 2024-08-28 02:27:14 +08:00 committed by GitHub
parent bde1265caf
commit 64afe9873b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cpp/collective/test_worker.h
View File

@ -151,13 +151,13 @@ template <typename WorkerFn>
void TestDistributedGlobal(std::int32_t n_workers, WorkerFn worker_fn, bool need_finalize = true, void TestDistributedGlobal(std::int32_t n_workers, WorkerFn worker_fn, bool need_finalize = true,
std::chrono::seconds test_timeout = std::chrono::seconds{30}) { std::chrono::seconds test_timeout = std::chrono::seconds{30}) {
system::SocketStartup(); system::SocketStartup();
std::chrono::seconds timeout{1}; std::chrono::seconds poll_timeout{5};
std::string host; std::string host;
auto rc = GetHostAddress(&host); auto rc = GetHostAddress(&host);
SafeColl(rc); SafeColl(rc);
RabitTracker tracker{MakeTrackerConfig(host, n_workers, timeout)}; RabitTracker tracker{MakeTrackerConfig(host, n_workers, poll_timeout)};
auto fut = tracker.Run(); auto fut = tracker.Run();
std::vector<std::thread> workers; std::vector<std::thread> workers;
@ -166,7 +166,7 @@ void TestDistributedGlobal(std::int32_t n_workers, WorkerFn worker_fn, bool need
for (std::int32_t i = 0; i < n_workers; ++i) { for (std::int32_t i = 0; i < n_workers; ++i) {
workers.emplace_back([=] { workers.emplace_back([=] {
auto fut = std::async(std::launch::async, [=] { auto fut = std::async(std::launch::async, [=] {
auto config = MakeDistributedTestConfig(host, port, timeout, i); auto config = MakeDistributedTestConfig(host, port, poll_timeout, i);
Init(config); Init(config);
worker_fn(); worker_fn();
if (need_finalize) { if (need_finalize) {

8
tests/cpp/common/test_quantile.cc
View File

@ -283,22 +283,22 @@ void TestColSplitQuantile(size_t rows, size_t cols) {
} }
} // anonymous namespace } // anonymous namespace
TEST(Quantile, ColSplitBasic) { TEST(Quantile, ColumnSplitBasic) {
constexpr size_t kRows = 10, kCols = 10; constexpr size_t kRows = 10, kCols = 10;
TestColSplitQuantile<false>(kRows, kCols); TestColSplitQuantile<false>(kRows, kCols);
} }
TEST(Quantile, ColSplit) { TEST(Quantile, ColumnSplit) {
constexpr size_t kRows = 4000, kCols = 200; constexpr size_t kRows = 4000, kCols = 200;
TestColSplitQuantile<false>(kRows, kCols); TestColSplitQuantile<false>(kRows, kCols);
} }
TEST(Quantile, ColSplitSortedBasic) { TEST(Quantile, ColumnSplitSortedBasic) {
constexpr size_t kRows = 10, kCols = 10; constexpr size_t kRows = 10, kCols = 10;
TestColSplitQuantile<true>(kRows, kCols); TestColSplitQuantile<true>(kRows, kCols);
} }
TEST(Quantile, ColSplitSorted) { TEST(Quantile, ColumnSplitSorted) {
constexpr size_t kRows = 4000, kCols = 200; constexpr size_t kRows = 4000, kCols = 200;
TestColSplitQuantile<true>(kRows, kCols); TestColSplitQuantile<true>(kRows, kCols);
} }

8
tests/cpp/tree/test_approx.cc
View File

@ -181,7 +181,7 @@ void TestColumnSplitPartitioner(size_t n_samples, size_t base_rowid, std::shared
} }
} // anonymous namespace } // anonymous namespace
TEST(Approx, PartitionerColSplit) { TEST(Approx, PartitionerColumnSplit) {
size_t n_samples = 1024, n_features = 16, base_rowid = 0; size_t n_samples = 1024, n_features = 16, base_rowid = 0;
auto const Xy = RandomDataGenerator{n_samples, n_features, 0}.GenerateDMatrix(true); auto const Xy = RandomDataGenerator{n_samples, n_features, 0}.GenerateDMatrix(true);
auto hess = GenerateHess(n_samples); auto hess = GenerateHess(n_samples);
@ -211,7 +211,7 @@ TEST(Approx, PartitionerColSplit) {
} }
namespace { namespace {
class TestApproxColSplit : public ::testing::TestWithParam<std::tuple<bool, float>> { class TestApproxColumnSplit : public ::testing::TestWithParam<std::tuple<bool, float>> {
public: public:
void Run() { void Run() {
auto [categorical, sparsity] = GetParam(); auto [categorical, sparsity] = GetParam();
@ -220,9 +220,9 @@ class TestApproxColSplit : public ::testing::TestWithParam<std::tuple<bool, floa
}; };
} // namespace } // namespace
TEST_P(TestApproxColSplit, Basic) { this->Run(); } TEST_P(TestApproxColumnSplit, Basic) { this->Run(); }
INSTANTIATE_TEST_SUITE_P(ColumnSplit, TestApproxColSplit, ::testing::ValuesIn([]() { INSTANTIATE_TEST_SUITE_P(ColumnSplit, TestApproxColumnSplit, ::testing::ValuesIn([]() {
std::vector<std::tuple<bool, float>> params; std::vector<std::tuple<bool, float>> params;
for (auto categorical : {true, false}) { for (auto categorical : {true, false}) {
for (auto sparsity : {0.0f, 0.6f}) { for (auto sparsity : {0.0f, 0.6f}) {

10
tests/cpp/tree/test_quantile_hist.cc
View File

@ -203,12 +203,12 @@ void TestColumnSplitPartitioner(bst_target_t n_targets) {
} }
} // anonymous namespace } // anonymous namespace
TEST(QuantileHist, PartitionerColSplit) { TestColumnSplitPartitioner<CPUExpandEntry>(1); } TEST(QuantileHist, PartitionerColumnSplit) { TestColumnSplitPartitioner<CPUExpandEntry>(1); }
TEST(QuantileHist, MultiPartitionerColSplit) { TestColumnSplitPartitioner<MultiExpandEntry>(3); } TEST(QuantileHist, MultiPartitionerColumnSplit) { TestColumnSplitPartitioner<MultiExpandEntry>(3); }
namespace { namespace {
class TestHistColSplit : public ::testing::TestWithParam<std::tuple<bst_target_t, bool, float>> { class TestHistColumnSplit : public ::testing::TestWithParam<std::tuple<bst_target_t, bool, float>> {
public: public:
void Run() { void Run() {
auto [n_targets, categorical, sparsity] = GetParam(); auto [n_targets, categorical, sparsity] = GetParam();
@ -217,9 +217,9 @@ class TestHistColSplit : public ::testing::TestWithParam<std::tuple<bst_target_t
}; };
} // anonymous namespace } // anonymous namespace
TEST_P(TestHistColSplit, Basic) { this->Run(); } TEST_P(TestHistColumnSplit, Basic) { this->Run(); }
INSTANTIATE_TEST_SUITE_P(ColumnSplit, TestHistColSplit, ::testing::ValuesIn([]() { INSTANTIATE_TEST_SUITE_P(ColumnSplit, TestHistColumnSplit, ::testing::ValuesIn([]() {
std::vector<std::tuple<bst_target_t, bool, float>> params; std::vector<std::tuple<bst_target_t, bool, float>> params;
for (auto categorical : {true, false}) { for (auto categorical : {true, false}) {
for (auto sparsity : {0.0f, 0.6f}) { for (auto sparsity : {0.0f, 0.6f}) {