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

[BLOCKING] Remove to_string. (#5934)

Browse Source
This commit is contained in:
Jiaming Yuan 2020-07-26 10:21:26 +08:00 committed by GitHub
parent 12110c900e
commit 40361043ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/learner.cc
View File

@ -41,6 +41,7 @@
#include "common/observer.h" #include "common/observer.h"
#include "common/random.h" #include "common/random.h"
#include "common/timer.h" #include "common/timer.h"
#include "common/charconv.h"
#include "common/version.h" #include "common/version.h"
namespace { namespace {
@ -99,18 +100,33 @@ struct LearnerModelParamLegacy : public dmlc::Parameter<LearnerModelParamLegacy>
// Skip other legacy fields. // Skip other legacy fields.
Json ToJson() const { Json ToJson() const {
Object obj; Object obj;
obj["base_score"] = std::to_string(base_score); char floats[NumericLimits<float>::kToCharsSize];
obj["num_feature"] = std::to_string(num_feature); auto ret = to_chars(floats, floats + NumericLimits<float>::kToCharsSize, base_score);
obj["num_class"] = std::to_string(num_class); CHECK(ret.ec == std::errc());
obj["base_score"] =
std::string{floats, static_cast<size_t>(std::distance(floats, ret.ptr))};
char integers[NumericLimits<int64_t>::kToCharsSize];
ret = to_chars(integers, integers + NumericLimits<int64_t>::kToCharsSize,
static_cast<int64_t>(num_feature));
CHECK(ret.ec == std::errc());
obj["num_feature"] =
std::string{integers, static_cast<size_t>(std::distance(integers, ret.ptr))};
ret = to_chars(integers, integers + NumericLimits<int64_t>::kToCharsSize,
static_cast<int64_t>(num_class));
CHECK(ret.ec == std::errc());
obj["num_class"] =
std::string{integers, static_cast<size_t>(std::distance(integers, ret.ptr))};
return Json(std::move(obj)); return Json(std::move(obj));
} }
void FromJson(Json const& obj) { void FromJson(Json const& obj) {
auto const& j_param = get<Object const>(obj); auto const& j_param = get<Object const>(obj);
std::map<std::string, std::string> m; std::map<std::string, std::string> m;
m["base_score"] = get<String const>(j_param.at("base_score"));
m["num_feature"] = get<String const>(j_param.at("num_feature")); m["num_feature"] = get<String const>(j_param.at("num_feature"));
m["num_class"] = get<String const>(j_param.at("num_class")); m["num_class"] = get<String const>(j_param.at("num_class"));
this->Init(m); this->Init(m);
std::string str = get<String const>(j_param.at("base_score"));
from_chars(str.c_str(), str.c_str() + str.size(), base_score);
} }
// declare parameters // declare parameters
DMLC_DECLARE_PARAMETER(LearnerModelParamLegacy) { DMLC_DECLARE_PARAMETER(LearnerModelParamLegacy) {

3
tests/cpp/test_serialization.cc
View File

@ -177,6 +177,7 @@ TEST_F(SerializationTest, Exact) {
TestLearnerSerialization({{"booster", "gbtree"}, TestLearnerSerialization({{"booster", "gbtree"},
{"seed", "0"}, {"seed", "0"},
{"nthread", "1"}, {"nthread", "1"},
{"base_score", "3.14195265"},
{"max_depth", "2"}, {"max_depth", "2"},
{"enable_experimental_json_serialization", "1"}, {"enable_experimental_json_serialization", "1"},
{"tree_method", "exact"}}, {"tree_method", "exact"}},
@ -185,6 +186,7 @@ TEST_F(SerializationTest, Exact) {
TestLearnerSerialization({{"booster", "gbtree"}, TestLearnerSerialization({{"booster", "gbtree"},
{"seed", "0"}, {"seed", "0"},
{"nthread", "1"}, {"nthread", "1"},
{"base_score", "3.14195265"},
{"max_depth", "2"}, {"max_depth", "2"},
{"num_parallel_tree", "4"}, {"num_parallel_tree", "4"},
{"enable_experimental_json_serialization", "1"}, {"enable_experimental_json_serialization", "1"},
@ -194,6 +196,7 @@ TEST_F(SerializationTest, Exact) {
TestLearnerSerialization({{"booster", "dart"}, TestLearnerSerialization({{"booster", "dart"},
{"seed", "0"}, {"seed", "0"},
{"nthread", "1"}, {"nthread", "1"},
{"base_score", "3.14195265"},
{"max_depth", "2"}, {"max_depth", "2"},
{"enable_experimental_json_serialization", "1"}, {"enable_experimental_json_serialization", "1"},
{"tree_method", "exact"}}, {"tree_method", "exact"}},