From 9410e93480f232e9bcce052414b268d8b8b6af3a Mon Sep 17 00:00:00 2001 From: Evan Shelhamer Date: Wed, 6 Aug 2014 00:16:36 -0700 Subject: [PATCH 1/4] clarify the license and copyright terms of the project As has been the case, contributions are copyright their respective contributors and the project is BSD-2 licensed. By contributing to the project, contributors release their contributions under these copyright and license terms as declared in LICENSE. --- CONTRIBUTORS.md | 2 ++ LICENSE | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) 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. From b97b88f0c2b7e32ab9e17d4325ef6bc4251c0cc8 Mon Sep 17 00:00:00 2001 From: Evan Shelhamer Date: Wed, 6 Aug 2014 00:43:17 -0700 Subject: [PATCH 2/4] LICENSE governs the whole project so strip file headers --- examples/cifar10/convert_cifar_data.cpp | 1 - examples/mnist/convert_mnist_data.cpp | 1 - include/caffe/blob.hpp | 2 -- include/caffe/caffe.hpp | 1 - include/caffe/common.hpp | 2 -- include/caffe/common_layers.hpp | 2 -- include/caffe/data_layers.hpp | 2 -- include/caffe/filler.hpp | 2 -- include/caffe/internal_thread.hpp | 4 +--- include/caffe/layer.hpp | 2 -- include/caffe/loss_layers.hpp | 2 -- include/caffe/net.hpp | 2 -- include/caffe/neuron_layers.hpp | 6 ++---- include/caffe/solver.hpp | 2 -- include/caffe/syncedmem.hpp | 2 -- include/caffe/test/test_caffe_main.hpp | 2 -- include/caffe/test/test_gradient_check_util.hpp | 2 -- include/caffe/util/benchmark.hpp | 2 -- include/caffe/util/device_alternate.hpp | 2 -- include/caffe/util/im2col.hpp | 2 -- include/caffe/util/insert_splits.hpp | 2 -- include/caffe/util/io.hpp | 2 -- include/caffe/util/math_functions.hpp | 2 -- include/caffe/util/mkl_alternate.hpp | 2 -- include/caffe/util/rng.hpp | 2 -- include/caffe/util/upgrade_proto.hpp | 2 -- include/caffe/vision_layers.hpp | 2 -- matlab/caffe/matcaffe.cpp | 1 - python/caffe/_caffe.cpp | 1 - src/caffe/blob.cpp | 2 -- src/caffe/common.cpp | 2 -- src/caffe/layer_factory.cpp | 2 -- src/caffe/layers/accuracy_layer.cpp | 2 -- src/caffe/layers/argmax_layer.cpp | 2 -- src/caffe/layers/bnll_layer.cpp | 2 -- src/caffe/layers/bnll_layer.cu | 2 -- src/caffe/layers/concat_layer.cpp | 2 -- src/caffe/layers/concat_layer.cu | 2 -- src/caffe/layers/conv_layer.cpp | 2 -- src/caffe/layers/conv_layer.cu | 2 -- src/caffe/layers/data_layer.cpp | 2 -- src/caffe/layers/data_layer.cu | 2 -- src/caffe/layers/dropout_layer.cpp | 2 -- src/caffe/layers/dropout_layer.cu | 2 -- src/caffe/layers/dummy_data_layer.cpp | 2 -- src/caffe/layers/eltwise_layer.cpp | 2 -- src/caffe/layers/eltwise_layer.cu | 2 -- src/caffe/layers/euclidean_loss_layer.cpp | 2 -- src/caffe/layers/euclidean_loss_layer.cu | 2 -- src/caffe/layers/flatten_layer.cpp | 2 -- src/caffe/layers/flatten_layer.cu | 2 -- src/caffe/layers/hdf5_data_layer.cpp | 1 - src/caffe/layers/hdf5_data_layer.cu | 1 - src/caffe/layers/hdf5_output_layer.cpp | 2 -- src/caffe/layers/hdf5_output_layer.cu | 2 -- src/caffe/layers/hinge_loss_layer.cpp | 2 -- src/caffe/layers/im2col_layer.cpp | 2 -- src/caffe/layers/im2col_layer.cu | 2 -- src/caffe/layers/image_data_layer.cpp | 2 -- src/caffe/layers/image_data_layer.cu | 2 -- src/caffe/layers/infogain_loss_layer.cpp | 2 -- src/caffe/layers/inner_product_layer.cpp | 2 -- src/caffe/layers/inner_product_layer.cu | 2 -- src/caffe/layers/loss_layer.cpp | 2 -- src/caffe/layers/lrn_layer.cpp | 2 -- src/caffe/layers/lrn_layer.cu | 2 -- src/caffe/layers/memory_data_layer.cpp | 2 -- src/caffe/layers/multinomial_logistic_loss_layer.cpp | 2 -- src/caffe/layers/neuron_layer.cpp | 2 -- src/caffe/layers/pooling_layer.cpp | 2 -- src/caffe/layers/pooling_layer.cu | 2 -- src/caffe/layers/power_layer.cpp | 2 -- src/caffe/layers/power_layer.cu | 2 -- src/caffe/layers/relu_layer.cpp | 2 -- src/caffe/layers/relu_layer.cu | 2 -- src/caffe/layers/sigmoid_cross_entropy_loss_layer.cpp | 2 -- src/caffe/layers/sigmoid_cross_entropy_loss_layer.cu | 2 -- src/caffe/layers/sigmoid_layer.cpp | 2 -- src/caffe/layers/sigmoid_layer.cu | 2 -- src/caffe/layers/slice_layer.cpp | 2 -- src/caffe/layers/slice_layer.cu | 2 -- src/caffe/layers/softmax_layer.cpp | 1 - src/caffe/layers/softmax_layer.cu | 2 -- src/caffe/layers/softmax_loss_layer.cpp | 2 -- src/caffe/layers/softmax_loss_layer.cu | 2 -- src/caffe/layers/split_layer.cpp | 2 -- src/caffe/layers/split_layer.cu | 2 -- src/caffe/layers/tanh_layer.cpp | 1 - src/caffe/layers/tanh_layer.cu | 1 - src/caffe/layers/threshold_layer.cpp | 2 -- src/caffe/layers/threshold_layer.cu | 2 -- src/caffe/layers/window_data_layer.cpp | 1 - src/caffe/layers/window_data_layer.cu | 1 - src/caffe/net.cpp | 2 -- src/caffe/proto/caffe.proto | 2 -- src/caffe/proto/caffe_pretty_print.proto | 2 -- src/caffe/solver.cpp | 2 -- src/caffe/syncedmem.cpp | 2 -- src/caffe/test/test_accuracy_layer.cpp | 2 -- src/caffe/test/test_argmax_layer.cpp | 2 -- src/caffe/test/test_benchmark.cpp | 2 -- src/caffe/test/test_blob.cpp | 2 -- src/caffe/test/test_caffe_main.cpp | 2 -- src/caffe/test/test_common.cpp | 2 -- src/caffe/test/test_concat_layer.cpp | 2 -- src/caffe/test/test_convolution_layer.cpp | 2 -- src/caffe/test/test_data_layer.cpp | 2 -- src/caffe/test/test_dummy_data_layer.cpp | 2 -- src/caffe/test/test_eltwise_layer.cpp | 2 -- src/caffe/test/test_euclidean_loss_layer.cpp | 2 -- src/caffe/test/test_filler.cpp | 2 -- src/caffe/test/test_flatten_layer.cpp | 2 -- src/caffe/test/test_hdf5_output_layer.cpp | 2 -- src/caffe/test/test_hdf5data_layer.cpp | 2 -- src/caffe/test/test_hinge_loss_layer.cpp | 2 -- src/caffe/test/test_im2col_kernel.cu | 2 -- src/caffe/test/test_im2col_layer.cpp | 2 -- src/caffe/test/test_image_data_layer.cpp | 2 -- src/caffe/test/test_infogain_loss_layer.cpp | 2 -- src/caffe/test/test_inner_product_layer.cpp | 2 -- src/caffe/test/test_lrn_layer.cpp | 2 -- src/caffe/test/test_math_functions.cpp | 2 -- src/caffe/test/test_maxpool_dropout_layers.cpp | 2 -- src/caffe/test/test_memory_data_layer.cpp | 2 -- src/caffe/test/test_multinomial_logistic_loss_layer.cpp | 2 -- src/caffe/test/test_net.cpp | 2 -- src/caffe/test/test_neuron_layer.cpp | 2 -- src/caffe/test/test_platform.cpp | 2 -- src/caffe/test/test_pooling_layer.cpp | 2 -- src/caffe/test/test_power_layer.cpp | 2 -- src/caffe/test/test_protobuf.cpp | 2 -- src/caffe/test/test_random_number_generator.cpp | 2 -- src/caffe/test/test_sgd_solver.cpp | 2 -- src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp | 2 -- src/caffe/test/test_slice_layer.cpp | 2 -- src/caffe/test/test_softmax_layer.cpp | 2 -- src/caffe/test/test_softmax_with_loss_layer.cpp | 2 -- src/caffe/test/test_solver.cpp | 2 -- src/caffe/test/test_split_layer.cpp | 2 -- src/caffe/test/test_stochastic_pooling.cpp | 2 -- src/caffe/test/test_syncedmem.cpp | 2 -- src/caffe/test/test_tanh_layer.cpp | 1 - src/caffe/test/test_threshold_layer.cpp | 2 -- src/caffe/test/test_upgrade_proto.cpp | 2 -- src/caffe/test/test_util_blas.cpp | 2 -- src/caffe/util/benchmark.cpp | 2 -- src/caffe/util/im2col.cpp | 2 -- src/caffe/util/im2col.cu | 2 -- src/caffe/util/insert_splits.cpp | 2 -- src/caffe/util/io.cpp | 2 -- src/caffe/util/math_functions.cpp | 2 -- src/caffe/util/math_functions.cu | 2 -- src/caffe/util/upgrade_proto.cpp | 2 -- tools/caffe.cpp | 1 - tools/compute_image_mean.cpp | 2 -- tools/convert_imageset.cpp | 1 - tools/device_query.cpp | 2 -- tools/dump_network.cpp | 2 -- tools/extract_features.cpp | 2 -- tools/finetune_net.cpp | 2 -- tools/net_speed_benchmark.cpp | 2 -- tools/test_net.cpp | 2 -- tools/train_net.cpp | 2 -- tools/upgrade_net_proto_binary.cpp | 2 -- tools/upgrade_net_proto_text.cpp | 2 -- 165 files changed, 3 insertions(+), 318 deletions(-) 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/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 #include #include diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto index 4e77863e7e6..44bfb631a22 100644 --- a/src/caffe/proto/caffe.proto +++ b/src/caffe/proto/caffe.proto @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - syntax = "proto2"; package caffe; diff --git a/src/caffe/proto/caffe_pretty_print.proto b/src/caffe/proto/caffe_pretty_print.proto index f34988c9645..225138a4274 100644 --- a/src/caffe/proto/caffe_pretty_print.proto +++ b/src/caffe/proto/caffe_pretty_print.proto @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - syntax = "proto2"; package caffe; diff --git a/src/caffe/solver.cpp b/src/caffe/solver.cpp index 6049ddfec7c..d96d03942f3 100644 --- a/src/caffe/solver.cpp +++ b/src/caffe/solver.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/syncedmem.cpp b/src/caffe/syncedmem.cpp index 844f639e013..7d25183701d 100644 --- a/src/caffe/syncedmem.cpp +++ b/src/caffe/syncedmem.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include "caffe/common.hpp" diff --git a/src/caffe/test/test_accuracy_layer.cpp b/src/caffe/test/test_accuracy_layer.cpp index 95217df3f1f..e11e3f2a981 100644 --- a/src/caffe/test/test_accuracy_layer.cpp +++ b/src/caffe/test/test_accuracy_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_argmax_layer.cpp b/src/caffe/test/test_argmax_layer.cpp index 3f55edaac22..fb3951c3098 100644 --- a/src/caffe/test/test_argmax_layer.cpp +++ b/src/caffe/test/test_argmax_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_benchmark.cpp b/src/caffe/test/test_benchmark.cpp index e6d9ebf9a05..dbbee08d667 100644 --- a/src/caffe/test/test_benchmark.cpp +++ b/src/caffe/test/test_benchmark.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include // for usleep #include "gtest/gtest.h" diff --git a/src/caffe/test/test_blob.cpp b/src/caffe/test/test_blob.cpp index 89f4a161c9c..adf7a4d38e9 100644 --- a/src/caffe/test/test_blob.cpp +++ b/src/caffe/test/test_blob.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include "gtest/gtest.h" diff --git a/src/caffe/test/test_caffe_main.cpp b/src/caffe/test/test_caffe_main.cpp index bb5e6b46afb..df188fd319b 100644 --- a/src/caffe/test/test_caffe_main.cpp +++ b/src/caffe/test/test_caffe_main.cpp @@ -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. diff --git a/src/caffe/test/test_common.cpp b/src/caffe/test/test_common.cpp index 455f5d8a32d..0b3639c7706 100644 --- a/src/caffe/test/test_common.cpp +++ b/src/caffe/test/test_common.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include "gtest/gtest.h" diff --git a/src/caffe/test/test_concat_layer.cpp b/src/caffe/test/test_concat_layer.cpp index b07c5727a79..c60b7f744cc 100644 --- a/src/caffe/test/test_concat_layer.cpp +++ b/src/caffe/test/test_concat_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_convolution_layer.cpp b/src/caffe/test/test_convolution_layer.cpp index 41951cfb940..5a7ea80467e 100644 --- a/src/caffe/test/test_convolution_layer.cpp +++ b/src/caffe/test/test_convolution_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_data_layer.cpp b/src/caffe/test/test_data_layer.cpp index be478b2746c..208beed91d1 100644 --- a/src/caffe/test/test_data_layer.cpp +++ b/src/caffe/test/test_data_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_dummy_data_layer.cpp b/src/caffe/test/test_dummy_data_layer.cpp index aa6cc55364e..4188bb68c9e 100644 --- a/src/caffe/test/test_dummy_data_layer.cpp +++ b/src/caffe/test/test_dummy_data_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_eltwise_layer.cpp b/src/caffe/test/test_eltwise_layer.cpp index fe3269bb3a2..4c17dfd341c 100644 --- a/src/caffe/test/test_eltwise_layer.cpp +++ b/src/caffe/test/test_eltwise_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include "gtest/gtest.h" diff --git a/src/caffe/test/test_euclidean_loss_layer.cpp b/src/caffe/test/test_euclidean_loss_layer.cpp index 6dd631e55e8..511d38ccab5 100644 --- a/src/caffe/test/test_euclidean_loss_layer.cpp +++ b/src/caffe/test/test_euclidean_loss_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_filler.cpp b/src/caffe/test/test_filler.cpp index d0d750fff47..e04b0fd22af 100644 --- a/src/caffe/test/test_filler.cpp +++ b/src/caffe/test/test_filler.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include "gtest/gtest.h" diff --git a/src/caffe/test/test_flatten_layer.cpp b/src/caffe/test/test_flatten_layer.cpp index 928db849296..cbd01f245f2 100644 --- a/src/caffe/test/test_flatten_layer.cpp +++ b/src/caffe/test/test_flatten_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_hdf5_output_layer.cpp b/src/caffe/test/test_hdf5_output_layer.cpp index a36a8cbd9a8..696165cdaa2 100644 --- a/src/caffe/test/test_hdf5_output_layer.cpp +++ b/src/caffe/test/test_hdf5_output_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp index 1f3bf9f3cd0..f903afb736f 100644 --- a/src/caffe/test/test_hdf5data_layer.cpp +++ b/src/caffe/test/test_hdf5data_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_hinge_loss_layer.cpp b/src/caffe/test/test_hinge_loss_layer.cpp index c6be1d73262..8f6f6f78cf1 100644 --- a/src/caffe/test/test_hinge_loss_layer.cpp +++ b/src/caffe/test/test_hinge_loss_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_im2col_kernel.cu b/src/caffe/test/test_im2col_kernel.cu index 89008ac7e39..ee684c00255 100644 --- a/src/caffe/test/test_im2col_kernel.cu +++ b/src/caffe/test/test_im2col_kernel.cu @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_im2col_layer.cpp b/src/caffe/test/test_im2col_layer.cpp index 6884b059fde..32cf6369361 100644 --- a/src/caffe/test/test_im2col_layer.cpp +++ b/src/caffe/test/test_im2col_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_image_data_layer.cpp b/src/caffe/test/test_image_data_layer.cpp index bbeedb8dce5..5232c1187c1 100644 --- a/src/caffe/test/test_image_data_layer.cpp +++ b/src/caffe/test/test_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/test/test_infogain_loss_layer.cpp b/src/caffe/test/test_infogain_loss_layer.cpp index 7b3705084a5..162d0e6c589 100644 --- a/src/caffe/test/test_infogain_loss_layer.cpp +++ b/src/caffe/test/test_infogain_loss_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_inner_product_layer.cpp b/src/caffe/test/test_inner_product_layer.cpp index 31d87afc7ce..5f9729c4f90 100644 --- a/src/caffe/test/test_inner_product_layer.cpp +++ b/src/caffe/test/test_inner_product_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_lrn_layer.cpp b/src/caffe/test/test_lrn_layer.cpp index fbb03dfecb5..3bd62fd9e18 100644 --- a/src/caffe/test/test_lrn_layer.cpp +++ b/src/caffe/test/test_lrn_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_math_functions.cpp b/src/caffe/test/test_math_functions.cpp index c89ca027adf..d10e702e79a 100644 --- a/src/caffe/test/test_math_functions.cpp +++ b/src/caffe/test/test_math_functions.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include // for uint32_t & uint64_t #include #include diff --git a/src/caffe/test/test_maxpool_dropout_layers.cpp b/src/caffe/test/test_maxpool_dropout_layers.cpp index e939d0c6e11..311c7781be5 100644 --- a/src/caffe/test/test_maxpool_dropout_layers.cpp +++ b/src/caffe/test/test_maxpool_dropout_layers.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_memory_data_layer.cpp b/src/caffe/test/test_memory_data_layer.cpp index 60e75ebbc1a..f401bb0f4f2 100644 --- a/src/caffe/test/test_memory_data_layer.cpp +++ b/src/caffe/test/test_memory_data_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include "caffe/filler.hpp" diff --git a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp index 9b6bb067805..3d1037baed0 100644 --- a/src/caffe/test/test_multinomial_logistic_loss_layer.cpp +++ b/src/caffe/test/test_multinomial_logistic_loss_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_net.cpp b/src/caffe/test/test_net.cpp index 6787ba956ec..18bc9ad7838 100644 --- a/src/caffe/test/test_net.cpp +++ b/src/caffe/test/test_net.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_neuron_layer.cpp b/src/caffe/test/test_neuron_layer.cpp index 59c9b3d34f5..649f8f626d9 100644 --- a/src/caffe/test/test_neuron_layer.cpp +++ b/src/caffe/test/test_neuron_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_platform.cpp b/src/caffe/test/test_platform.cpp index a4f4b4260c4..f3513e08814 100644 --- a/src/caffe/test/test_platform.cpp +++ b/src/caffe/test/test_platform.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #ifndef CPU_ONLY #include diff --git a/src/caffe/test/test_pooling_layer.cpp b/src/caffe/test/test_pooling_layer.cpp index 4636dd773a4..5be01f77b32 100644 --- a/src/caffe/test/test_pooling_layer.cpp +++ b/src/caffe/test/test_pooling_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_power_layer.cpp b/src/caffe/test/test_power_layer.cpp index e35d539b776..0c104c20b7c 100644 --- a/src/caffe/test/test_power_layer.cpp +++ b/src/caffe/test/test_power_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_protobuf.cpp b/src/caffe/test/test_protobuf.cpp index da1a0d3f5eb..0c502d6dd36 100644 --- a/src/caffe/test/test_protobuf.cpp +++ b/src/caffe/test/test_protobuf.cpp @@ -1,5 +1,3 @@ -// 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. #include diff --git a/src/caffe/test/test_random_number_generator.cpp b/src/caffe/test/test_random_number_generator.cpp index 8e3919157af..98424c06bfc 100644 --- a/src/caffe/test/test_random_number_generator.cpp +++ b/src/caffe/test/test_random_number_generator.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_sgd_solver.cpp b/src/caffe/test/test_sgd_solver.cpp index 14dcac25e8e..1ec24b134c6 100644 --- a/src/caffe/test/test_sgd_solver.cpp +++ b/src/caffe/test/test_sgd_solver.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp index 7205ce9311b..f5716c9e9a7 100644 --- a/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp +++ b/src/caffe/test/test_sigmoid_cross_entropy_loss_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_slice_layer.cpp b/src/caffe/test/test_slice_layer.cpp index e61f3e4f2c9..ee8818781f5 100644 --- a/src/caffe/test/test_slice_layer.cpp +++ b/src/caffe/test/test_slice_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_softmax_layer.cpp b/src/caffe/test/test_softmax_layer.cpp index a305c647585..37685af6b12 100644 --- a/src/caffe/test/test_softmax_layer.cpp +++ b/src/caffe/test/test_softmax_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_softmax_with_loss_layer.cpp b/src/caffe/test/test_softmax_with_loss_layer.cpp index 2994a9117af..bd39bd4420b 100644 --- a/src/caffe/test/test_softmax_with_loss_layer.cpp +++ b/src/caffe/test/test_softmax_with_loss_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_solver.cpp b/src/caffe/test/test_solver.cpp index 133d01c5446..a7dbf77fd95 100644 --- a/src/caffe/test/test_solver.cpp +++ b/src/caffe/test/test_solver.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_split_layer.cpp b/src/caffe/test/test_split_layer.cpp index a4e5857877e..711669bacb8 100644 --- a/src/caffe/test/test_split_layer.cpp +++ b/src/caffe/test/test_split_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_stochastic_pooling.cpp b/src/caffe/test/test_stochastic_pooling.cpp index 600b909a638..4f13981bd82 100644 --- a/src/caffe/test/test_stochastic_pooling.cpp +++ b/src/caffe/test/test_stochastic_pooling.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_syncedmem.cpp b/src/caffe/test/test_syncedmem.cpp index 5ccc480112d..b658871b3ee 100644 --- a/src/caffe/test/test_syncedmem.cpp +++ b/src/caffe/test/test_syncedmem.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/test/test_tanh_layer.cpp b/src/caffe/test/test_tanh_layer.cpp index 1dac5a57043..9b8e745b8a7 100644 --- a/src/caffe/test/test_tanh_layer.cpp +++ b/src/caffe/test/test_tanh_layer.cpp @@ -1,4 +1,3 @@ -// Copyright 2014 BVLC and contributors. // Adapted from other test files #include diff --git a/src/caffe/test/test_threshold_layer.cpp b/src/caffe/test/test_threshold_layer.cpp index b06d697ab0b..32dfbeeac92 100644 --- a/src/caffe/test/test_threshold_layer.cpp +++ b/src/caffe/test/test_threshold_layer.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include "gtest/gtest.h" diff --git a/src/caffe/test/test_upgrade_proto.cpp b/src/caffe/test/test_upgrade_proto.cpp index a16b835f864..2abcadc0862 100644 --- a/src/caffe/test/test_upgrade_proto.cpp +++ b/src/caffe/test/test_upgrade_proto.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/test/test_util_blas.cpp b/src/caffe/test/test_util_blas.cpp index 841edefc66c..8770f309951 100644 --- a/src/caffe/test/test_util_blas.cpp +++ b/src/caffe/test/test_util_blas.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #ifndef CPU_ONLY // CPU-GPU test #include diff --git a/src/caffe/util/benchmark.cpp b/src/caffe/util/benchmark.cpp index 009b118a35a..566d06a8f5f 100644 --- a/src/caffe/util/benchmark.cpp +++ b/src/caffe/util/benchmark.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include "caffe/common.hpp" diff --git a/src/caffe/util/im2col.cpp b/src/caffe/util/im2col.cpp index 01df8c89182..c48f31f35d4 100644 --- a/src/caffe/util/im2col.cpp +++ b/src/caffe/util/im2col.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/util/im2col.cu b/src/caffe/util/im2col.cu index 653ce49e7f8..c90f93eb67b 100644 --- a/src/caffe/util/im2col.cu +++ b/src/caffe/util/im2col.cu @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/util/insert_splits.cpp b/src/caffe/util/insert_splits.cpp index b88b320ff3d..270568cb5dc 100644 --- a/src/caffe/util/insert_splits.cpp +++ b/src/caffe/util/insert_splits.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/util/io.cpp b/src/caffe/util/io.cpp index 575ea3d63c2..fd7454d4f98 100644 --- a/src/caffe/util/io.cpp +++ b/src/caffe/util/io.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/src/caffe/util/math_functions.cpp b/src/caffe/util/math_functions.cpp index 2fdcf91b34b..974adf55e7d 100644 --- a/src/caffe/util/math_functions.cpp +++ b/src/caffe/util/math_functions.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include diff --git a/src/caffe/util/math_functions.cu b/src/caffe/util/math_functions.cu index 1e934931462..cec051e6bef 100644 --- a/src/caffe/util/math_functions.cu +++ b/src/caffe/util/math_functions.cu @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include // CUDA's, not caffe's, for fabs, signbit #include #include // thrust::plus diff --git a/src/caffe/util/upgrade_proto.cpp b/src/caffe/util/upgrade_proto.cpp index a6e9c404df7..5415ca83b60 100644 --- a/src/caffe/util/upgrade_proto.cpp +++ b/src/caffe/util/upgrade_proto.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/tools/caffe.cpp b/tools/caffe.cpp index ec414298ea4..ee12bca8c36 100644 --- a/tools/caffe.cpp +++ b/tools/caffe.cpp @@ -1,4 +1,3 @@ -// Copyright 2014 BVLC and contributors. #include #include diff --git a/tools/compute_image_mean.cpp b/tools/compute_image_mean.cpp index 79bfdc7c4bb..fe3497fa87d 100644 --- a/tools/compute_image_mean.cpp +++ b/tools/compute_image_mean.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include #include #include diff --git a/tools/convert_imageset.cpp b/tools/convert_imageset.cpp index 21ff0d38104..0ddafa0c5fe 100644 --- a/tools/convert_imageset.cpp +++ b/tools/convert_imageset.cpp @@ -1,4 +1,3 @@ -// Copyright 2014 BVLC and contributors. // This program converts a set of images to a leveldb by storing them as Datum // proto buffers. // Usage: diff --git a/tools/device_query.cpp b/tools/device_query.cpp index efdbbbbc90e..2678154cbb4 100644 --- a/tools/device_query.cpp +++ b/tools/device_query.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include "caffe/common.hpp" int main(int argc, char** argv) { diff --git a/tools/dump_network.cpp b/tools/dump_network.cpp index 8984016916a..90895fdc969 100644 --- a/tools/dump_network.cpp +++ b/tools/dump_network.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. -// // This program takes in a trained network and an input blob, and then dumps // all the intermediate blobs produced by the net to individual binary // files stored in protobuffer binary formats. diff --git a/tools/extract_features.cpp b/tools/extract_features.cpp index 06e07fe6cba..49e8f98971c 100644 --- a/tools/extract_features.cpp +++ b/tools/extract_features.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include // for snprintf #include #include diff --git a/tools/finetune_net.cpp b/tools/finetune_net.cpp index 213ff01702a..2966de48d17 100644 --- a/tools/finetune_net.cpp +++ b/tools/finetune_net.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include "caffe/caffe.hpp" int main(int argc, char** argv) { diff --git a/tools/net_speed_benchmark.cpp b/tools/net_speed_benchmark.cpp index f520e1d7785..ff112bdff55 100644 --- a/tools/net_speed_benchmark.cpp +++ b/tools/net_speed_benchmark.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include "caffe/caffe.hpp" int main(int argc, char** argv) { diff --git a/tools/test_net.cpp b/tools/test_net.cpp index b6f827e6285..de97ab8924c 100644 --- a/tools/test_net.cpp +++ b/tools/test_net.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. -// // This is a simple script that allows one to quickly test a network whose // structure is specified by text format protocol buffers, and whose parameter // are loaded from a pre-trained network. diff --git a/tools/train_net.cpp b/tools/train_net.cpp index 08602d4a7ca..26aeb40bd05 100644 --- a/tools/train_net.cpp +++ b/tools/train_net.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. - #include "caffe/caffe.hpp" int main(int argc, char** argv) { diff --git a/tools/upgrade_net_proto_binary.cpp b/tools/upgrade_net_proto_binary.cpp index ed703f027cd..d7a62e32441 100644 --- a/tools/upgrade_net_proto_binary.cpp +++ b/tools/upgrade_net_proto_binary.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. -// // This is a script to upgrade "V0" network prototxts to the new format. // Usage: // upgrade_net_proto_binary v0_net_proto_file_in net_proto_file_out diff --git a/tools/upgrade_net_proto_text.cpp b/tools/upgrade_net_proto_text.cpp index d05d1ac5883..1176585b02a 100644 --- a/tools/upgrade_net_proto_text.cpp +++ b/tools/upgrade_net_proto_text.cpp @@ -1,5 +1,3 @@ -// Copyright 2014 BVLC and contributors. -// // This is a script to upgrade "V0" network prototxts to the new format. // Usage: // upgrade_net_proto_text v0_net_proto_file_in net_proto_file_out From 72effc037f60c4acdbc2f172064fc6bef6820009 Mon Sep 17 00:00:00 2001 From: Evan Shelhamer Date: Wed, 6 Aug 2014 00:34:05 -0700 Subject: [PATCH 3/4] [docs] detail attribution, license, and copyright for development --- docs/development.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) 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. From e788eae37e746c512a5618c673b04eacaa3fff6a Mon Sep 17 00:00:00 2001 From: Evan Shelhamer Date: Wed, 6 Aug 2014 00:36:00 -0700 Subject: [PATCH 4/4] lint for copyright --- scripts/cpp_lint.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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):