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

Fix failures on R hub and Win builder. (#7763)

Browse Source 
* Update date.
* Workaround amalgamation build with clang. (SimpleDMatrix instantiation)
* Workaround compiler error with driver push.
* Revert autoconf requirement.
* Fix model IO on 32-bit environment. (i386)
* Clarify the function name.
This commit is contained in:
Jiaming Yuan 2022-03-30 07:14:33 +08:00 committed by GitHub
parent a50b84244e
commit d4796482b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 629 additions and 1188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
R-package/DESCRIPTION
View File

@ -2,7 +2,7 @@ Package: xgboost
Type: Package Type: Package
Title: Extreme Gradient Boosting Title: Extreme Gradient Boosting
Version: 1.6.0.1 Version: 1.6.0.1
Date: 2021-09-25 Date: 2022-03-29
Authors@R: c( Authors@R: c(
person("Tianqi", "Chen", role = c("aut"), person("Tianqi", "Chen", role = c("aut"),
email = "tianqi.tchen@gmail.com"), email = "tianqi.tchen@gmail.com"),

1795
R-package/configure vendored
View File

File diff suppressed because it is too large Load Diff

2
R-package/configure.ac
View File

@ -1,6 +1,6 @@
### configure.ac -*- Autoconf -*- ### configure.ac -*- Autoconf -*-
AC_PREREQ(2.71) AC_PREREQ(2.69)
AC_INIT([xgboost],[1.6-0],[],[xgboost],[]) AC_INIT([xgboost],[1.6-0],[],[xgboost],[])

2
amalgamation/xgboost-all0.cc
View File

@ -33,8 +33,8 @@
#include "../src/gbm/gblinear_model.cc" #include "../src/gbm/gblinear_model.cc"
// data // data
#include "../src/data/data.cc"
#include "../src/data/simple_dmatrix.cc" #include "../src/data/simple_dmatrix.cc"
#include "../src/data/data.cc"
#include "../src/data/sparse_page_raw_format.cc" #include "../src/data/sparse_page_raw_format.cc"
#include "../src/data/ellpack_page.cc" #include "../src/data/ellpack_page.cc"
#include "../src/data/gradient_index.cc" #include "../src/data/gradient_index.cc"

6
include/xgboost/json_io.h
View File

@ -182,12 +182,12 @@ T BuiltinBSwap(T v) {
#endif // defined(__GLIBC__) #endif // defined(__GLIBC__)
template <typename T, std::enable_if_t<sizeof(T) == 1>* = nullptr> template <typename T, std::enable_if_t<sizeof(T) == 1>* = nullptr>
inline T ByteSwap(T v) { inline T ToBigEndian(T v) {
return v; return v;
} }
template <typename T, std::enable_if_t<sizeof(T) != 1>* = nullptr> template <typename T, std::enable_if_t<sizeof(T) != 1>* = nullptr>
inline T ByteSwap(T v) { inline T ToBigEndian(T v) {
static_assert(std::is_pod<T>::value, "Only pod is supported."); static_assert(std::is_pod<T>::value, "Only pod is supported.");
#if DMLC_LITTLE_ENDIAN #if DMLC_LITTLE_ENDIAN
auto constexpr kS = sizeof(T); auto constexpr kS = sizeof(T);
@ -217,7 +217,7 @@ class UBJReader : public JsonReader {
template <typename T> template <typename T>
T ReadPrimitive() { T ReadPrimitive() {
auto v = ReadStream<T>(); auto v = ReadStream<T>();
v = ByteSwap(v); v = ToBigEndian(v);
return v; return v;
} }

6
src/common/json.cc
View File

@ -864,7 +864,7 @@ Json UBJReader::Parse() {
namespace { namespace {
template <typename T> template <typename T>
void WritePrimitive(T v, std::vector<char>* stream) { void WritePrimitive(T v, std::vector<char>* stream) {
v = ByteSwap(v); v = ToBigEndian(v);
auto s = stream->size(); auto s = stream->size();
stream->resize(s + sizeof(v)); stream->resize(s + sizeof(v));
auto ptr = stream->data() + s; auto ptr = stream->data() + s;
@ -918,13 +918,13 @@ void WriteTypedArray(JsonTypedArray<T, kind> const* arr, std::vector<char>* stre
stream->push_back('#'); stream->push_back('#');
stream->push_back('L'); stream->push_back('L');
auto n = arr->Size(); int64_t n = arr->Size();
WritePrimitive(n, stream); WritePrimitive(n, stream);
auto s = stream->size(); auto s = stream->size();
stream->resize(s + arr->Size() * sizeof(T)); stream->resize(s + arr->Size() * sizeof(T));
auto const& vec = arr->GetArray(); auto const& vec = arr->GetArray();
for (size_t i = 0; i < n; ++i) { for (size_t i = 0; i < n; ++i) {
auto v = ByteSwap(vec[i]); auto v = ToBigEndian(vec[i]);
std::memcpy(stream->data() + s, &v, sizeof(v)); std::memcpy(stream->data() + s, &v, sizeof(v));
s += sizeof(v); s += sizeof(v);
} }

4
src/tree/driver.h
View File

@ -49,9 +49,7 @@ class Driver {
void Push(const std::vector<ExpandEntryT> &entries) { void Push(const std::vector<ExpandEntryT> &entries) {
this->Push(entries.begin(), entries.end()); this->Push(entries.begin(), entries.end());
} }
void Push(const ExpandEntryT e) { void Push(ExpandEntryT const& e) { queue_.push(e); }
queue_.push(e);
}
bool IsEmpty() { bool IsEmpty() {
return queue_.empty(); return queue_.empty();