diff options
author | Kai Li <kaili_kloud@163.com> | 2014-01-11 23:51:54 +0800 |
---|---|---|
committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-03-21 13:52:34 -0700 |
commit | 04ca88ac15beb35cd127e7c6c2233b774e12c994 (patch) | |
tree | 8ea78138a97e3fcfc4484ae26cd99fde43d7860a /src/caffe/util/math_functions.cpp | |
parent | e4e93f4d12ab33f6765c82b148b64cb4a808a0ee (diff) | |
download | caffeonacl-04ca88ac15beb35cd127e7c6c2233b774e12c994.tar.gz caffeonacl-04ca88ac15beb35cd127e7c6c2233b774e12c994.tar.bz2 caffeonacl-04ca88ac15beb35cd127e7c6c2233b774e12c994.zip |
Fixed uniform distribution upper bound to be inclusive
Diffstat (limited to 'src/caffe/util/math_functions.cpp')
-rw-r--r-- | src/caffe/util/math_functions.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/caffe/util/math_functions.cpp b/src/caffe/util/math_functions.cpp index c3c0a69c..850a408f 100644 --- a/src/caffe/util/math_functions.cpp +++ b/src/caffe/util/math_functions.cpp @@ -1,8 +1,10 @@ // Copyright 2013 Yangqing Jia // Copyright 2014 kloudkl@github +#include <limits> //#include <mkl.h> #include <eigen3/Eigen/Dense> +#include <boost/math/special_functions/next.hpp> #include <boost/random.hpp> #include <cublas_v2.h> @@ -281,6 +283,11 @@ void caffe_powx<double>(const int n, const double* a, const double b, map_vector_double_t(y, n) = const_map_vector_double_t(a, n).array().pow(b); } +template <typename Dtype> +Dtype caffe_nextafter(const Dtype b) { + return boost::math::nextafter<Dtype, Dtype>(b, std::numeric_limits<Dtype>::max()); +} + template <> void caffe_vRngUniform<float>(const int n, float* r, const float a, const float b) { @@ -288,7 +295,8 @@ void caffe_vRngUniform<float>(const int n, float* r, // n, r, a, b)); // FIXME check if boundaries are handled in the same way ? - boost::uniform_real<float> random_distribution(a, b); + boost::random::uniform_real_distribution<float> random_distribution( + a, caffe_nextafter<float>(b)); Caffe::random_generator_t &generator = Caffe::vsl_stream(); for(int i = 0; i < n; i += 1) @@ -304,7 +312,8 @@ void caffe_vRngUniform<double>(const int n, double* r, // n, r, a, b)); // FIXME check if boundaries are handled in the same way ? - boost::uniform_real<double> random_distribution(a, b); + boost::random::uniform_real_distribution<double> random_distribution( + a, caffe_nextafter<double>(b)); Caffe::random_generator_t &generator = Caffe::vsl_stream(); for(int i = 0; i < n; i += 1) @@ -316,6 +325,7 @@ void caffe_vRngUniform<double>(const int n, double* r, template <> void caffe_vRngGaussian<float>(const int n, float* r, const float a, const float sigma) { + DCHECK(sigma > 0); //VSL_CHECK(vsRngGaussian(VSL_RNG_METHOD_GAUSSIAN_BOXMULLER, // Caffe::vsl_stream(), n, r, a, sigma)); @@ -333,6 +343,7 @@ void caffe_vRngGaussian<float>(const int n, float* r, const float a, template <> void caffe_vRngGaussian<double>(const int n, double* r, const double a, const double sigma) { + DCHECK(sigma > 0); //VSL_CHECK(vdRngGaussian(VSL_RNG_METHOD_GAUSSIAN_BOXMULLER, // Caffe::vsl_stream(), n, r, a, sigma)); |