Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add quotes to unused parameters. #6769

Merged
merged 5 commits into from
Mar 19, 2021
Merged

Add quotes to unused parameters. #6769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
120f650
Add quotes to unused parameters.
trivialfis Mar 19, 2021
311f24a
fix test.
trivialfis Mar 19, 2021
5e1f0b6
R test.
trivialfis Mar 19, 2021
a3c12da
R test.
trivialfis Mar 19, 2021
dd39eab
Check whitespace.
trivialfis Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R-package/tests/testthat/test_basic.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ test_that("parameter validation works", {
xgb.train(params = params, data = dtrain, nrounds = nrounds))
print(output)
}
expect_output(incorrect(), "bar, foo")
expect_output(incorrect(), '\\\\"bar\\\\", \\\\"foo\\\\"')
})


Expand Down
11 changes: 7 additions & 4 deletions src/learner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,15 +537,18 @@ class LearnerConfiguration : public Learner {
}
}

// FIXME(trivialfis): Make eval_metric a training parameter.
keys.emplace_back(kEvalMetric);
keys.emplace_back("verbosity");
keys.emplace_back("num_output_group");

std::sort(keys.begin(), keys.end());

std::vector<std::string> provided;
for (auto const &kv : cfg_) {
// FIXME(trivialfis): Make eval_metric a training parameter.
if (std::any_of(kv.first.cbegin(), kv.first.cend(),
[](char ch) { return std::isspace(ch); })) {
LOG(FATAL) << "Invalid parameter \"" << kv.first << "\" contains whitespace.";
}
provided.push_back(kv.first);
}
std::sort(provided.begin(), provided.end());
Expand All @@ -557,9 +560,9 @@ class LearnerConfiguration : public Learner {
std::stringstream ss;
ss << "\nParameters: { ";
for (size_t i = 0; i < diff.size() - 1; ++i) {
ss << diff[i] << ", ";
ss << "\"" << diff[i] << "\", ";
}
ss << diff.back();
ss << "\"" << diff.back() << "\"";
ss << R"W( } might not be used.

This may not be accurate due to some parameters are only used in language bindings but
Expand Down
8 changes: 6 additions & 2 deletions tests/cpp/test_learner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,19 @@ TEST(Learner, ParameterValidation) {

auto learner = std::unique_ptr<Learner>(Learner::Create({p_mat}));
learner->SetParam("validate_parameters", "1");
learner->SetParam("Knock Knock", "Who's there?");
learner->SetParam("Knock-Knock", "Who's-there?");
learner->SetParam("Silence", "....");
learner->SetParam("tree_method", "exact");

testing::internal::CaptureStderr();
learner->Configure();
std::string output = testing::internal::GetCapturedStderr();

ASSERT_TRUE(output.find("Parameters: { Knock Knock, Silence }") != std::string::npos);
ASSERT_TRUE(output.find(R"(Parameters: { "Knock-Knock", "Silence" })") != std::string::npos);

// whitespace
learner->SetParam("tree method", "exact");
EXPECT_THROW(learner->Configure(), dmlc::Error);
}

TEST(Learner, CheckGroup) {
Expand Down