Merge commit '7258f3353c8cc3ee3dd3c00c987fa0b189e58723'

This commit is contained in:
tqchen 2015-05-01 22:46:14 -07:00
commit 7297c2352f

View File

@ -134,8 +134,9 @@ void AllreduceBase::TrackerPrint(const std::string &msg) {
// util to parse data with unit suffix
inline size_t ParseUnit(const char *name, const char *val) {
char unit;
uint64_t amount;
int n = sscanf(val, "%lu%c", &amount, &unit);
unsigned long amt;
int n = sscanf(val, "%lu%c", &amt, &unit);
size_t amount = amt;
if (n == 2) {
switch (unit) {
case 'B': return amount;