summaryrefslogtreecommitdiff
path: root/src/caffe/util/math_functions.cpp
diff options
context:
space:
mode:
authorJeff Donahue <jeff.donahue@gmail.com>2014-04-08 13:18:29 -0700
committerJeff Donahue <jeff.donahue@gmail.com>2014-04-08 20:17:17 -0700
commitd00279917a5282e8ce6194c87e443623e545033a (patch)
treee0a4c2bb07ad94b7a6e5c3730df80c2e34a6d065 /src/caffe/util/math_functions.cpp
parent078e0bf713bcc4f9178f6694c66b368302448484 (diff)
downloadcaffeonacl-d00279917a5282e8ce6194c87e443623e545033a.tar.gz
caffeonacl-d00279917a5282e8ce6194c87e443623e545033a.tar.bz2
caffeonacl-d00279917a5282e8ce6194c87e443623e545033a.zip
make RNG function outputs the last argument per Google C++ style guidelines
Diffstat (limited to 'src/caffe/util/math_functions.cpp')
-rw-r--r--src/caffe/util/math_functions.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/caffe/util/math_functions.cpp b/src/caffe/util/math_functions.cpp
index a524ed3d..c26675f8 100644
--- a/src/caffe/util/math_functions.cpp
+++ b/src/caffe/util/math_functions.cpp
@@ -315,8 +315,7 @@ template
double caffe_nextafter(const double b);
template <typename Dtype>
-void caffe_rng_uniform(const int n, Dtype* r,
- const Dtype a, const Dtype b) {
+void caffe_rng_uniform(const int n, const Dtype a, const Dtype b, Dtype* r) {
CHECK_GE(n, 0);
CHECK(r);
CHECK_LE(a, b);
@@ -330,15 +329,16 @@ void caffe_rng_uniform(const int n, Dtype* r,
}
template
-void caffe_rng_uniform<float>(const int n, float* r,
- const float a, const float b);
+void caffe_rng_uniform<float>(const int n, const float a, const float b,
+ float* r);
+
template
-void caffe_rng_uniform<double>(const int n, double* r,
- const double a, const double b);
+void caffe_rng_uniform<double>(const int n, const double a, const double b,
+ double* r);
template <typename Dtype>
-void caffe_rng_gaussian(const int n, Dtype* r, const Dtype a,
- const Dtype sigma) {
+void caffe_rng_gaussian(const int n, const Dtype a,
+ const Dtype sigma, Dtype* r) {
CHECK_GE(n, 0);
CHECK(r);
CHECK_GT(sigma, 0);
@@ -352,15 +352,15 @@ void caffe_rng_gaussian(const int n, Dtype* r, const Dtype a,
}
template
-void caffe_rng_gaussian<float>(const int n, float* r, const float a,
- const float sigma);
+void caffe_rng_gaussian<float>(const int n, const float mu,
+ const float sigma, float* r);
template
-void caffe_rng_gaussian<double>(const int n, double* r, const double a,
- const double sigma);
+void caffe_rng_gaussian<double>(const int n, const double mu,
+ const double sigma, double* r);
template <typename Dtype>
-void caffe_rng_bernoulli(const int n, int* r, const Dtype p) {
+void caffe_rng_bernoulli(const int n, const Dtype p, int* r) {
CHECK_GE(n, 0);
CHECK(r);
CHECK_GE(p, 0);
@@ -375,10 +375,10 @@ void caffe_rng_bernoulli(const int n, int* r, const Dtype p) {
}
template
-void caffe_rng_bernoulli<double>(const int n, int* r, const double p);
+void caffe_rng_bernoulli<double>(const int n, const double p, int* r);
template
-void caffe_rng_bernoulli<float>(const int n, int* r, const float p);
+void caffe_rng_bernoulli<float>(const int n, const float p, int* r);
template <>
float caffe_cpu_dot<float>(const int n, const float* x, const float* y) {