summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2014-03-24 11:22:56 -0700
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2014-03-27 11:20:35 -0700
commit6db92e838b4b5bfc1be95f1a1b182a7a57cc5cef (patch)
treef21e92af20ea8850cacde8c92b235bcefe9c1654 /src
parent923a847b21e4a06192a99bfbb406a2436b5ca504 (diff)
downloadcaffeonacl-6db92e838b4b5bfc1be95f1a1b182a7a57cc5cef.tar.gz
caffeonacl-6db92e838b4b5bfc1be95f1a1b182a7a57cc5cef.tar.bz2
caffeonacl-6db92e838b4b5bfc1be95f1a1b182a7a57cc5cef.zip
Standardize copyright, add root-level CONTRIBUTORS credit
Diffstat (limited to 'src')
-rw-r--r--src/caffe/blob.cpp2
-rw-r--r--src/caffe/layer_factory.cpp2
-rw-r--r--src/caffe/layers/bnll_layer.cpp2
-rw-r--r--src/caffe/layers/bnll_layer.cu2
-rw-r--r--src/caffe/layers/concat_layer.cpp2
-rw-r--r--src/caffe/layers/concat_layer.cu2
-rw-r--r--src/caffe/layers/conv_layer.cpp2
-rw-r--r--src/caffe/layers/conv_layer.cu2
-rw-r--r--src/caffe/layers/data_layer.cpp2
-rw-r--r--src/caffe/layers/data_layer.cu2
-rw-r--r--src/caffe/layers/dropout_layer.cpp2
-rw-r--r--src/caffe/layers/dropout_layer.cu2
-rw-r--r--src/caffe/layers/flatten_layer.cpp2
-rw-r--r--src/caffe/layers/flatten_layer.cu2
-rw-r--r--src/caffe/layers/hdf5_data_layer.cpp6
-rw-r--r--src/caffe/layers/hdf5_data_layer.cu2
-rw-r--r--src/caffe/layers/hdf5_output_layer.cpp4
-rw-r--r--src/caffe/layers/hdf5_output_layer.cu4
-rw-r--r--src/caffe/layers/im2col_layer.cpp2
-rw-r--r--src/caffe/layers/im2col_layer.cu2
-rw-r--r--src/caffe/layers/images_layer.cpp2
-rw-r--r--src/caffe/layers/images_layer.cu2
-rw-r--r--src/caffe/layers/inner_product_layer.cpp2
-rw-r--r--src/caffe/layers/inner_product_layer.cu2
-rw-r--r--src/caffe/layers/loss_layer.cpp2
-rw-r--r--src/caffe/layers/lrn_layer.cpp2
-rw-r--r--src/caffe/layers/lrn_layer.cu2
-rw-r--r--src/caffe/layers/neuron_layer.cpp2
-rw-r--r--src/caffe/layers/padding_layer.cpp2
-rw-r--r--src/caffe/layers/padding_layer.cu2
-rw-r--r--src/caffe/layers/pooling_layer.cpp2
-rw-r--r--src/caffe/layers/pooling_layer.cu2
-rw-r--r--src/caffe/layers/relu_layer.cpp2
-rw-r--r--src/caffe/layers/relu_layer.cu2
-rw-r--r--src/caffe/layers/sigmoid_layer.cpp2
-rw-r--r--src/caffe/layers/sigmoid_layer.cu2
-rw-r--r--src/caffe/layers/softmax_layer.cpp2
-rw-r--r--src/caffe/layers/softmax_layer.cu2
-rw-r--r--src/caffe/layers/softmax_loss_layer.cpp2
-rw-r--r--src/caffe/layers/softmax_loss_layer.cu2
-rw-r--r--src/caffe/layers/split_layer.cpp2
-rw-r--r--src/caffe/layers/split_layer.cu2
-rw-r--r--src/caffe/layers/tanh_layer.cpp2
-rw-r--r--src/caffe/layers/tanh_layer.cu2
-rw-r--r--src/caffe/layers/window_data_layer.cpp2
-rw-r--r--src/caffe/layers/window_data_layer.cu2
-rw-r--r--src/caffe/net.cpp2
-rw-r--r--src/caffe/proto/caffe.proto4
-rw-r--r--src/caffe/solver.cpp2
-rw-r--r--src/caffe/syncedmem.cpp2
-rw-r--r--src/caffe/test/test_benchmark.cpp2
-rw-r--r--src/caffe/test/test_blob.cpp2
-rw-r--r--src/caffe/test/test_caffe_main.cpp2
-rw-r--r--src/caffe/test/test_caffe_main.hpp2
-rw-r--r--src/caffe/test/test_common.cpp2
-rw-r--r--src/caffe/test/test_concat_layer.cpp2
-rw-r--r--src/caffe/test/test_convolution_layer.cpp2
-rw-r--r--src/caffe/test/test_data_layer.cpp2
-rw-r--r--src/caffe/test/test_euclidean_loss_layer.cpp2
-rw-r--r--src/caffe/test/test_filler.cpp2
-rw-r--r--src/caffe/test/test_flatten_layer.cpp2
-rw-r--r--src/caffe/test/test_gradient_check_util.hpp2
-rw-r--r--src/caffe/test/test_hdf5_output_layer.cpp2
-rw-r--r--src/caffe/test/test_hdf5data_layer.cpp2
-rw-r--r--src/caffe/test/test_im2col_layer.cpp2
-rw-r--r--src/caffe/test/test_images_layer.cpp2
-rw-r--r--src/caffe/test/test_innerproduct_layer.cpp2
-rw-r--r--src/caffe/test/test_lrn_layer.cpp2
-rw-r--r--src/caffe/test/test_math_functions.cpp2
-rw-r--r--src/caffe/test/test_multinomial_logistic_loss_layer.cpp2
-rw-r--r--src/caffe/test/test_net.cpp2
-rw-r--r--src/caffe/test/test_neuron_layer.cpp2
-rw-r--r--src/caffe/test/test_padding_layer.cpp2
-rw-r--r--src/caffe/test/test_platform.cpp2
-rw-r--r--src/caffe/test/test_pooling_layer.cpp2
-rw-r--r--src/caffe/test/test_protobuf.cpp2
-rw-r--r--src/caffe/test/test_softmax_layer.cpp2
-rw-r--r--src/caffe/test/test_softmax_with_loss_layer.cpp2
-rw-r--r--src/caffe/test/test_split_layer.cpp2
-rw-r--r--src/caffe/test/test_stochastic_pooling.cpp2
-rw-r--r--src/caffe/test/test_syncedmem.cpp2
-rw-r--r--src/caffe/test/test_tanh_layer.cpp2
-rw-r--r--src/caffe/test/test_util_blas.cpp2
-rw-r--r--src/caffe/util/benchmark.cpp2
-rw-r--r--src/caffe/util/im2col.cpp2
-rw-r--r--src/caffe/util/im2col.cu2
-rw-r--r--src/caffe/util/insert_splits.cpp2
-rw-r--r--src/caffe/util/io.cpp2
-rw-r--r--src/caffe/util/math_functions.cu3
89 files changed, 88 insertions, 101 deletions
diff --git a/src/caffe/blob.cpp b/src/caffe/blob.cpp
index 68380367..5356d056 100644
--- a/src/caffe/blob.cpp
+++ b/src/caffe/blob.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cuda_runtime.h>
#include <cublas_v2.h>
diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
index 32a5f7f5..90785af4 100644
--- a/src/caffe/layer_factory.cpp
+++ b/src/caffe/layer_factory.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#ifndef CAFFE_LAYER_FACTORY_HPP_
#define CAFFE_LAYER_FACTORY_HPP_
diff --git a/src/caffe/layers/bnll_layer.cpp b/src/caffe/layers/bnll_layer.cpp
index e7a4fba2..d08adc49 100644
--- a/src/caffe/layers/bnll_layer.cpp
+++ b/src/caffe/layers/bnll_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <vector>
diff --git a/src/caffe/layers/bnll_layer.cu b/src/caffe/layers/bnll_layer.cu
index 7252c022..75bea00e 100644
--- a/src/caffe/layers/bnll_layer.cu
+++ b/src/caffe/layers/bnll_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <vector>
diff --git a/src/caffe/layers/concat_layer.cpp b/src/caffe/layers/concat_layer.cpp
index e6545106..2ce863b1 100644
--- a/src/caffe/layers/concat_layer.cpp
+++ b/src/caffe/layers/concat_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Sergio Guadarrama
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/concat_layer.cu b/src/caffe/layers/concat_layer.cu
index 8a20cea6..9270f1cb 100644
--- a/src/caffe/layers/concat_layer.cu
+++ b/src/caffe/layers/concat_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2014 Sergio Guadarrama
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/conv_layer.cpp b/src/caffe/layers/conv_layer.cpp
index cb1bca65..c3cacebc 100644
--- a/src/caffe/layers/conv_layer.cpp
+++ b/src/caffe/layers/conv_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/conv_layer.cu b/src/caffe/layers/conv_layer.cu
index f8f60558..da76b4df 100644
--- a/src/caffe/layers/conv_layer.cu
+++ b/src/caffe/layers/conv_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp
index f2ff7ff1..1ab28c6d 100644
--- a/src/caffe/layers/data_layer.cpp
+++ b/src/caffe/layers/data_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <stdint.h>
#include <leveldb/db.h>
diff --git a/src/caffe/layers/data_layer.cu b/src/caffe/layers/data_layer.cu
index 57a375ea..86f47578 100644
--- a/src/caffe/layers/data_layer.cu
+++ b/src/caffe/layers/data_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <stdint.h>
#include <leveldb/db.h>
diff --git a/src/caffe/layers/dropout_layer.cpp b/src/caffe/layers/dropout_layer.cpp
index f07547ad..78acf3a3 100644
--- a/src/caffe/layers/dropout_layer.cpp
+++ b/src/caffe/layers/dropout_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/dropout_layer.cu b/src/caffe/layers/dropout_layer.cu
index dc1f3cf8..6d995d1f 100644
--- a/src/caffe/layers/dropout_layer.cu
+++ b/src/caffe/layers/dropout_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <limits>
diff --git a/src/caffe/layers/flatten_layer.cpp b/src/caffe/layers/flatten_layer.cpp
index d8d5c4b6..78e4d0c9 100644
--- a/src/caffe/layers/flatten_layer.cpp
+++ b/src/caffe/layers/flatten_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/flatten_layer.cu b/src/caffe/layers/flatten_layer.cu
index fa1e6aa3..c1f5e48b 100644
--- a/src/caffe/layers/flatten_layer.cu
+++ b/src/caffe/layers/flatten_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp
index 3f87dbc5..03baf5f5 100644
--- a/src/caffe/layers/hdf5_data_layer.cpp
+++ b/src/caffe/layers/hdf5_data_layer.cpp
@@ -1,9 +1,5 @@
-// Copyright 2014 BVLC.
+// Copyright 2014 BVLC and contributors.
/*
-Contributors:
-- Sergey Karayev, 2014.
-- Tobias Domhan, 2014.
-
TODO:
- load file in a separate thread ("prefetch")
- can be smarter about the memcpy call instead of doing it row-by-row
diff --git a/src/caffe/layers/hdf5_data_layer.cu b/src/caffe/layers/hdf5_data_layer.cu
index 261d404d..2f743ef1 100644
--- a/src/caffe/layers/hdf5_data_layer.cu
+++ b/src/caffe/layers/hdf5_data_layer.cu
@@ -1,4 +1,4 @@
-// Copyright Sergey Karayev 2014
+// Copyright 2014 BVLC and contributors.
/*
TODO:
- only load parts of the file, in accordance with a prototxt param "max_mem"
diff --git a/src/caffe/layers/hdf5_output_layer.cpp b/src/caffe/layers/hdf5_output_layer.cpp
index f8433c16..e491697e 100644
--- a/src/caffe/layers/hdf5_output_layer.cpp
+++ b/src/caffe/layers/hdf5_output_layer.cpp
@@ -1,8 +1,4 @@
// Copyright 2014 BVLC and contributors.
-/*
-Contributors:
-- kloudkl@github, 2014.
-*/
#include <vector>
diff --git a/src/caffe/layers/hdf5_output_layer.cu b/src/caffe/layers/hdf5_output_layer.cu
index b5d10888..b9948252 100644
--- a/src/caffe/layers/hdf5_output_layer.cu
+++ b/src/caffe/layers/hdf5_output_layer.cu
@@ -1,8 +1,4 @@
// Copyright 2014 BVLC and contributors.
-/*
-Contributors:
-- kloudkl@github, 2014.
-*/
#include <vector>
diff --git a/src/caffe/layers/im2col_layer.cpp b/src/caffe/layers/im2col_layer.cpp
index a01bfb7c..fc9f52e7 100644
--- a/src/caffe/layers/im2col_layer.cpp
+++ b/src/caffe/layers/im2col_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/im2col_layer.cu b/src/caffe/layers/im2col_layer.cu
index 64731cc5..4074d9e4 100644
--- a/src/caffe/layers/im2col_layer.cu
+++ b/src/caffe/layers/im2col_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/images_layer.cpp b/src/caffe/layers/images_layer.cpp
index 396ed3d8..5154f9a3 100644
--- a/src/caffe/layers/images_layer.cpp
+++ b/src/caffe/layers/images_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <stdint.h>
#include <leveldb/db.h>
diff --git a/src/caffe/layers/images_layer.cu b/src/caffe/layers/images_layer.cu
index 187be33a..9a73daae 100644
--- a/src/caffe/layers/images_layer.cu
+++ b/src/caffe/layers/images_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cuda_runtime.h>
#include <stdint.h>
diff --git a/src/caffe/layers/inner_product_layer.cpp b/src/caffe/layers/inner_product_layer.cpp
index 6ea228fe..9b2c7ef7 100644
--- a/src/caffe/layers/inner_product_layer.cpp
+++ b/src/caffe/layers/inner_product_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/inner_product_layer.cu b/src/caffe/layers/inner_product_layer.cu
index 37463b5a..ac0e0be1 100644
--- a/src/caffe/layers/inner_product_layer.cu
+++ b/src/caffe/layers/inner_product_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cublas_v2.h>
diff --git a/src/caffe/layers/loss_layer.cpp b/src/caffe/layers/loss_layer.cpp
index ef0074d5..e2320082 100644
--- a/src/caffe/layers/loss_layer.cpp
+++ b/src/caffe/layers/loss_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cmath>
diff --git a/src/caffe/layers/lrn_layer.cpp b/src/caffe/layers/lrn_layer.cpp
index 698debab..c43aaf46 100644
--- a/src/caffe/layers/lrn_layer.cpp
+++ b/src/caffe/layers/lrn_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/lrn_layer.cu b/src/caffe/layers/lrn_layer.cu
index 1dcd0c08..b8cd99ac 100644
--- a/src/caffe/layers/lrn_layer.cu
+++ b/src/caffe/layers/lrn_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/neuron_layer.cpp b/src/caffe/layers/neuron_layer.cpp
index 5def7559..e9dbd0eb 100644
--- a/src/caffe/layers/neuron_layer.cpp
+++ b/src/caffe/layers/neuron_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/padding_layer.cpp b/src/caffe/layers/padding_layer.cpp
index 658cc6ab..6b226385 100644
--- a/src/caffe/layers/padding_layer.cpp
+++ b/src/caffe/layers/padding_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <iostream> // NOLINT(readability/streams)
#include <vector>
diff --git a/src/caffe/layers/padding_layer.cu b/src/caffe/layers/padding_layer.cu
index d476df50..8023fef0 100644
--- a/src/caffe/layers/padding_layer.cu
+++ b/src/caffe/layers/padding_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <iostream> // NOLINT(readability/streams)
#include <vector>
diff --git a/src/caffe/layers/pooling_layer.cpp b/src/caffe/layers/pooling_layer.cpp
index 3fd421cd..355ea290 100644
--- a/src/caffe/layers/pooling_layer.cpp
+++ b/src/caffe/layers/pooling_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cfloat>
diff --git a/src/caffe/layers/pooling_layer.cu b/src/caffe/layers/pooling_layer.cu
index 63b4d0db..e8dc2a28 100644
--- a/src/caffe/layers/pooling_layer.cu
+++ b/src/caffe/layers/pooling_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cfloat>
diff --git a/src/caffe/layers/relu_layer.cpp b/src/caffe/layers/relu_layer.cpp
index 18c675c9..7a33e556 100644
--- a/src/caffe/layers/relu_layer.cpp
+++ b/src/caffe/layers/relu_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <vector>
diff --git a/src/caffe/layers/relu_layer.cu b/src/caffe/layers/relu_layer.cu
index 27f5da5c..51e5ef26 100644
--- a/src/caffe/layers/relu_layer.cu
+++ b/src/caffe/layers/relu_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <vector>
diff --git a/src/caffe/layers/sigmoid_layer.cpp b/src/caffe/layers/sigmoid_layer.cpp
index 44897954..601ba472 100644
--- a/src/caffe/layers/sigmoid_layer.cpp
+++ b/src/caffe/layers/sigmoid_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Tobias Domhan
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cmath>
diff --git a/src/caffe/layers/sigmoid_layer.cu b/src/caffe/layers/sigmoid_layer.cu
index 3dbdc397..d10b4d9c 100644
--- a/src/caffe/layers/sigmoid_layer.cu
+++ b/src/caffe/layers/sigmoid_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2014 Tobias Domhan
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cmath>
diff --git a/src/caffe/layers/softmax_layer.cpp b/src/caffe/layers/softmax_layer.cpp
index 0d2e4572..e9983608 100644
--- a/src/caffe/layers/softmax_layer.cpp
+++ b/src/caffe/layers/softmax_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
//
#include <algorithm>
#include <vector>
diff --git a/src/caffe/layers/softmax_layer.cu b/src/caffe/layers/softmax_layer.cu
index 5efa4909..a264a819 100644
--- a/src/caffe/layers/softmax_layer.cu
+++ b/src/caffe/layers/softmax_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cfloat>
diff --git a/src/caffe/layers/softmax_loss_layer.cpp b/src/caffe/layers/softmax_loss_layer.cpp
index f9bd82e2..fecd7a52 100644
--- a/src/caffe/layers/softmax_loss_layer.cpp
+++ b/src/caffe/layers/softmax_loss_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cfloat>
diff --git a/src/caffe/layers/softmax_loss_layer.cu b/src/caffe/layers/softmax_loss_layer.cu
index ab7ee6ee..24a3c384 100644
--- a/src/caffe/layers/softmax_loss_layer.cu
+++ b/src/caffe/layers/softmax_loss_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cfloat>
diff --git a/src/caffe/layers/split_layer.cpp b/src/caffe/layers/split_layer.cpp
index a8a240f7..5ca95f34 100644
--- a/src/caffe/layers/split_layer.cpp
+++ b/src/caffe/layers/split_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Jeff Donahue
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/split_layer.cu b/src/caffe/layers/split_layer.cu
index deccf990..5b2814ba 100644
--- a/src/caffe/layers/split_layer.cu
+++ b/src/caffe/layers/split_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2014 Jeff Donahue
+// Copyright 2014 BVLC and contributors.
#include <vector>
diff --git a/src/caffe/layers/tanh_layer.cpp b/src/caffe/layers/tanh_layer.cpp
index c2657923..46d11d0a 100644
--- a/src/caffe/layers/tanh_layer.cpp
+++ b/src/caffe/layers/tanh_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Aravindh Mahendran
+// Copyright 2014 BVLC and contributors.
// TanH neuron activation function layer.
// Adapted from ReLU layer code written by Yangqing Jia
diff --git a/src/caffe/layers/tanh_layer.cu b/src/caffe/layers/tanh_layer.cu
index 899b841b..13bb001f 100644
--- a/src/caffe/layers/tanh_layer.cu
+++ b/src/caffe/layers/tanh_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2014 Aravindh Mahendran
+// Copyright 2014 BVLC and contributors.
// TanH neuron activation function layer.
// Adapted from ReLU layer code written by Yangqing Jia
diff --git a/src/caffe/layers/window_data_layer.cpp b/src/caffe/layers/window_data_layer.cpp
index d447cba5..bf62bcb4 100644
--- a/src/caffe/layers/window_data_layer.cpp
+++ b/src/caffe/layers/window_data_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Ross Girshick
+// Copyright 2014 BVLC and contributors.
//
// Based on data_layer.cpp by Yangqing Jia.
diff --git a/src/caffe/layers/window_data_layer.cu b/src/caffe/layers/window_data_layer.cu
index ae477c03..d46b5e02 100644
--- a/src/caffe/layers/window_data_layer.cu
+++ b/src/caffe/layers/window_data_layer.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Ross Girshick
+// Copyright 2014 BVLC and contributors.
//
// Based on data_layer.cpp by Yangqing Jia.
diff --git a/src/caffe/net.cpp b/src/caffe/net.cpp
index 3018285c..1ba0e835 100644
--- a/src/caffe/net.cpp
+++ b/src/caffe/net.cpp
@@ -1,4 +1,4 @@
-// Copyright Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
#include <map>
#include <set>
diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto
index 362764a7..77d6d571 100644
--- a/src/caffe/proto/caffe.proto
+++ b/src/caffe/proto/caffe.proto
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
package caffe;
@@ -125,7 +125,7 @@ message LayerParameter {
// the other dimensions must be the same for all the bottom blobs.
// By default it will concatenate blobs along the channels dimension.
optional uint32 concat_dim = 65 [default = 1];
-
+
optional HDF5OutputParameter hdf5_output_param = 1001;
}
diff --git a/src/caffe/solver.cpp b/src/caffe/solver.cpp
index fb46c4ec..5fa150cb 100644
--- a/src/caffe/solver.cpp
+++ b/src/caffe/solver.cpp
@@ -1,4 +1,4 @@
-// Copyright Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
#include <cstdio>
diff --git a/src/caffe/syncedmem.cpp b/src/caffe/syncedmem.cpp
index 8f6ecf62..c33f3e60 100644
--- a/src/caffe/syncedmem.cpp
+++ b/src/caffe/syncedmem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cuda_runtime.h>
diff --git a/src/caffe/test/test_benchmark.cpp b/src/caffe/test/test_benchmark.cpp
index 8614f482..40eee9c8 100644
--- a/src/caffe/test/test_benchmark.cpp
+++ b/src/caffe/test/test_benchmark.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 kloud@github
+// Copyright 2014 BVLC and contributors.
#include <unistd.h> // for usleep
#include <cuda_runtime.h>
diff --git a/src/caffe/test/test_blob.cpp b/src/caffe/test/test_blob.cpp
index 7ce1a384..5d38e54f 100644
--- a/src/caffe/test/test_blob.cpp
+++ b/src/caffe/test/test_blob.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
diff --git a/src/caffe/test/test_caffe_main.cpp b/src/caffe/test/test_caffe_main.cpp
index 4674bb4e..ecc117e3 100644
--- a/src/caffe/test/test_caffe_main.cpp
+++ b/src/caffe/test/test_caffe_main.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
// The main caffe test code. Your test cpp code should include this hpp
// to allow a main function to be compiled into the binary.
diff --git a/src/caffe/test/test_caffe_main.hpp b/src/caffe/test/test_caffe_main.hpp
index 68374ae6..df64cbb4 100644
--- a/src/caffe/test/test_caffe_main.hpp
+++ b/src/caffe/test/test_caffe_main.hpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
// The main caffe test code. Your test cpp code should include this hpp
// to allow a main function to be compiled into the binary.
diff --git a/src/caffe/test/test_common.cpp b/src/caffe/test/test_common.cpp
index 12e71688..7839c377 100644
--- a/src/caffe/test/test_common.cpp
+++ b/src/caffe/test/test_common.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
diff --git a/src/caffe/test/test_concat_layer.cpp b/src/caffe/test/test_concat_layer.cpp
index 3515ef96..8ce7ce16 100644
--- a/src/caffe/test/test_concat_layer.cpp
+++ b/src/caffe/test/test_concat_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Sergio Guadarrama
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <vector>
diff --git a/src/caffe/test/test_convolution_layer.cpp b/src/caffe/test/test_convolution_layer.cpp
index e1a36183..db23680c 100644
--- a/src/caffe/test/test_convolution_layer.cpp
+++ b/src/caffe/test/test_convolution_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <vector>
diff --git a/src/caffe/test/test_data_layer.cpp b/src/caffe/test/test_data_layer.cpp
index 35c34395..032b0eb3 100644
--- a/src/caffe/test/test_data_layer.cpp
+++ b/src/caffe/test/test_data_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <string>
#include <vector>
diff --git a/src/caffe/test/test_euclidean_loss_layer.cpp b/src/caffe/test/test_euclidean_loss_layer.cpp
index d408860c..d5e4107a 100644
--- a/src/caffe/test/test_euclidean_loss_layer.cpp
+++ b/src/caffe/test/test_euclidean_loss_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cmath>
#include <cstdlib>
diff --git a/src/caffe/test/test_filler.cpp b/src/caffe/test/test_filler.cpp
index c4388c27..e8b556a6 100644
--- a/src/caffe/test/test_filler.cpp
+++ b/src/caffe/test/test_filler.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
diff --git a/src/caffe/test/test_flatten_layer.cpp b/src/caffe/test/test_flatten_layer.cpp
index f241135d..139488b5 100644
--- a/src/caffe/test/test_flatten_layer.cpp
+++ b/src/caffe/test/test_flatten_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <vector>
diff --git a/src/caffe/test/test_gradient_check_util.hpp b/src/caffe/test/test_gradient_check_util.hpp
index 6e895241..6ef76e23 100644
--- a/src/caffe/test/test_gradient_check_util.hpp
+++ b/src/caffe/test/test_gradient_check_util.hpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#ifndef CAFFE_TEST_GRADIENT_CHECK_UTIL_H_
#define CAFFE_TEST_GRADIENT_CHECK_UTIL_H_
diff --git a/src/caffe/test/test_hdf5_output_layer.cpp b/src/caffe/test/test_hdf5_output_layer.cpp
index 3cbfb3f3..09a40855 100644
--- a/src/caffe/test/test_hdf5_output_layer.cpp
+++ b/src/caffe/test/test_hdf5_output_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 kloudkl@github
+// Copyright 2014 BVLC and contributors.
#include <cuda_runtime.h>
#include <string>
diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp
index 51ef5440..b03fe726 100644
--- a/src/caffe/test/test_hdf5data_layer.cpp
+++ b/src/caffe/test/test_hdf5data_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <string>
#include <vector>
diff --git a/src/caffe/test/test_im2col_layer.cpp b/src/caffe/test/test_im2col_layer.cpp
index ac2f8fe2..31a01157 100644
--- a/src/caffe/test/test_im2col_layer.cpp
+++ b/src/caffe/test/test_im2col_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <vector>
diff --git a/src/caffe/test/test_images_layer.cpp b/src/caffe/test/test_images_layer.cpp
index 594a654d..e8ed7c18 100644
--- a/src/caffe/test/test_images_layer.cpp
+++ b/src/caffe/test/test_images_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Sergio Guadarrama
+// Copyright 2014 BVLC and contributors.
#include <cuda_runtime.h>
diff --git a/src/caffe/test/test_innerproduct_layer.cpp b/src/caffe/test/test_innerproduct_layer.cpp
index eac33b9c..5b183172 100644
--- a/src/caffe/test/test_innerproduct_layer.cpp
+++ b/src/caffe/test/test_innerproduct_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <vector>
diff --git a/src/caffe/test/test_lrn_layer.cpp b/src/caffe/test/test_lrn_layer.cpp
index cbdb7d14..a96684d2 100644
--- a/src/caffe/test/test_lrn_layer.cpp
+++ b/src/caffe/test/test_lrn_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cstring>
diff --git a/src/caffe/test/test_math_functions.cpp b/src/caffe/test/test_math_functions.cpp
index ca059a91..354dad46 100644
--- a/src/caffe/test/test_math_functions.cpp
+++ b/src/caffe/test/test_math_functions.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 kloudkl@github
+// Copyright 2014 BVLC and contributors.
#include <stdint.h> // for uint32_t & uint64_t
#include <time.h>
diff --git a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp
index 5a61df79..6fc01e3b 100644
--- a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp
+++ b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cmath>
#include <cstdlib>
diff --git a/src/caffe/test/test_net.cpp b/src/caffe/test/test_net.cpp
index fd7265c4..77b3516a 100644
--- a/src/caffe/test/test_net.cpp
+++ b/src/caffe/test/test_net.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 kloudkl@github
+// Copyright 2014 BVLC and contributors.
#include <google/protobuf/text_format.h>
#include <leveldb/db.h>
diff --git a/src/caffe/test/test_neuron_layer.cpp b/src/caffe/test/test_neuron_layer.cpp
index b2367029..105f321e 100644
--- a/src/caffe/test/test_neuron_layer.cpp
+++ b/src/caffe/test/test_neuron_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <vector>
diff --git a/src/caffe/test/test_padding_layer.cpp b/src/caffe/test/test_padding_layer.cpp
index ad1f6bf5..c775f3be 100644
--- a/src/caffe/test/test_padding_layer.cpp
+++ b/src/caffe/test/test_padding_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cuda_runtime.h>
#include <cstring>
diff --git a/src/caffe/test/test_platform.cpp b/src/caffe/test/test_platform.cpp
index bd2dcd33..c3868f34 100644
--- a/src/caffe/test/test_platform.cpp
+++ b/src/caffe/test/test_platform.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstdlib>
#include <cstdio>
diff --git a/src/caffe/test/test_pooling_layer.cpp b/src/caffe/test/test_pooling_layer.cpp
index ae2e51ed..11b9ce23 100644
--- a/src/caffe/test/test_pooling_layer.cpp
+++ b/src/caffe/test/test_pooling_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <vector>
diff --git a/src/caffe/test/test_protobuf.cpp b/src/caffe/test/test_protobuf.cpp
index d8d511dd..0618d8c5 100644
--- a/src/caffe/test/test_protobuf.cpp
+++ b/src/caffe/test/test_protobuf.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
// This is simply a script that tries serializing protocol buffer in text
// format. Nothing special here and no actual code is being tested.
diff --git a/src/caffe/test/test_softmax_layer.cpp b/src/caffe/test/test_softmax_layer.cpp
index 1d4260a5..3ba302d4 100644
--- a/src/caffe/test/test_softmax_layer.cpp
+++ b/src/caffe/test/test_softmax_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cmath>
#include <cstring>
diff --git a/src/caffe/test/test_softmax_with_loss_layer.cpp b/src/caffe/test/test_softmax_with_loss_layer.cpp
index 77668e54..2a15b84d 100644
--- a/src/caffe/test/test_softmax_with_loss_layer.cpp
+++ b/src/caffe/test/test_softmax_with_loss_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cmath>
#include <cstdlib>
diff --git a/src/caffe/test/test_split_layer.cpp b/src/caffe/test/test_split_layer.cpp
index afec9c9d..2c7c986e 100644
--- a/src/caffe/test/test_split_layer.cpp
+++ b/src/caffe/test/test_split_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Jeff Donahue
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <string>
diff --git a/src/caffe/test/test_stochastic_pooling.cpp b/src/caffe/test/test_stochastic_pooling.cpp
index aedd6f3c..daf2c36d 100644
--- a/src/caffe/test/test_stochastic_pooling.cpp
+++ b/src/caffe/test/test_stochastic_pooling.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cstring>
diff --git a/src/caffe/test/test_syncedmem.cpp b/src/caffe/test/test_syncedmem.cpp
index 161ca458..cd747589 100644
--- a/src/caffe/test/test_syncedmem.cpp
+++ b/src/caffe/test/test_syncedmem.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
#include <vector>
diff --git a/src/caffe/test/test_tanh_layer.cpp b/src/caffe/test/test_tanh_layer.cpp
index 6248e508..82cb96c1 100644
--- a/src/caffe/test/test_tanh_layer.cpp
+++ b/src/caffe/test/test_tanh_layer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Aravindh Mahendran
+// Copyright 2014 BVLC and contributors.
// Adapted from other test files
#include <cmath>
diff --git a/src/caffe/test/test_util_blas.cpp b/src/caffe/test/test_util_blas.cpp
index 57f4eafc..2e4c6795 100644
--- a/src/caffe/test/test_util_blas.cpp
+++ b/src/caffe/test/test_util_blas.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cstring>
diff --git a/src/caffe/util/benchmark.cpp b/src/caffe/util/benchmark.cpp
index 21c38ad3..0bd85218 100644
--- a/src/caffe/util/benchmark.cpp
+++ b/src/caffe/util/benchmark.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 kloud@github
+// Copyright 2014 BVLC and contributors.
#include <boost/date_time/posix_time/posix_time.hpp>
#include <cuda_runtime.h>
diff --git a/src/caffe/util/im2col.cpp b/src/caffe/util/im2col.cpp
index 4ed3af8a..037410e2 100644
--- a/src/caffe/util/im2col.cpp
+++ b/src/caffe/util/im2col.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <cmath>
#include <cstdlib>
diff --git a/src/caffe/util/im2col.cu b/src/caffe/util/im2col.cu
index 8776e8e5..28325fdb 100644
--- a/src/caffe/util/im2col.cu
+++ b/src/caffe/util/im2col.cu
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <algorithm>
#include <cmath>
diff --git a/src/caffe/util/insert_splits.cpp b/src/caffe/util/insert_splits.cpp
index d208bcd2..f72f20c0 100644
--- a/src/caffe/util/insert_splits.cpp
+++ b/src/caffe/util/insert_splits.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014 Jeff Donahue
+// Copyright 2014 BVLC and contributors.
#include <map>
#include <string>
diff --git a/src/caffe/util/io.cpp b/src/caffe/util/io.cpp
index 053d7a40..fdad21d6 100644
--- a/src/caffe/util/io.cpp
+++ b/src/caffe/util/io.cpp
@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
#include <stdint.h>
#include <fcntl.h>
diff --git a/src/caffe/util/math_functions.cu b/src/caffe/util/math_functions.cu
index 85753aa5..82524cb4 100644
--- a/src/caffe/util/math_functions.cu
+++ b/src/caffe/util/math_functions.cu
@@ -1,5 +1,4 @@
-// Copyright 2013 Yangqing Jia
-// Copyright 2014 kloudkl@github
+// Copyright 2014 BVLC and contributors.
#include <math_functions.h> // CUDA's, not caffe's, for fabs, signbit
#include <cmath>