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

Various bug fixes (#2825)

Browse Source 
* Fatal error if GPU algorithm selected without GPU support compiled

* Resolve type conversion warnings

* Fix gpu unit test failure

* Fix compressed iterator edge case

* Fix python unit test failures due to flake8 update on pip
This commit is contained in:
Rory Mitchell
2017-10-25 14:45:01 +13:00
committed by GitHub
parent c71b62d48d
commit 13e7a2cff0
21 changed files with 163 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/compressed_iterator.h
View File

@@ -6,7 +6,7 @@
#include <xgboost/base.h>
#include <cmath>
#include <cstddef>
#include "dmlc/logging.h"
#include <algorithm>
namespace xgboost {
namespace common {
@@ -28,8 +28,9 @@ static const int padding = 4; // Assign padding so we can read slightly off
// the beginning of the array
// The number of bits required to represent a given unsigned range
static int SymbolBits(int num_symbols) {
return std::ceil(std::log2(num_symbols));
static size_t SymbolBits(size_t num_symbols) {
auto bits = std::ceil(std::log2(num_symbols));
return std::max(static_cast<size_t>(bits), size_t(1));
}
} // namespace detail
@@ -72,9 +73,9 @@ class CompressedBufferWriter {
static size_t CalculateBufferSize(size_t num_elements, size_t num_symbols) {
const int bits_per_byte = 8;
size_t compressed_size = std::ceil(
size_t compressed_size = static_cast<size_t>(std::ceil(
static_cast<double>(detail::SymbolBits(num_symbols) * num_elements) /
bits_per_byte);
bits_per_byte));
return compressed_size + detail::padding;
}
@@ -98,8 +99,8 @@ class CompressedBufferWriter {
template <typename iter_t>
void Write(compressed_byte_t *buffer, iter_t input_begin, iter_t input_end) {
uint64_t tmp = 0;
int stored_bits = 0;
const int max_stored_bits = 64 - symbol_bits_;
size_t stored_bits = 0;
const size_t max_stored_bits = 64 - symbol_bits_;
size_t buffer_position = detail::padding;
const size_t num_symbols = input_end - input_begin;
for (size_t i = 0; i < num_symbols; i++) {
@@ -108,7 +109,8 @@ class CompressedBufferWriter {
// Eject only full bytes
size_t tmp_bytes = stored_bits / 8;
for (size_t j = 0; j < tmp_bytes; j++) {
buffer[buffer_position] = tmp >> (stored_bits - (j + 1) * 8);
buffer[buffer_position] = static_cast<compressed_byte_t>(
tmp >> (stored_bits - (j + 1) * 8));
buffer_position++;
}
stored_bits -= tmp_bytes * 8;
@@ -121,13 +123,16 @@ class CompressedBufferWriter {
}
// Eject all bytes
size_t tmp_bytes = std::ceil(static_cast<float>(stored_bits) / 8);
for (size_t j = 0; j < tmp_bytes; j++) {
int shift_bits = stored_bits - (j + 1) * 8;
int tmp_bytes =
static_cast<int>(std::ceil(static_cast<float>(stored_bits) / 8));
for (int j = 0; j < tmp_bytes; j++) {
int shift_bits = static_cast<int>(stored_bits) - (j + 1) * 8;
if (shift_bits >= 0) {
buffer[buffer_position] = tmp >> shift_bits;
buffer[buffer_position] =
static_cast<compressed_byte_t>(tmp >> shift_bits);
} else {
buffer[buffer_position] = tmp << std::abs(shift_bits);
buffer[buffer_position] =
static_cast<compressed_byte_t>(tmp << std::abs(shift_bits));
}
buffer_position++;
}