Skip to content

Boosteigencompilewithboost146 #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shelhamer merged 3 commits into from
Jan 22, 2014
Merged

Boosteigencompilewithboost146 #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d2696e
make uniform distribution usage compatible with boost 1.46
jeffdonahue Jan 22, 2014
f76b296
use boost variate_generator to pass tests w/ boost 1.46 (Gaussian filler
jeffdonahue Jan 22, 2014
fae6944
change all Rng's to use variate_generator for consistency
jeffdonahue Jan 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/caffe/util/math_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,12 +398,15 @@ void caffe_vRngUniform(const int n, Dtype* r,

// FIXME check if boundaries are handled in the same way ?
// Fixed by caffe_nextafter
boost::random::uniform_real_distribution<Dtype> random_distribution(
boost::uniform_real<Dtype> random_distribution(
a, caffe_nextafter<Dtype>(b));
Caffe::random_generator_t &generator = Caffe::vsl_stream();
boost::variate_generator<Caffe::random_generator_t,
boost::uniform_real<Dtype> > variate_generator(
generator, random_distribution);

for(int i = 0; i < n; i += 1) {
r[i] = random_distribution(generator);
for (int i = 0; i < n; ++i) {
r[i] = variate_generator();
}
}

Expand Down Expand Up @@ -431,9 +434,12 @@ void caffe_vRngGaussian(const int n, Dtype* r, const Dtype a,
// the tests are irrelevant to the random numbers.
boost::normal_distribution<Dtype> random_distribution(a, sigma);
Caffe::random_generator_t &generator = Caffe::vsl_stream();
boost::variate_generator<Caffe::random_generator_t,
boost::normal_distribution<Dtype> > variate_generator(
generator, random_distribution);

for(int i = 0; i < n; i += 1) {
r[i] = random_distribution(generator);
for (int i = 0; i < n; ++i) {
r[i] = variate_generator();
}
}

Expand All @@ -454,9 +460,12 @@ void caffe_vRngBernoulli(const int n, Dtype* r, const double p) {
// FIXME check if parameters are handled in the same way ?
boost::bernoulli_distribution<Dtype> random_distribution(p);
Caffe::random_generator_t &generator = Caffe::vsl_stream();
boost::variate_generator<Caffe::random_generator_t,
boost::bernoulli_distribution<Dtype> > variate_generator(
generator, random_distribution);

for(int i = 0; i < n; i += 1) {
r[i] = random_distribution(generator);
for (int i = 0; i < n; ++i) {
r[i] = variate_generator();
}
}

Expand Down