Standardize copyright, add root-level CONTRIBUTORS credit

CONTRIBUTORS.md

@@ -0,0 +1,17 @@
+# Contributors
+
+Caffe is developed by a core set of BVLC members and the open-source community.
+
+We thank all of our [contributors](https://github.com/BVLC/caffe/graphs/contributors)!
+
+**For the detailed history of contributions** of a given file, try
+
+    git blame file
+
+to see line-by-line credits and
+
+    git log --follow file
+
+to see the change log even across renames and rewrites.
+
+Please refer to the [acknowledgements](http://caffe.berkeleyvision.org/#acknowledgements) on the Caffe site for further details.

docs/development.md

@@ -55,3 +55,9 @@ To get a list of all options `googletest` provides, simply pass the `--help` fla
 - Remember that “a foolish consistency is the hobgoblin of little minds,” so use your best judgement to write the clearest code for your particular case.
 
 **Lint**: run `make lint` to check C++ code.
+
+**Copyright**: assign copyright jointly to BVLC and contributors like so:
+
+    // Copyright 2014 BVLC and contributors.
+
+The exact details of contributions are recorded by versioning and cited in our [acknowledgements](http://caffe.berkeleyvision.org/#acknowledgements). This method is impartial and always up-to-date.

examples/cifar10/convert_cifar_data.cpp

@@ -1,4 +1,4 @@
-// Copyright Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
 //
 // This script converts the CIFAR dataset to the leveldb format used
 // by caffe to perform classification.

examples/lenet/convert_mnist_data.cpp

@@ -1,4 +1,4 @@
-// Copyright Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
 //
 // This script converts the MNIST dataset to the leveldb format used
 // by caffe to perform classification.

include/caffe/blob.hpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_BLOB_HPP_
 #define CAFFE_BLOB_HPP_

include/caffe/caffe.hpp

@@ -1,4 +1,4 @@
-// Copyright Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
 // caffe.hpp is the header file that you need to include in your code. It wraps
 // all the internal caffe header files into one for simpler inclusion.
 

include/caffe/filler.hpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 // Fillers are random number generators that fills a blob using the specified
 // algorithm. The expectation is that they are only going to be used during

include/caffe/layer.hpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_LAYER_H_
 #define CAFFE_LAYER_H_

include/caffe/net.hpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_NET_HPP_
 #define CAFFE_NET_HPP_

include/caffe/solver.hpp

@@ -1,4 +1,4 @@
-// Copyright Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_OPTIMIZATION_SOLVER_HPP_
 #define CAFFE_OPTIMIZATION_SOLVER_HPP_

include/caffe/syncedmem.hpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_SYNCEDMEM_HPP_
 #define CAFFE_SYNCEDMEM_HPP_

include/caffe/util/benchmark.hpp

@@ -1,4 +1,4 @@
-// Copyright 2014 kloud@github
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_UTIL_BENCHMARK_H_
 #define CAFFE_UTIL_BENCHMARK_H_

include/caffe/util/im2col.hpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #ifndef _CAFFE_UTIL_IM2COL_HPP_
 #define _CAFFE_UTIL_IM2COL_HPP_

include/caffe/util/insert_splits.hpp

@@ -1,4 +1,4 @@
-// Copyright 2014 Jeff Donahue
+// Copyright 2014 BVLC and contributors.
 
 #ifndef _CAFFE_UTIL_INSERT_SPLITS_HPP_
 #define _CAFFE_UTIL_INSERT_SPLITS_HPP_

include/caffe/util/io.hpp

@@ -1,4 +1,4 @@
-// Copyright Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_UTIL_IO_H_
 #define CAFFE_UTIL_IO_H_

include/caffe/util/math_functions.hpp

@@ -1,5 +1,4 @@
-// Copyright 2013 Yangqing Jia
-// Copyright 2014 kloudkl@github
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_UTIL_MATH_FUNCTIONS_H_
 #define CAFFE_UTIL_MATH_FUNCTIONS_H_

include/caffe/util/mkl_alternate.hpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Rowland Depp
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_UTIL_MKL_ALTERNATE_H_
 #define CAFFE_UTIL_MKL_ALTERNATE_H_

include/caffe/vision_layers.hpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #ifndef CAFFE_VISION_LAYERS_HPP_
 #define CAFFE_VISION_LAYERS_HPP_

matlab/caffe/matcaffe.cpp

@@ -1,4 +1,4 @@
-// Copyright Ross Girshick and Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
 //
 // matcaffe.cpp provides a wrapper of the caffe::Net class as well as some
 // caffe::Caffe functions so that one could easily call it from matlab.

python/caffe/_caffe.cpp

@@ -1,4 +1,4 @@
-// Copyright Yangqing Jia 2013
+// Copyright 2014 BVLC and contributors.
 // pycaffe provides a wrapper of the caffe::Net class as well as some
 // caffe::Caffe functions so that one could easily call it from Python.
 // Note that for python, we will simply use float as the data type.

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>

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_

src/caffe/layers/bnll_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <vector>

src/caffe/layers/bnll_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <vector>

src/caffe/layers/concat_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2014 Sergio Guadarrama
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/concat_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2014 Sergio Guadarrama
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/conv_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/conv_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

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>

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>

src/caffe/layers/dropout_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/dropout_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <limits>

src/caffe/layers/flatten_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/flatten_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

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

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"

src/caffe/layers/hdf5_output_layer.cpp

@@ -1,8 +1,4 @@
 // Copyright 2014 BVLC and contributors.
-/*
-Contributors:
-- kloudkl@github, 2014.
-*/
 
 #include <vector>
 

src/caffe/layers/hdf5_output_layer.cu

@@ -1,8 +1,4 @@
 // Copyright 2014 BVLC and contributors.
-/*
-Contributors:
-- kloudkl@github, 2014.
-*/
 
 #include <vector>
 

src/caffe/layers/im2col_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/im2col_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

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>

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>

src/caffe/layers/inner_product_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/inner_product_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <cublas_v2.h>
 

src/caffe/layers/loss_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <cmath>

src/caffe/layers/lrn_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/lrn_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/neuron_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

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>

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>

src/caffe/layers/pooling_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <cfloat>

src/caffe/layers/pooling_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <cfloat>

src/caffe/layers/relu_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <vector>

src/caffe/layers/relu_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <vector>

src/caffe/layers/sigmoid_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2014 Tobias Domhan
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <cmath>

src/caffe/layers/sigmoid_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2014 Tobias Domhan
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <cmath>

src/caffe/layers/softmax_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 //
 #include <algorithm>
 #include <vector>

src/caffe/layers/softmax_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <cfloat>

src/caffe/layers/softmax_loss_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <cfloat>

src/caffe/layers/softmax_loss_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2013 Yangqing Jia
+// Copyright 2014 BVLC and contributors.
 
 #include <algorithm>
 #include <cfloat>

src/caffe/layers/split_layer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2014 Jeff Donahue
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>
 

src/caffe/layers/split_layer.cu

@@ -1,4 +1,4 @@
-// Copyright 2014 Jeff Donahue
+// Copyright 2014 BVLC and contributors.
 
 #include <vector>