BVLC · shelhamer · Aug 7, 2014 · Aug 6, 2014 · Aug 6, 2014 · Aug 6, 2014
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -15,3 +15,5 @@ to see line-by-line credits and
 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.
+
+**Copyright** is held by the original contributor according to the versioning history; see LICENSE.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,22 @@
+COPYRIGHT
+
+All contributions by the University of California:
 Copyright (c) 2014, The Regents of the University of California (Regents)
 All rights reserved.
 
+All other contributions:
+Copyright (c) 2014, the respective contributors
+All rights reserved.
+
+Caffe uses a shared copyright model: each contributor holds copyright over
+their contributions to Caffe. The project versioning records all such
+contribution and copyright details. If a contributor wants to further mark
+their specific copyright on a particular contribution, they should indicate
+their copyright solely in the commit message of the change when it is
+committed.
+
+LICENSE
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met: 
 
@@ -20,3 +36,9 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+CONTRIBUTION AGREEMENT
+
+By contributing to the BVLC/caffe repository through pull-request, comment,
+or otherwise, the contributor releases their content to the
+license and copyright terms herein.
diff --git a/docs/development.md b/docs/development.md
@@ -7,6 +7,19 @@ title: Development
 Caffe is developed with active participation of the community.<br />
 The [BVLC](http://bvlc.eecs.berkeley.edu/) maintainers welcome all contributions!
 
+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.
+
+## License
+
+Caffe is licensed under the terms in [LICENSE](https://github.com/BVLC/caffe/blob/master/LICENSE). By contributing to the project, you agree to the license and copyright terms therein and release your contribution under these terms.
+
+## Copyright
+
+Caffe uses a shared copyright model: each contributor holds copyright over their contributions to Caffe. The project versioning records all such contribution and copyright details.
+
+If a contributor wants to further mark their specific copyright on a particular contribution, they should indicate their copyright solely in the commit message of the change when it is committed. Do not include copyright notices in files for this purpose.
+
 ### Documentation
 
 This website, written with [Jekyll](http://jekyllrb.com/), functions as the official Caffe documentation -- simply run `scripts/build_docs.sh` and view the website at `http://0.0.0.0:4000`.
@@ -109,12 +122,3 @@ To get a list of all options `googletest` provides, simply pass the `--help` fla
 - Wrap lines at 80 chars.
 - 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.
 - **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.
diff --git a/examples/cifar10/convert_cifar_data.cpp b/examples/cifar10/convert_cifar_data.cpp
@@ -1,4 +1,3 @@
-// Copyright 2014 BVLC and contributors.
 //
 // This script converts the CIFAR dataset to the leveldb format used
 // by caffe to perform classification.

diff --git a/examples/mnist/convert_mnist_data.cpp b/examples/mnist/convert_mnist_data.cpp
@@ -1,4 +1,3 @@
-// Copyright 2014 BVLC and contributors.
 //
 // This script converts the MNIST dataset to the leveldb format used
 // by caffe to perform classification.

diff --git a/include/caffe/blob.hpp b/include/caffe/blob.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_BLOB_HPP_
 #define CAFFE_BLOB_HPP_
 

diff --git a/include/caffe/caffe.hpp b/include/caffe/caffe.hpp
@@ -1,4 +1,3 @@
-// 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.
 

diff --git a/include/caffe/common.hpp b/include/caffe/common.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_COMMON_HPP_
 #define CAFFE_COMMON_HPP_
 

diff --git a/include/caffe/common_layers.hpp b/include/caffe/common_layers.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_COMMON_LAYERS_HPP_
 #define CAFFE_COMMON_LAYERS_HPP_
 

diff --git a/include/caffe/data_layers.hpp b/include/caffe/data_layers.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_DATA_LAYERS_HPP_
 #define CAFFE_DATA_LAYERS_HPP_
 

diff --git a/include/caffe/filler.hpp b/include/caffe/filler.hpp
@@ -1,5 +1,3 @@
-// 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
 // initialization time and will not involve any GPUs.

diff --git a/include/caffe/internal_thread.hpp b/include/caffe/internal_thread.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_INTERNAL_THREAD_HPP_
 #define CAFFE_INTERNAL_THREAD_HPP_
 
@@ -28,7 +26,7 @@ class InternalThread {
   }
 
  protected:
-  /* Implement this method in your subclass 
+  /* Implement this method in your subclass
       with the code you want your thread to run. */
   virtual void InternalThreadEntry() = 0;
 

diff --git a/include/caffe/layer.hpp b/include/caffe/layer.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_LAYER_H_
 #define CAFFE_LAYER_H_
 

diff --git a/include/caffe/loss_layers.hpp b/include/caffe/loss_layers.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_LOSS_LAYERS_HPP_
 #define CAFFE_LOSS_LAYERS_HPP_
 

diff --git a/include/caffe/net.hpp b/include/caffe/net.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_NET_HPP_
 #define CAFFE_NET_HPP_
 

diff --git a/include/caffe/neuron_layers.hpp b/include/caffe/neuron_layers.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_NEURON_LAYERS_HPP_
 #define CAFFE_NEURON_LAYERS_HPP_
 
@@ -233,12 +231,12 @@ class TanHLayer : public NeuronLayer<Dtype> {
 
 /* ThresholdLayer
   Outputs 1 if value in input is above threshold, 0 otherwise.
-  The defult threshold = 0, which means positive values would become 1 and 
+  The defult threshold = 0, which means positive values would become 1 and
   negative or 0, would become 0
 
   y = 1 if x > threshold
   y = 0 if x <= threshold
-  
+
   y' = don't differenciable
 */
 template <typename Dtype>

diff --git a/include/caffe/solver.hpp b/include/caffe/solver.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_OPTIMIZATION_SOLVER_HPP_
 #define CAFFE_OPTIMIZATION_SOLVER_HPP_
 

diff --git a/include/caffe/syncedmem.hpp b/include/caffe/syncedmem.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_SYNCEDMEM_HPP_
 #define CAFFE_SYNCEDMEM_HPP_
 

diff --git a/include/caffe/test/test_caffe_main.hpp b/include/caffe/test/test_caffe_main.hpp
@@ -1,5 +1,3 @@
-// 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.
 #ifndef CAFFE_TEST_TEST_CAFFE_MAIN_HPP_

diff --git a/include/caffe/test/test_gradient_check_util.hpp b/include/caffe/test/test_gradient_check_util.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_TEST_GRADIENT_CHECK_UTIL_H_
 #define CAFFE_TEST_GRADIENT_CHECK_UTIL_H_
 

diff --git a/include/caffe/util/benchmark.hpp b/include/caffe/util/benchmark.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_UTIL_BENCHMARK_H_
 #define CAFFE_UTIL_BENCHMARK_H_
 

diff --git a/include/caffe/util/device_alternate.hpp b/include/caffe/util/device_alternate.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_UTIL_DEVICE_ALTERNATE_H_
 #define CAFFE_UTIL_DEVICE_ALTERNATE_H_
 

diff --git a/include/caffe/util/im2col.hpp b/include/caffe/util/im2col.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef _CAFFE_UTIL_IM2COL_HPP_
 #define _CAFFE_UTIL_IM2COL_HPP_
 

diff --git a/include/caffe/util/insert_splits.hpp b/include/caffe/util/insert_splits.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef _CAFFE_UTIL_INSERT_SPLITS_HPP_
 #define _CAFFE_UTIL_INSERT_SPLITS_HPP_
 

diff --git a/include/caffe/util/io.hpp b/include/caffe/util/io.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_UTIL_IO_H_
 #define CAFFE_UTIL_IO_H_
 

diff --git a/include/caffe/util/math_functions.hpp b/include/caffe/util/math_functions.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_UTIL_MATH_FUNCTIONS_H_
 #define CAFFE_UTIL_MATH_FUNCTIONS_H_
 

diff --git a/include/caffe/util/mkl_alternate.hpp b/include/caffe/util/mkl_alternate.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_UTIL_MKL_ALTERNATE_H_
 #define CAFFE_UTIL_MKL_ALTERNATE_H_
 

diff --git a/include/caffe/util/rng.hpp b/include/caffe/util/rng.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_RNG_CPP_HPP_
 #define CAFFE_RNG_CPP_HPP_
 

diff --git a/include/caffe/util/upgrade_proto.hpp b/include/caffe/util/upgrade_proto.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_UTIL_UPGRADE_PROTO_H_
 #define CAFFE_UTIL_UPGRADE_PROTO_H_
 

diff --git a/include/caffe/vision_layers.hpp b/include/caffe/vision_layers.hpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_VISION_LAYERS_HPP_
 #define CAFFE_VISION_LAYERS_HPP_
 

diff --git a/matlab/caffe/matcaffe.cpp b/matlab/caffe/matcaffe.cpp
@@ -1,4 +1,3 @@
-// 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.

diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp
@@ -1,4 +1,3 @@
-// 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.

diff --git a/scripts/cpp_lint.py b/scripts/cpp_lint.py
@@ -445,7 +445,7 @@
 _error_suppressions = {}
 
 # Finds Copyright.
-_RE_COPYRIGHT = re.compile(r'Copyright \d\d\d\d BVLC and contributors.')
+_RE_COPYRIGHT = re.compile(r'Copyright')
 
 # The root directory used for deriving header guard CPP variable.
 # This is set by --root flag.
@@ -1368,16 +1368,15 @@ def ReverseCloseExpression(clean_lines, linenum, pos):
 
 
 def CheckForCopyright(filename, lines, error):
-  """Logs an error if no Copyright message appears at the top of the file."""
+  """Logs an error if a Copyright message appears at the top of the file."""
 
-  # We'll say it should occur by line 10. Don't forget there's a
+  # We'll check up to line 10. Don't forget there's a
   # dummy line at the front.
   for line in xrange(1, min(len(lines), 11)):
-    if _RE_COPYRIGHT.search(lines[line], re.I): break
-  else:                       # means no copyright line was found
-    error(filename, 0, 'legal/copyright', 5,
-          'BVLC copyright message not found.  '
-          'You should have a line: "Copyright [year] BVLC and contributors."')
+    if _RE_COPYRIGHT.search(lines[line], re.I):
+      error(filename, 0, 'legal/copyright', 5,
+            'Copyright message found.  '
+            'You should not include a copyright line.')
 
 
 def GetHeaderGuardCPPVariable(filename):

diff --git a/src/caffe/blob.cpp b/src/caffe/blob.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include "caffe/blob.hpp"
 #include "caffe/common.hpp"
 #include "caffe/syncedmem.hpp"

diff --git a/src/caffe/common.cpp b/src/caffe/common.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <cstdio>

diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #ifndef CAFFE_LAYER_FACTORY_HPP_
 #define CAFFE_LAYER_FACTORY_HPP_
 

diff --git a/src/caffe/layers/accuracy_layer.cpp b/src/caffe/layers/accuracy_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <algorithm>
 #include <functional>
 #include <utility>

diff --git a/src/caffe/layers/argmax_layer.cpp b/src/caffe/layers/argmax_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <algorithm>
 #include <functional>
 #include <utility>

diff --git a/src/caffe/layers/bnll_layer.cpp b/src/caffe/layers/bnll_layer.cpp
@@ -1,5 +1,3 @@
-// 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
@@ -1,5 +1,3 @@
-// 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
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <vector>
 
 #include "caffe/layer.hpp"

diff --git a/src/caffe/layers/concat_layer.cu b/src/caffe/layers/concat_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <vector>
 
 #include "caffe/layer.hpp"

diff --git a/src/caffe/layers/conv_layer.cpp b/src/caffe/layers/conv_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <vector>
 
 #include "caffe/filler.hpp"

diff --git a/src/caffe/layers/conv_layer.cu b/src/caffe/layers/conv_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <vector>
 
 #include "caffe/filler.hpp"

diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <leveldb/db.h>
 #include <stdint.h>
 

diff --git a/src/caffe/layers/data_layer.cu b/src/caffe/layers/data_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <string>
 #include <vector>
 

diff --git a/src/caffe/layers/dropout_layer.cpp b/src/caffe/layers/dropout_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 // TODO (sergeyk): effect should not be dependent on phase. wasted memcpy.
 
 #include <vector>

diff --git a/src/caffe/layers/dropout_layer.cu b/src/caffe/layers/dropout_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <algorithm>
 #include <limits>
 #include <vector>

diff --git a/src/caffe/layers/dummy_data_layer.cpp b/src/caffe/layers/dummy_data_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <vector>
 
 #include "caffe/filler.hpp"

diff --git a/src/caffe/layers/eltwise_layer.cpp b/src/caffe/layers/eltwise_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
 #include <vector>
 
 #include "caffe/layer.hpp"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ to see line-by-line credits and
		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.

		Copyright is held by the original contributor according to the versioning history; see LICENSE.