summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e53aafa)
raw | patch | inline | side by side (parent: e53aafa)
author | Yangqing Jia <jiayq@google.com> | |
Mon, 13 Oct 2014 20:48:27 +0000 (13:48 -0700) | ||
committer | Yangqing Jia <jiayq@google.com> | |
Mon, 13 Oct 2014 20:48:27 +0000 (13:48 -0700) |
include/caffe/common.hpp | patch | blob | history | |
src/caffe/layers/exp_layer.cpp | patch | blob | history |
index e7776ba5d7bdaa66d1fab085301a0ab8e9211773..81b2e9ae1013964061af2cd07797b37a9e172214 100644 (file)
--- a/include/caffe/common.hpp
+++ b/include/caffe/common.hpp
using std::fstream;
using std::ios;
using std::isnan;
+using std::isinf;
using std::iterator;
using std::make_pair;
using std::map;
index 25da1201c103e2cb8b5a442e99b6bb40604b1833..2c99bfcff93ec39820fb894a6c6c2630ca6d2408 100644 (file)
// If base == -1, interpret the base as e and set log_base = 1 exactly.
// Otherwise, calculate its log explicitly.
const Dtype log_base = (base == Dtype(-1)) ? Dtype(1) : log(base);
- CHECK(!std::isnan(log_base))
+ CHECK(!isnan(log_base))
<< "NaN result: log(base) = log(" << base << ") = " << log_base;
- CHECK(!std::isinf(log_base))
+ CHECK(!isinf(log_base))
<< "Inf result: log(base) = log(" << base << ") = " << log_base;
const Dtype input_scale = this->layer_param_.exp_param().scale();
const Dtype input_shift = this->layer_param_.exp_param().shift();