diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2de2a717eff..8db66ea82c6 100644
--- 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
index bac9c99fd41..efcc5c5b6b0 100644
--- 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
index ff734d17219..d586a2b1c30 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -7,6 +7,19 @@ title: Development
Caffe is developed with active participation of the community.
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
index d1f3f3e0e9f..2d5589bd30a 100644
--- 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
index c2cf4b3af33..a97a9285a19 100644
--- 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
index 2086c5119bc..eb0c25ba394 100644
--- 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
index 172fc5f3bf7..0af9ef04c43 100644
--- 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
index d3dbd471e67..97a34962c63 100644
--- 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
index ed11487c6f3..1e282d33d7a 100644
--- 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
index f868b2869da..31774828a69 100644
--- 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
index beeee01dcb9..a8366801132 100644
--- 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
index 46f67360f0c..8520899ada6 100644
--- 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
index aac82447a41..dca5f8709af 100644
--- 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
index 73a677b624a..bd2618d6d36 100644
--- 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
index 808b244e47d..8c22137e514 100644
--- 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
index 4b3f6f4394d..6fe425229e8 100644
--- 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 {
/* 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
diff --git a/include/caffe/solver.hpp b/include/caffe/solver.hpp
index 811d70372a4..cdf583a1429 100644
--- 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
index 2b7f349025a..b2fc287b23e 100644
--- 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
index 759e01a2629..40b9effc5f1 100644
--- 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
index 034aeccb90b..4cf2cbc9dc8 100644
--- 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
index 8ee76140d9a..f7ef8eaf3ee 100644
--- 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
index abee4f57dd1..cf1aef759cc 100644
--- 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
index c263997ae66..0051e2fa067 100644
--- 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
index 4da1ea81502..4ca933b9203 100644
--- 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
index 4f517ff1d71..cdf4d9e724e 100644
--- 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
index 001950113a1..744dc849b94 100644
--- 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
index c30eab8d3d4..d72bcd2814d 100644
--- 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
index f774d704569..8f1cf0d17c2 100644
--- 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
index 39e4f4ce22c..1ee184a34e9 100644
--- 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
index 80dc37543ee..0797065081f 100644
--- 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
index d0e98f8319d..70652e26e49 100644
--- 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
index 59317727914..3103d0267be 100644
--- 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
index 3f0ca1c3527..3f80e723643 100755
--- 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
index 738b549e10c..9fd1232a9ad 100644
--- 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
index 019370b1dd7..99b2292461e 100644
--- a/src/caffe/common.cpp
+++ b/src/caffe/common.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
index 1165abc6da8..118929fbff5 100644
--- 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
index f99b01dc105..76889d8b70a 100644
--- a/src/caffe/layers/accuracy_layer.cpp
+++ b/src/caffe/layers/accuracy_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/argmax_layer.cpp b/src/caffe/layers/argmax_layer.cpp
index 732f7bf15d1..b2ef91eab67 100644
--- a/src/caffe/layers/argmax_layer.cpp
+++ b/src/caffe/layers/argmax_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/bnll_layer.cpp b/src/caffe/layers/bnll_layer.cpp
index 9b7a0642779..4cb852031af 100644
--- a/src/caffe/layers/bnll_layer.cpp
+++ b/src/caffe/layers/bnll_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/bnll_layer.cu b/src/caffe/layers/bnll_layer.cu
index bc6a201e9b4..9895a06107a 100644
--- a/src/caffe/layers/bnll_layer.cu
+++ b/src/caffe/layers/bnll_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/concat_layer.cpp b/src/caffe/layers/concat_layer.cpp
index 32203a8d980..b76d4b2ca14 100644
--- a/src/caffe/layers/concat_layer.cpp
+++ b/src/caffe/layers/concat_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/concat_layer.cu b/src/caffe/layers/concat_layer.cu
index 1a97f02a62a..aea8b77e37f 100644
--- a/src/caffe/layers/concat_layer.cu
+++ b/src/caffe/layers/concat_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/conv_layer.cpp b/src/caffe/layers/conv_layer.cpp
index ca63e976e80..df3e31ba84a 100644
--- a/src/caffe/layers/conv_layer.cpp
+++ b/src/caffe/layers/conv_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/filler.hpp"
diff --git a/src/caffe/layers/conv_layer.cu b/src/caffe/layers/conv_layer.cu
index 616a81a1388..04ae13932d9 100644
--- a/src/caffe/layers/conv_layer.cu
+++ b/src/caffe/layers/conv_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/filler.hpp"
diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp
index ddc7f770b46..c089c9ba5df 100644
--- a/src/caffe/layers/data_layer.cpp
+++ b/src/caffe/layers/data_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/data_layer.cu b/src/caffe/layers/data_layer.cu
index fcbf2346840..2ae1a640319 100644
--- a/src/caffe/layers/data_layer.cu
+++ b/src/caffe/layers/data_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/dropout_layer.cpp b/src/caffe/layers/dropout_layer.cpp
index 605aa151196..0621b56ec6e 100644
--- 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
diff --git a/src/caffe/layers/dropout_layer.cu b/src/caffe/layers/dropout_layer.cu
index 8befa4d87fb..9bcd687bb5d 100644
--- a/src/caffe/layers/dropout_layer.cu
+++ b/src/caffe/layers/dropout_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/dummy_data_layer.cpp b/src/caffe/layers/dummy_data_layer.cpp
index 58044f4c952..98b437eea98 100644
--- 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
#include "caffe/filler.hpp"
diff --git a/src/caffe/layers/eltwise_layer.cpp b/src/caffe/layers/eltwise_layer.cpp
index 09ca66f38e8..8085b4644cc 100644
--- a/src/caffe/layers/eltwise_layer.cpp
+++ b/src/caffe/layers/eltwise_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/eltwise_layer.cu b/src/caffe/layers/eltwise_layer.cu
index d47d24afad7..eec8857c577 100644
--- a/src/caffe/layers/eltwise_layer.cu
+++ b/src/caffe/layers/eltwise_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/euclidean_loss_layer.cpp b/src/caffe/layers/euclidean_loss_layer.cpp
index 2a814f0150a..17180d40b69 100644
--- a/src/caffe/layers/euclidean_loss_layer.cpp
+++ b/src/caffe/layers/euclidean_loss_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/euclidean_loss_layer.cu b/src/caffe/layers/euclidean_loss_layer.cu
index e1358f0fb51..dd14f1995c8 100644
--- a/src/caffe/layers/euclidean_loss_layer.cu
+++ b/src/caffe/layers/euclidean_loss_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/flatten_layer.cpp b/src/caffe/layers/flatten_layer.cpp
index f1fdd322eb4..81a506a8177 100644
--- a/src/caffe/layers/flatten_layer.cpp
+++ b/src/caffe/layers/flatten_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/flatten_layer.cu b/src/caffe/layers/flatten_layer.cu
index 60b67f06e05..7233afb3718 100644
--- a/src/caffe/layers/flatten_layer.cu
+++ b/src/caffe/layers/flatten_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp
index 38b2b8d23f3..5bad5f6a1f0 100644
--- a/src/caffe/layers/hdf5_data_layer.cpp
+++ b/src/caffe/layers/hdf5_data_layer.cpp
@@ -1,4 +1,3 @@
-// Copyright 2014 BVLC and contributors.
/*
TODO:
- load file in a separate thread ("prefetch")
diff --git a/src/caffe/layers/hdf5_data_layer.cu b/src/caffe/layers/hdf5_data_layer.cu
index d50d9616771..1f682d5726d 100644
--- a/src/caffe/layers/hdf5_data_layer.cu
+++ b/src/caffe/layers/hdf5_data_layer.cu
@@ -1,4 +1,3 @@
-// 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 30e4997854b..0d7590b1b12 100644
--- a/src/caffe/layers/hdf5_output_layer.cpp
+++ b/src/caffe/layers/hdf5_output_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "hdf5.h"
diff --git a/src/caffe/layers/hdf5_output_layer.cu b/src/caffe/layers/hdf5_output_layer.cu
index 9b3dd135841..d2f20b3fc79 100644
--- a/src/caffe/layers/hdf5_output_layer.cu
+++ b/src/caffe/layers/hdf5_output_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "hdf5.h"
diff --git a/src/caffe/layers/hinge_loss_layer.cpp b/src/caffe/layers/hinge_loss_layer.cpp
index a7ec061eb28..bc3a593c769 100644
--- a/src/caffe/layers/hinge_loss_layer.cpp
+++ b/src/caffe/layers/hinge_loss_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/im2col_layer.cpp b/src/caffe/layers/im2col_layer.cpp
index fb3dad43844..2dd7476237a 100644
--- a/src/caffe/layers/im2col_layer.cpp
+++ b/src/caffe/layers/im2col_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/common.hpp"
diff --git a/src/caffe/layers/im2col_layer.cu b/src/caffe/layers/im2col_layer.cu
index c9802541aaa..6b4c701073e 100644
--- a/src/caffe/layers/im2col_layer.cu
+++ b/src/caffe/layers/im2col_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/common.hpp"
diff --git a/src/caffe/layers/image_data_layer.cpp b/src/caffe/layers/image_data_layer.cpp
index a10f02c37a8..a0f03a8266d 100644
--- a/src/caffe/layers/image_data_layer.cpp
+++ b/src/caffe/layers/image_data_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include // NOLINT(readability/streams)
#include // NOLINT(readability/streams)
#include
diff --git a/src/caffe/layers/image_data_layer.cu b/src/caffe/layers/image_data_layer.cu
index 8a449d010e2..f61409cc38a 100644
--- a/src/caffe/layers/image_data_layer.cu
+++ b/src/caffe/layers/image_data_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/blob.hpp"
diff --git a/src/caffe/layers/infogain_loss_layer.cpp b/src/caffe/layers/infogain_loss_layer.cpp
index c972c032607..fa01116ee36 100644
--- a/src/caffe/layers/infogain_loss_layer.cpp
+++ b/src/caffe/layers/infogain_loss_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/inner_product_layer.cpp b/src/caffe/layers/inner_product_layer.cpp
index 6493d0bd497..a9e0f353e9e 100644
--- a/src/caffe/layers/inner_product_layer.cpp
+++ b/src/caffe/layers/inner_product_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/blob.hpp"
diff --git a/src/caffe/layers/inner_product_layer.cu b/src/caffe/layers/inner_product_layer.cu
index 4b670d644c2..e02107200cf 100644
--- a/src/caffe/layers/inner_product_layer.cu
+++ b/src/caffe/layers/inner_product_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/blob.hpp"
diff --git a/src/caffe/layers/loss_layer.cpp b/src/caffe/layers/loss_layer.cpp
index 656e85a75d8..48665221f1d 100644
--- a/src/caffe/layers/loss_layer.cpp
+++ b/src/caffe/layers/loss_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/lrn_layer.cpp b/src/caffe/layers/lrn_layer.cpp
index 50ad6464449..e77f6857c85 100644
--- a/src/caffe/layers/lrn_layer.cpp
+++ b/src/caffe/layers/lrn_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/lrn_layer.cu b/src/caffe/layers/lrn_layer.cu
index 7a19350549c..eee12e66cec 100644
--- a/src/caffe/layers/lrn_layer.cu
+++ b/src/caffe/layers/lrn_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/memory_data_layer.cpp b/src/caffe/layers/memory_data_layer.cpp
index 15eedb317e3..d1717fd4258 100644
--- a/src/caffe/layers/memory_data_layer.cpp
+++ b/src/caffe/layers/memory_data_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/multinomial_logistic_loss_layer.cpp b/src/caffe/layers/multinomial_logistic_loss_layer.cpp
index e5eafd65078..a9c7de6595d 100644
--- a/src/caffe/layers/multinomial_logistic_loss_layer.cpp
+++ b/src/caffe/layers/multinomial_logistic_loss_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/neuron_layer.cpp b/src/caffe/layers/neuron_layer.cpp
index 1b8fcecd482..3343b26cfc5 100644
--- a/src/caffe/layers/neuron_layer.cpp
+++ b/src/caffe/layers/neuron_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/pooling_layer.cpp b/src/caffe/layers/pooling_layer.cpp
index 75a74dac9ec..30657b6c804 100644
--- a/src/caffe/layers/pooling_layer.cpp
+++ b/src/caffe/layers/pooling_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/pooling_layer.cu b/src/caffe/layers/pooling_layer.cu
index 6f3a7205091..58f1997c38e 100644
--- a/src/caffe/layers/pooling_layer.cu
+++ b/src/caffe/layers/pooling_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/power_layer.cpp b/src/caffe/layers/power_layer.cpp
index 86cb3d76291..8b5d8d16bd4 100644
--- a/src/caffe/layers/power_layer.cpp
+++ b/src/caffe/layers/power_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/power_layer.cu b/src/caffe/layers/power_layer.cu
index db88fee8f3b..0950b78b4ce 100644
--- a/src/caffe/layers/power_layer.cu
+++ b/src/caffe/layers/power_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/relu_layer.cpp b/src/caffe/layers/relu_layer.cpp
index b94086df98c..fca10a5aad3 100644
--- a/src/caffe/layers/relu_layer.cpp
+++ b/src/caffe/layers/relu_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/relu_layer.cu b/src/caffe/layers/relu_layer.cu
index e0d6aa1b5c3..a74428bfce1 100644
--- a/src/caffe/layers/relu_layer.cu
+++ b/src/caffe/layers/relu_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp
index 2bf931d004b..24ab6a85c6a 100644
--- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp
+++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu
index 698ec1dbde1..0e4dab76b79 100644
--- a/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu
+++ b/src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/sigmoid_layer.cpp b/src/caffe/layers/sigmoid_layer.cpp
index e25db04c42a..0f8b582da2f 100644
--- a/src/caffe/layers/sigmoid_layer.cpp
+++ b/src/caffe/layers/sigmoid_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/sigmoid_layer.cu b/src/caffe/layers/sigmoid_layer.cu
index 28cc7f1daa6..039796e1b22 100644
--- a/src/caffe/layers/sigmoid_layer.cu
+++ b/src/caffe/layers/sigmoid_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/slice_layer.cpp b/src/caffe/layers/slice_layer.cpp
index fc86a2d4307..e182837c3aa 100644
--- a/src/caffe/layers/slice_layer.cpp
+++ b/src/caffe/layers/slice_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/slice_layer.cu b/src/caffe/layers/slice_layer.cu
index 70702148f5d..8e01131ec01 100644
--- a/src/caffe/layers/slice_layer.cu
+++ b/src/caffe/layers/slice_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/softmax_layer.cpp b/src/caffe/layers/softmax_layer.cpp
index 6a98b320208..61990ed9d97 100644
--- a/src/caffe/layers/softmax_layer.cpp
+++ b/src/caffe/layers/softmax_layer.cpp
@@ -1,4 +1,3 @@
-// Copyright 2014 BVLC and contributors.
//
#include
#include
diff --git a/src/caffe/layers/softmax_layer.cu b/src/caffe/layers/softmax_layer.cu
index 6d65fbce957..65b0e229d1a 100644
--- a/src/caffe/layers/softmax_layer.cu
+++ b/src/caffe/layers/softmax_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/softmax_loss_layer.cpp b/src/caffe/layers/softmax_loss_layer.cpp
index 43e8fcac44c..98cf14c4a28 100644
--- a/src/caffe/layers/softmax_loss_layer.cpp
+++ b/src/caffe/layers/softmax_loss_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/softmax_loss_layer.cu b/src/caffe/layers/softmax_loss_layer.cu
index f55b8c7adf3..32f3e670f48 100644
--- a/src/caffe/layers/softmax_loss_layer.cu
+++ b/src/caffe/layers/softmax_loss_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
#include
diff --git a/src/caffe/layers/split_layer.cpp b/src/caffe/layers/split_layer.cpp
index d13b8d12358..2786d3f7694 100644
--- a/src/caffe/layers/split_layer.cpp
+++ b/src/caffe/layers/split_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/split_layer.cu b/src/caffe/layers/split_layer.cu
index a89c5d61883..1cf15a79314 100644
--- a/src/caffe/layers/split_layer.cu
+++ b/src/caffe/layers/split_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/tanh_layer.cpp b/src/caffe/layers/tanh_layer.cpp
index 0a6ec68d1f9..0c8be3fac60 100644
--- a/src/caffe/layers/tanh_layer.cpp
+++ b/src/caffe/layers/tanh_layer.cpp
@@ -1,4 +1,3 @@
-// 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 9307cab2ec5..b3daad1e638 100644
--- a/src/caffe/layers/tanh_layer.cu
+++ b/src/caffe/layers/tanh_layer.cu
@@ -1,4 +1,3 @@
-// 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/threshold_layer.cpp b/src/caffe/layers/threshold_layer.cpp
index 2c8546c957a..c932356019b 100644
--- a/src/caffe/layers/threshold_layer.cpp
+++ b/src/caffe/layers/threshold_layer.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include "caffe/layer.hpp"
diff --git a/src/caffe/layers/threshold_layer.cu b/src/caffe/layers/threshold_layer.cu
index fb973b2ba82..398d56e8765 100644
--- a/src/caffe/layers/threshold_layer.cu
+++ b/src/caffe/layers/threshold_layer.cu
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include
#include
diff --git a/src/caffe/layers/window_data_layer.cpp b/src/caffe/layers/window_data_layer.cpp
index cbd269685ce..ddff5555417 100644
--- a/src/caffe/layers/window_data_layer.cpp
+++ b/src/caffe/layers/window_data_layer.cpp
@@ -1,4 +1,3 @@
-// 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 5efcc3f4adc..6e8fa8b349a 100644
--- a/src/caffe/layers/window_data_layer.cu
+++ b/src/caffe/layers/window_data_layer.cu
@@ -1,4 +1,3 @@
-// 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 6fab0e3a6b4..db6b4ffefc4 100644
--- a/src/caffe/net.cpp
+++ b/src/caffe/net.cpp
@@ -1,5 +1,3 @@
-// Copyright 2014 BVLC and contributors.
-
#include