diff --git a/LICENSE b/LICENSE index ebd51e42629..68681ede2ee 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. -Produced at the Lawrence Livermore National Laboratory. +Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. +Produced at the Lawrence Livermore National Laboratory. Written by the LBANN Research Team (B. Van Essen, et al.) listed in the CONTRIBUTORS file. @@ -8,7 +8,7 @@ All rights reserved. This file is part of LBANN: Livermore Big Artificial Neural Network Toolkit. For details, see http://software.llnl.gov/LBANN or -https://github.com/LLNL/LBANN. +https://github.com/LLNL/LBANN. Licensed under the Apache License, Version 2.0 (the "Licensee"); you may not use this file except in compliance with the License. You may @@ -21,4 +21,3 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the license. - diff --git a/external/TBinf/TBinf.cpp b/external/TBinf/TBinf.cpp index a46400455ec..b92141f9bc5 100644 --- a/external/TBinf/TBinf.cpp +++ b/external/TBinf/TBinf.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/external/TBinf/TBinf.hpp b/external/TBinf/TBinf.hpp index 30e052ebf06..0a11937da71 100644 --- a/external/TBinf/TBinf.hpp +++ b/external/TBinf/TBinf.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/Elemental_extensions.hpp b/include/lbann/Elemental_extensions.hpp index 49405b4486a..6ebc61b0e33 100644 --- a/include/lbann/Elemental_extensions.hpp +++ b/include/lbann/Elemental_extensions.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/base.hpp b/include/lbann/base.hpp index 4c74245a519..a4baa63c443 100644 --- a/include/lbann/base.hpp +++ b/include/lbann/base.hpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////xecu -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback.hpp b/include/lbann/callbacks/callback.hpp index 32d64d903e2..fae45448bb8 100644 --- a/include/lbann/callbacks/callback.hpp +++ b/include/lbann/callbacks/callback.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_check_dataset.hpp b/include/lbann/callbacks/callback_check_dataset.hpp index eb5fd95b4d5..09ce25d723f 100644 --- a/include/lbann/callbacks/callback_check_dataset.hpp +++ b/include/lbann/callbacks/callback_check_dataset.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_check_gradients.hpp b/include/lbann/callbacks/callback_check_gradients.hpp index 721625881e4..8433a00d5f1 100644 --- a/include/lbann/callbacks/callback_check_gradients.hpp +++ b/include/lbann/callbacks/callback_check_gradients.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_check_init.hpp b/include/lbann/callbacks/callback_check_init.hpp index b0f777eb6e7..6d5572379fb 100644 --- a/include/lbann/callbacks/callback_check_init.hpp +++ b/include/lbann/callbacks/callback_check_init.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_check_metric.hpp b/include/lbann/callbacks/callback_check_metric.hpp index 754dcf1afe7..8b094c8c395 100644 --- a/include/lbann/callbacks/callback_check_metric.hpp +++ b/include/lbann/callbacks/callback_check_metric.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_checknan.hpp b/include/lbann/callbacks/callback_checknan.hpp index fff437fecdf..c45a7eee95c 100644 --- a/include/lbann/callbacks/callback_checknan.hpp +++ b/include/lbann/callbacks/callback_checknan.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_checkpoint.hpp b/include/lbann/callbacks/callback_checkpoint.hpp index 5156d18ffd1..ebeacdeaa7e 100644 --- a/include/lbann/callbacks/callback_checkpoint.hpp +++ b/include/lbann/callbacks/callback_checkpoint.hpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_checksmall.hpp b/include/lbann/callbacks/callback_checksmall.hpp index ca52709357b..2f66a04d2d9 100644 --- a/include/lbann/callbacks/callback_checksmall.hpp +++ b/include/lbann/callbacks/callback_checksmall.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_confusion_matrix.hpp b/include/lbann/callbacks/callback_confusion_matrix.hpp index 0f575caf547..b87dc8b24a0 100644 --- a/include/lbann/callbacks/callback_confusion_matrix.hpp +++ b/include/lbann/callbacks/callback_confusion_matrix.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_debug.hpp b/include/lbann/callbacks/callback_debug.hpp index 7f05cbe408e..c342c7ad778 100644 --- a/include/lbann/callbacks/callback_debug.hpp +++ b/include/lbann/callbacks/callback_debug.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_debug_io.hpp b/include/lbann/callbacks/callback_debug_io.hpp index c7dfe7c05b8..ffaff0af567 100644 --- a/include/lbann/callbacks/callback_debug_io.hpp +++ b/include/lbann/callbacks/callback_debug_io.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_dump_error_signals.hpp b/include/lbann/callbacks/callback_dump_error_signals.hpp index 3110e0c45fa..0c5571d9597 100644 --- a/include/lbann/callbacks/callback_dump_error_signals.hpp +++ b/include/lbann/callbacks/callback_dump_error_signals.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -51,7 +51,7 @@ class lbann_callback_dump_error_signals : public lbann_callback { /** Write error signals to file after each backward prop step. */ void on_backward_prop_end(model *m, Layer *l) override; - + private: /** Basename for output files. */ std::string m_basename; diff --git a/include/lbann/callbacks/callback_dump_gradients.hpp b/include/lbann/callbacks/callback_dump_gradients.hpp index dd94981bc5f..b0a6d587446 100644 --- a/include/lbann/callbacks/callback_dump_gradients.hpp +++ b/include/lbann/callbacks/callback_dump_gradients.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_dump_minibatch_sample_indices.hpp b/include/lbann/callbacks/callback_dump_minibatch_sample_indices.hpp index bdc8eddfb68..8840b1a83c5 100644 --- a/include/lbann/callbacks/callback_dump_minibatch_sample_indices.hpp +++ b/include/lbann/callbacks/callback_dump_minibatch_sample_indices.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_dump_outputs.hpp b/include/lbann/callbacks/callback_dump_outputs.hpp index 4df49686d87..0ad260be495 100644 --- a/include/lbann/callbacks/callback_dump_outputs.hpp +++ b/include/lbann/callbacks/callback_dump_outputs.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_dump_weights.hpp b/include/lbann/callbacks/callback_dump_weights.hpp index cc84249fe87..7edb2aacc20 100644 --- a/include/lbann/callbacks/callback_dump_weights.hpp +++ b/include/lbann/callbacks/callback_dump_weights.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_early_stopping.hpp b/include/lbann/callbacks/callback_early_stopping.hpp index f196dcaad98..e02fe4d3601 100644 --- a/include/lbann/callbacks/callback_early_stopping.hpp +++ b/include/lbann/callbacks/callback_early_stopping.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_gpu_memory_usage.hpp b/include/lbann/callbacks/callback_gpu_memory_usage.hpp index ea18bf35d1d..aa890efcc87 100644 --- a/include/lbann/callbacks/callback_gpu_memory_usage.hpp +++ b/include/lbann/callbacks/callback_gpu_memory_usage.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -35,7 +35,7 @@ namespace lbann { /** Callback hooks for printing GPU memory usage. */ class lbann_callback_gpu_memory_usage : public lbann_callback { public: - + /** Constructor. */ lbann_callback_gpu_memory_usage() = default; diff --git a/include/lbann/callbacks/callback_hang.hpp b/include/lbann/callbacks/callback_hang.hpp index 1c3fcb010a2..2ec4c68b835 100644 --- a/include/lbann/callbacks/callback_hang.hpp +++ b/include/lbann/callbacks/callback_hang.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_imcomm.hpp b/include/lbann/callbacks/callback_imcomm.hpp index 39fe7054582..fb52daa2bee 100644 --- a/include/lbann/callbacks/callback_imcomm.hpp +++ b/include/lbann/callbacks/callback_imcomm.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_io.hpp b/include/lbann/callbacks/callback_io.hpp index 6f18e553963..2ed29430a05 100644 --- a/include/lbann/callbacks/callback_io.hpp +++ b/include/lbann/callbacks/callback_io.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_learning_rate.hpp b/include/lbann/callbacks/callback_learning_rate.hpp index 6d110659084..55dd090a7ea 100644 --- a/include/lbann/callbacks/callback_learning_rate.hpp +++ b/include/lbann/callbacks/callback_learning_rate.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_ltfb.hpp b/include/lbann/callbacks/callback_ltfb.hpp index f5823cd3b14..e28a717da9c 100644 --- a/include/lbann/callbacks/callback_ltfb.hpp +++ b/include/lbann/callbacks/callback_ltfb.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_perturb_adam.hpp b/include/lbann/callbacks/callback_perturb_adam.hpp index 3cd729f7aa7..6adf47dd83a 100644 --- a/include/lbann/callbacks/callback_perturb_adam.hpp +++ b/include/lbann/callbacks/callback_perturb_adam.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_print.hpp b/include/lbann/callbacks/callback_print.hpp index 4ca9f8cd5b4..53c77d2a7a1 100644 --- a/include/lbann/callbacks/callback_print.hpp +++ b/include/lbann/callbacks/callback_print.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -39,7 +39,7 @@ namespace lbann { */ class lbann_callback_print : public lbann_callback { public: - lbann_callback_print(int batch_interval = 1, bool print_global_stat_only=false) : + lbann_callback_print(int batch_interval = 1, bool print_global_stat_only=false) : lbann_callback(batch_interval), m_print_global_stat_only(print_global_stat_only) {} lbann_callback_print(const lbann_callback_print&) = default; lbann_callback_print& operator=(const lbann_callback_print&) = default; diff --git a/include/lbann/callbacks/callback_replace_weights.hpp b/include/lbann/callbacks/callback_replace_weights.hpp index a90713716e2..62bf033792c 100644 --- a/include/lbann/callbacks/callback_replace_weights.hpp +++ b/include/lbann/callbacks/callback_replace_weights.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -36,13 +36,13 @@ namespace lbann { /** * Weights/parameters replacement on k-batch end - * Currently support replacing weights/parameters using layer names + * Currently support replacing weights/parameters using layer names * Can easily be extended to support replacement by weights name - * Given two layers specified in prototext, weights are copied from source layer to destination layer. + * Given two layers specified in prototext, weights are copied from source layer to destination layer. */ class lbann_callback_replace_weights : public lbann_callback { public: - lbann_callback_replace_weights(std::vector src, + lbann_callback_replace_weights(std::vector src, std::vector dst, int batch_interval=1) : lbann_callback(batch_interval), m_src_layers(std::move(src)), @@ -50,7 +50,7 @@ class lbann_callback_replace_weights : public lbann_callback { if(m_src_layers.size() != m_dst_layers.size()) throw lbann_exception("In replace weights callback: number of src and dest layers does not match."); } - + lbann_callback_replace_weights( const lbann_callback_replace_weights&) = default; lbann_callback_replace_weights& operator=( @@ -59,7 +59,7 @@ class lbann_callback_replace_weights : public lbann_callback { return new lbann_callback_replace_weights(*this); } void on_batch_end(model *m) override; - + std::string name() const override { return "replace weights"; } private: std::vector m_src_layers, m_dst_layers; diff --git a/include/lbann/callbacks/callback_save_images.hpp b/include/lbann/callbacks/callback_save_images.hpp index 4f935f0ea5f..72d870f3fc1 100644 --- a/include/lbann/callbacks/callback_save_images.hpp +++ b/include/lbann/callbacks/callback_save_images.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_save_model.hpp b/include/lbann/callbacks/callback_save_model.hpp index 8e6d8b6cfea..aeeae47415a 100644 --- a/include/lbann/callbacks/callback_save_model.hpp +++ b/include/lbann/callbacks/callback_save_model.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_summary.hpp b/include/lbann/callbacks/callback_summary.hpp index beb5183f9af..15294ac240d 100644 --- a/include/lbann/callbacks/callback_summary.hpp +++ b/include/lbann/callbacks/callback_summary.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_sync_layers.hpp b/include/lbann/callbacks/callback_sync_layers.hpp index 0edf8b416c4..2c9d4984fa8 100644 --- a/include/lbann/callbacks/callback_sync_layers.hpp +++ b/include/lbann/callbacks/callback_sync_layers.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -63,7 +63,7 @@ class lbann_callback_sync_layers : public lbann_callback { void on_forward_prop_end(model *m, Layer *l) override; void on_backward_prop_end(model *m, Layer *l) override; - + protected: /** Whether to synchronize GPUs. */ bool m_sync_gpus; diff --git a/include/lbann/callbacks/callback_sync_selected.hpp b/include/lbann/callbacks/callback_sync_selected.hpp index 34cecaf960f..53cda7e8b3f 100644 --- a/include/lbann/callbacks/callback_sync_selected.hpp +++ b/include/lbann/callbacks/callback_sync_selected.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_timeline.hpp b/include/lbann/callbacks/callback_timeline.hpp index 9201b51c384..8bf84dd787d 100644 --- a/include/lbann/callbacks/callback_timeline.hpp +++ b/include/lbann/callbacks/callback_timeline.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_timer.hpp b/include/lbann/callbacks/callback_timer.hpp index 2dec66c762c..a53243e7a3f 100644 --- a/include/lbann/callbacks/callback_timer.hpp +++ b/include/lbann/callbacks/callback_timer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/callback_variable_minibatch.hpp b/include/lbann/callbacks/callback_variable_minibatch.hpp index 9ae789c77c9..44d8c62f766 100644 --- a/include/lbann/callbacks/callback_variable_minibatch.hpp +++ b/include/lbann/callbacks/callback_variable_minibatch.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/callbacks/profiler.hpp b/include/lbann/callbacks/profiler.hpp index 4454e19cf3e..abedbaaa428 100644 --- a/include/lbann/callbacks/profiler.hpp +++ b/include/lbann/callbacks/profiler.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/comm.hpp b/include/lbann/comm.hpp index 799388787f6..2ab72fe1273 100644 --- a/include/lbann/comm.hpp +++ b/include/lbann/comm.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/compound_data_reader.hpp b/include/lbann/data_readers/compound_data_reader.hpp index 0a62527e973..e23d24c1f04 100644 --- a/include/lbann/data_readers/compound_data_reader.hpp +++ b/include/lbann/data_readers/compound_data_reader.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_augmenter.hpp b/include/lbann/data_readers/cv_augmenter.hpp index cf779bf4631..ba584ab18fe 100644 --- a/include/lbann/data_readers/cv_augmenter.hpp +++ b/include/lbann/data_readers/cv_augmenter.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_colorizer.hpp b/include/lbann/data_readers/cv_colorizer.hpp index b342ad082a5..7d667f9cca5 100644 --- a/include/lbann/data_readers/cv_colorizer.hpp +++ b/include/lbann/data_readers/cv_colorizer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_cropper.hpp b/include/lbann/data_readers/cv_cropper.hpp index 25a25f0c7ba..651e7945d5b 100644 --- a/include/lbann/data_readers/cv_cropper.hpp +++ b/include/lbann/data_readers/cv_cropper.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_decolorizer.hpp b/include/lbann/data_readers/cv_decolorizer.hpp index 62f7c9dc45a..18e09aea0cf 100644 --- a/include/lbann/data_readers/cv_decolorizer.hpp +++ b/include/lbann/data_readers/cv_decolorizer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_mean_extractor.hpp b/include/lbann/data_readers/cv_mean_extractor.hpp index f0e37d1c79b..eef53a0afa5 100644 --- a/include/lbann/data_readers/cv_mean_extractor.hpp +++ b/include/lbann/data_readers/cv_mean_extractor.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_normalizer.hpp b/include/lbann/data_readers/cv_normalizer.hpp index f5d5d00591b..dfaf2954f89 100644 --- a/include/lbann/data_readers/cv_normalizer.hpp +++ b/include/lbann/data_readers/cv_normalizer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_process.hpp b/include/lbann/data_readers/cv_process.hpp index ee49155ad2c..ffc315016a4 100644 --- a/include/lbann/data_readers/cv_process.hpp +++ b/include/lbann/data_readers/cv_process.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_process_patches.hpp b/include/lbann/data_readers/cv_process_patches.hpp index 4e38966425a..b9c52ff955a 100644 --- a/include/lbann/data_readers/cv_process_patches.hpp +++ b/include/lbann/data_readers/cv_process_patches.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_resizer.hpp b/include/lbann/data_readers/cv_resizer.hpp index 26c1f7ed2e3..69555897d2c 100644 --- a/include/lbann/data_readers/cv_resizer.hpp +++ b/include/lbann/data_readers/cv_resizer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_subtractor.hpp b/include/lbann/data_readers/cv_subtractor.hpp index b10358d7c46..169181c4576 100644 --- a/include/lbann/data_readers/cv_subtractor.hpp +++ b/include/lbann/data_readers/cv_subtractor.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_transform.hpp b/include/lbann/data_readers/cv_transform.hpp index 94e17e8d1b7..72455fc8907 100644 --- a/include/lbann/data_readers/cv_transform.hpp +++ b/include/lbann/data_readers/cv_transform.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/cv_utils.hpp b/include/lbann/data_readers/cv_utils.hpp index 0b1dc6c0d09..fdac1bc77e3 100644 --- a/include/lbann/data_readers/cv_utils.hpp +++ b/include/lbann/data_readers/cv_utils.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader.hpp b/include/lbann/data_readers/data_reader.hpp index 219fc84793f..b70c576c376 100644 --- a/include/lbann/data_readers/data_reader.hpp +++ b/include/lbann/data_readers/data_reader.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_ascii.hpp b/include/lbann/data_readers/data_reader_ascii.hpp index 7e541fe5aef..09504b49397 100644 --- a/include/lbann/data_readers/data_reader_ascii.hpp +++ b/include/lbann/data_readers/data_reader_ascii.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_cifar10.hpp b/include/lbann/data_readers/data_reader_cifar10.hpp index ef49fb07115..7c72975bf98 100644 --- a/include/lbann/data_readers/data_reader_cifar10.hpp +++ b/include/lbann/data_readers/data_reader_cifar10.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_csv.hpp b/include/lbann/data_readers/data_reader_csv.hpp index 34d5b46e8a8..58c55885c68 100644 --- a/include/lbann/data_readers/data_reader_csv.hpp +++ b/include/lbann/data_readers/data_reader_csv.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_image.hpp b/include/lbann/data_readers/data_reader_image.hpp index a7f6c1b269c..ba809f6547c 100644 --- a/include/lbann/data_readers/data_reader_image.hpp +++ b/include/lbann/data_readers/data_reader_image.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_imagenet.hpp b/include/lbann/data_readers/data_reader_imagenet.hpp index 7335c918137..4d6484e24c4 100644 --- a/include/lbann/data_readers/data_reader_imagenet.hpp +++ b/include/lbann/data_readers/data_reader_imagenet.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_imagenet_patches.hpp b/include/lbann/data_readers/data_reader_imagenet_patches.hpp index 9b37dd64019..49539429fab 100644 --- a/include/lbann/data_readers/data_reader_imagenet_patches.hpp +++ b/include/lbann/data_readers/data_reader_imagenet_patches.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_jag.hpp b/include/lbann/data_readers/data_reader_jag.hpp index d7f7eae1cc7..c10daf0c9de 100644 --- a/include/lbann/data_readers/data_reader_jag.hpp +++ b/include/lbann/data_readers/data_reader_jag.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_jag_conduit.hpp b/include/lbann/data_readers/data_reader_jag_conduit.hpp index b4c6bd22a45..0938fa79438 100644 --- a/include/lbann/data_readers/data_reader_jag_conduit.hpp +++ b/include/lbann/data_readers/data_reader_jag_conduit.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -257,7 +257,7 @@ class data_reader_jag_conduit : public generic_data_reader { protected: /// once the sample_list class and file formats are generalized and - /// finalized, it should (may?) be possible to code a single + /// finalized, it should (may?) be possible to code a single /// preload_data_store method. void preload_data_store() override; diff --git a/include/lbann/data_readers/data_reader_merge_features.hpp b/include/lbann/data_readers/data_reader_merge_features.hpp index 0bb4b5b2282..1f410c96c89 100644 --- a/include/lbann/data_readers/data_reader_merge_features.hpp +++ b/include/lbann/data_readers/data_reader_merge_features.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_merge_samples.hpp b/include/lbann/data_readers/data_reader_merge_samples.hpp index ae6ca0ce65a..c691ddffa83 100644 --- a/include/lbann/data_readers/data_reader_merge_samples.hpp +++ b/include/lbann/data_readers/data_reader_merge_samples.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_mesh.hpp b/include/lbann/data_readers/data_reader_mesh.hpp index 078fd452e39..eb1701d731f 100644 --- a/include/lbann/data_readers/data_reader_mesh.hpp +++ b/include/lbann/data_readers/data_reader_mesh.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_mnist.hpp b/include/lbann/data_readers/data_reader_mnist.hpp index 7d9f2e46781..2d3b30e0ed6 100644 --- a/include/lbann/data_readers/data_reader_mnist.hpp +++ b/include/lbann/data_readers/data_reader_mnist.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_mnist_siamese.hpp b/include/lbann/data_readers/data_reader_mnist_siamese.hpp index 3a53594eb23..4536e3cebad 100644 --- a/include/lbann/data_readers/data_reader_mnist_siamese.hpp +++ b/include/lbann/data_readers/data_reader_mnist_siamese.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_moving_mnist.hpp b/include/lbann/data_readers/data_reader_moving_mnist.hpp index c234f45ab87..034bca57880 100644 --- a/include/lbann/data_readers/data_reader_moving_mnist.hpp +++ b/include/lbann/data_readers/data_reader_moving_mnist.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_multi_images.hpp b/include/lbann/data_readers/data_reader_multi_images.hpp index d4eb3a1c2f7..93a2959bd7d 100644 --- a/include/lbann/data_readers/data_reader_multi_images.hpp +++ b/include/lbann/data_readers/data_reader_multi_images.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_multihead_siamese.hpp b/include/lbann/data_readers/data_reader_multihead_siamese.hpp index d4c2c17ffde..dc95f3cb7e8 100644 --- a/include/lbann/data_readers/data_reader_multihead_siamese.hpp +++ b/include/lbann/data_readers/data_reader_multihead_siamese.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_nci.hpp b/include/lbann/data_readers/data_reader_nci.hpp index 5e4b5cf784e..3d452e8a372 100644 --- a/include/lbann/data_readers/data_reader_nci.hpp +++ b/include/lbann/data_readers/data_reader_nci.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_numpy.hpp b/include/lbann/data_readers/data_reader_numpy.hpp index 3e2105c8291..800f9ca2727 100644 --- a/include/lbann/data_readers/data_reader_numpy.hpp +++ b/include/lbann/data_readers/data_reader_numpy.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_numpy_npz.hpp b/include/lbann/data_readers/data_reader_numpy_npz.hpp index deda0862faf..e8fb13f3bdd 100644 --- a/include/lbann/data_readers/data_reader_numpy_npz.hpp +++ b/include/lbann/data_readers/data_reader_numpy_npz.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_numpy_npz_conduit.hpp b/include/lbann/data_readers/data_reader_numpy_npz_conduit.hpp index 92184f06352..7d7cd00bf93 100644 --- a/include/lbann/data_readers/data_reader_numpy_npz_conduit.hpp +++ b/include/lbann/data_readers/data_reader_numpy_npz_conduit.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -35,7 +35,7 @@ namespace lbann { /** * Data reader for data stored in numpy (.npz) files that are encapsulated . - * in conduit::Nodes + * in conduit::Nodes */ class numpy_npz_conduit_reader : public generic_data_reader { public: @@ -100,8 +100,8 @@ namespace lbann { // from int16 to DataType. DataType m_scaling_factor_int16 = 1.0; - // fills in: m_num_samples, m_num_features, m_num_response_features, - // m_data_dims, m_data_word_size, m_response_word_size + // fills in: m_num_samples, m_num_features, m_num_response_features, + // m_data_dims, m_data_word_size, m_response_word_size void fill_in_metadata(); std::vector m_filenames; diff --git a/include/lbann/data_readers/data_reader_pilot2_molecular.hpp b/include/lbann/data_readers/data_reader_pilot2_molecular.hpp index d28b29d3923..850ca8a5bf3 100644 --- a/include/lbann/data_readers/data_reader_pilot2_molecular.hpp +++ b/include/lbann/data_readers/data_reader_pilot2_molecular.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_python.hpp b/include/lbann/data_readers/data_reader_python.hpp index bf37d3e184a..35264a18e7b 100644 --- a/include/lbann/data_readers/data_reader_python.hpp +++ b/include/lbann/data_readers/data_reader_python.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_synthetic.hpp b/include/lbann/data_readers/data_reader_synthetic.hpp index 3fba8d59355..83faee1e793 100644 --- a/include/lbann/data_readers/data_reader_synthetic.hpp +++ b/include/lbann/data_readers/data_reader_synthetic.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/data_reader_triplet.hpp b/include/lbann/data_readers/data_reader_triplet.hpp index 23786dd4c8d..a1ee9e07871 100644 --- a/include/lbann/data_readers/data_reader_triplet.hpp +++ b/include/lbann/data_readers/data_reader_triplet.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/image_preprocessor.hpp b/include/lbann/data_readers/image_preprocessor.hpp index 0252beb5939..fb730e23bf1 100644 --- a/include/lbann/data_readers/image_preprocessor.hpp +++ b/include/lbann/data_readers/image_preprocessor.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/image_utils.hpp b/include/lbann/data_readers/image_utils.hpp index 2b6c494b87e..b52a7f4cb78 100644 --- a/include/lbann/data_readers/image_utils.hpp +++ b/include/lbann/data_readers/image_utils.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/numpy_conduit_converter.hpp b/include/lbann/data_readers/numpy_conduit_converter.hpp index 5be0157380f..32317487043 100644 --- a/include/lbann/data_readers/numpy_conduit_converter.hpp +++ b/include/lbann/data_readers/numpy_conduit_converter.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -35,7 +35,7 @@ namespace lbann { /** * The numpy_conduit_converter class contains static method(s) for * reading numpy files and copying the contents to a conduit file. - * + * * In general the schema for npz files, after conversion to conduit, is: * * { @@ -49,14 +49,14 @@ namespace lbann { * "num_vals": , * "shape": <[ vector ]>, * "data": - * } - * } - * } + * } + * } + * } * * cosmoflow has the following sections: - * "data": - * "frm": - * "responses": + * "data": + * "frm": + * "responses": */ class numpy_conduit_converter { diff --git a/include/lbann/data_readers/offline_patches_npz.hpp b/include/lbann/data_readers/offline_patches_npz.hpp index 6d4c9e9065d..c433d232ced 100644 --- a/include/lbann/data_readers/offline_patches_npz.hpp +++ b/include/lbann/data_readers/offline_patches_npz.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/opencv.hpp b/include/lbann/data_readers/opencv.hpp index b48e490011a..9adc7efa0d7 100644 --- a/include/lbann/data_readers/opencv.hpp +++ b/include/lbann/data_readers/opencv.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/opencv_extensions.hpp b/include/lbann/data_readers/opencv_extensions.hpp index 60d83b580fa..b24ed360d4d 100644 --- a/include/lbann/data_readers/opencv_extensions.hpp +++ b/include/lbann/data_readers/opencv_extensions.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -126,7 +126,7 @@ inline bool check_if_cv_Mat_is_float_type(const cv::Mat& image) { inline bool check_if_cv_Mat_has_same_shape(const cv::Mat& image1, const cv::Mat& image2) { return ((image1.cols == image2.cols) && (image1.rows == image2.rows) && - (image1.channels() == image2.channels())); + (image1.channels() == image2.channels())); } template diff --git a/include/lbann/data_readers/patchworks/patchworks.hpp b/include/lbann/data_readers/patchworks/patchworks.hpp index 0077eecbeaf..d445bb2d343 100644 --- a/include/lbann/data_readers/patchworks/patchworks.hpp +++ b/include/lbann/data_readers/patchworks/patchworks.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/patchworks/patchworks_ROI.hpp b/include/lbann/data_readers/patchworks/patchworks_ROI.hpp index 3fc622dcd17..3abdfed5da6 100644 --- a/include/lbann/data_readers/patchworks/patchworks_ROI.hpp +++ b/include/lbann/data_readers/patchworks/patchworks_ROI.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/patchworks/patchworks_common.hpp b/include/lbann/data_readers/patchworks/patchworks_common.hpp index ffd2fa16cf8..5c3b9ceb7d1 100644 --- a/include/lbann/data_readers/patchworks/patchworks_common.hpp +++ b/include/lbann/data_readers/patchworks/patchworks_common.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/patchworks/patchworks_patch_descriptor.hpp b/include/lbann/data_readers/patchworks/patchworks_patch_descriptor.hpp index 8c849706696..2891055593c 100644 --- a/include/lbann/data_readers/patchworks/patchworks_patch_descriptor.hpp +++ b/include/lbann/data_readers/patchworks/patchworks_patch_descriptor.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_readers/patchworks/patchworks_stats.hpp b/include/lbann/data_readers/patchworks/patchworks_stats.hpp index d7189449237..12141012eef 100644 --- a/include/lbann/data_readers/patchworks/patchworks_stats.hpp +++ b/include/lbann/data_readers/patchworks/patchworks_stats.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/data_store/data_store_conduit.hpp b/include/lbann/data_store/data_store_conduit.hpp index e75f3e61da2..91995485d83 100644 --- a/include/lbann/data_store/data_store_conduit.hpp +++ b/include/lbann/data_store/data_store_conduit.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/detect_El_mpi.hpp b/include/lbann/detect_El_mpi.hpp index a566c16e621..d556f5f91d0 100644 --- a/include/lbann/detect_El_mpi.hpp +++ b/include/lbann/detect_El_mpi.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -84,7 +84,7 @@ struct is_instantiated_El_mpi_type< */ template struct interpret_as_byte_if_needed { - using type = El::byte; + using type = El::byte; }; /// Use type T as is if Elemental has instantiated MPI wrappers for type T. diff --git a/include/lbann/io/data_buffers/generic_io_buffer.hpp b/include/lbann/io/data_buffers/generic_io_buffer.hpp index 2f25c9526d5..1f0ebc807de 100644 --- a/include/lbann/io/data_buffers/generic_io_buffer.hpp +++ b/include/lbann/io/data_buffers/generic_io_buffer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/io/data_buffers/partitioned_io_buffer.hpp b/include/lbann/io/data_buffers/partitioned_io_buffer.hpp index a4a6619d769..13a4a23f8b2 100644 --- a/include/lbann/io/data_buffers/partitioned_io_buffer.hpp +++ b/include/lbann/io/data_buffers/partitioned_io_buffer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/io/file_io.hpp b/include/lbann/io/file_io.hpp index 2d003175f2d..b1d39c3ba11 100644 --- a/include/lbann/io/file_io.hpp +++ b/include/lbann/io/file_io.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/io/persist.hpp b/include/lbann/io/persist.hpp index f7c90472625..409dc5ddf89 100644 --- a/include/lbann/io/persist.hpp +++ b/include/lbann/io/persist.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/activations/activations.hpp b/include/lbann/layers/activations/activations.hpp index c32de2c9ca9..b36c8d61072 100644 --- a/include/lbann/layers/activations/activations.hpp +++ b/include/lbann/layers/activations/activations.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/activations/elu.hpp b/include/lbann/layers/activations/elu.hpp index 2921c5a76a9..52f797488be 100644 --- a/include/lbann/layers/activations/elu.hpp +++ b/include/lbann/layers/activations/elu.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/activations/identity.hpp b/include/lbann/layers/activations/identity.hpp index 7d5ea8b14f2..e895ba44b99 100644 --- a/include/lbann/layers/activations/identity.hpp +++ b/include/lbann/layers/activations/identity.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/activations/leaky_relu.hpp b/include/lbann/layers/activations/leaky_relu.hpp index 652158b034c..0e576117d3c 100644 --- a/include/lbann/layers/activations/leaky_relu.hpp +++ b/include/lbann/layers/activations/leaky_relu.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/activations/log_softmax.hpp b/include/lbann/layers/activations/log_softmax.hpp index b1652cea3c5..136edf89600 100644 --- a/include/lbann/layers/activations/log_softmax.hpp +++ b/include/lbann/layers/activations/log_softmax.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/activations/softmax.hpp b/include/lbann/layers/activations/softmax.hpp index 70e3f5d79ca..665323c3c14 100644 --- a/include/lbann/layers/activations/softmax.hpp +++ b/include/lbann/layers/activations/softmax.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/image/bilinear_resize.hpp b/include/lbann/layers/image/bilinear_resize.hpp index 322f0c7b51d..2e3e9e9da67 100644 --- a/include/lbann/layers/image/bilinear_resize.hpp +++ b/include/lbann/layers/image/bilinear_resize.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/io/input/generic_input_layer.hpp b/include/lbann/layers/io/input/generic_input_layer.hpp index c72ac32bdbd..3dfa79edb79 100644 --- a/include/lbann/layers/io/input/generic_input_layer.hpp +++ b/include/lbann/layers/io/input/generic_input_layer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/io/input/input_layer.hpp b/include/lbann/layers/io/input/input_layer.hpp index 0c1b8a0b8f2..e2c144684b3 100644 --- a/include/lbann/layers/io/input/input_layer.hpp +++ b/include/lbann/layers/io/input/input_layer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/io/io_layer.hpp b/include/lbann/layers/io/io_layer.hpp index 7b57606ab44..4f0b22ec529 100644 --- a/include/lbann/layers/io/io_layer.hpp +++ b/include/lbann/layers/io/io_layer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/layer.hpp b/include/lbann/layers/layer.hpp index 790c59a4c10..6ed9ecb096b 100644 --- a/include/lbann/layers/layer.hpp +++ b/include/lbann/layers/layer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/learning/base_convolution.hpp b/include/lbann/layers/learning/base_convolution.hpp index 9840f6622b1..afa3046086b 100644 --- a/include/lbann/layers/learning/base_convolution.hpp +++ b/include/lbann/layers/learning/base_convolution.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/learning/convolution.hpp b/include/lbann/layers/learning/convolution.hpp index 36debbe211a..9a7cf276a5d 100644 --- a/include/lbann/layers/learning/convolution.hpp +++ b/include/lbann/layers/learning/convolution.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/learning/deconvolution.hpp b/include/lbann/layers/learning/deconvolution.hpp index 922353cdb31..f3c1f7bdd9e 100644 --- a/include/lbann/layers/learning/deconvolution.hpp +++ b/include/lbann/layers/learning/deconvolution.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/learning/fully_connected.hpp b/include/lbann/layers/learning/fully_connected.hpp index 40da2c13035..f62c2318594 100644 --- a/include/lbann/layers/learning/fully_connected.hpp +++ b/include/lbann/layers/learning/fully_connected.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/learning/learning.hpp b/include/lbann/layers/learning/learning.hpp index 1e0996e39f0..2f2ab120bc5 100644 --- a/include/lbann/layers/learning/learning.hpp +++ b/include/lbann/layers/learning/learning.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/loss/categorical_accuracy.hpp b/include/lbann/layers/loss/categorical_accuracy.hpp index ba3e19841db..078abb6b2a4 100644 --- a/include/lbann/layers/loss/categorical_accuracy.hpp +++ b/include/lbann/layers/loss/categorical_accuracy.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/loss/cross_entropy.hpp b/include/lbann/layers/loss/cross_entropy.hpp index e3d3093ad61..e2ee89e4350 100644 --- a/include/lbann/layers/loss/cross_entropy.hpp +++ b/include/lbann/layers/loss/cross_entropy.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/loss/entrywise.hpp b/include/lbann/layers/loss/entrywise.hpp index 58d0dde2e32..6e55f58313e 100644 --- a/include/lbann/layers/loss/entrywise.hpp +++ b/include/lbann/layers/loss/entrywise.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/loss/l1_norm.hpp b/include/lbann/layers/loss/l1_norm.hpp index 7810ae46746..8ceb88c09c3 100644 --- a/include/lbann/layers/loss/l1_norm.hpp +++ b/include/lbann/layers/loss/l1_norm.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/loss/l2_norm2.hpp b/include/lbann/layers/loss/l2_norm2.hpp index d03f38b03f5..15ad24adbd0 100644 --- a/include/lbann/layers/loss/l2_norm2.hpp +++ b/include/lbann/layers/loss/l2_norm2.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/loss/mean_absolute_error.hpp b/include/lbann/layers/loss/mean_absolute_error.hpp index f9276fd47ad..c136f1f6c72 100644 --- a/include/lbann/layers/loss/mean_absolute_error.hpp +++ b/include/lbann/layers/loss/mean_absolute_error.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/loss/mean_squared_error.hpp b/include/lbann/layers/loss/mean_squared_error.hpp index 0fdc7e072f9..19ead85c346 100644 --- a/include/lbann/layers/loss/mean_squared_error.hpp +++ b/include/lbann/layers/loss/mean_squared_error.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/loss/top_k_categorical_accuracy.hpp b/include/lbann/layers/loss/top_k_categorical_accuracy.hpp index a7354548de2..6e0389e5f73 100644 --- a/include/lbann/layers/loss/top_k_categorical_accuracy.hpp +++ b/include/lbann/layers/loss/top_k_categorical_accuracy.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/math/binary.hpp b/include/lbann/layers/math/binary.hpp index aedddabea34..d389ccbaae8 100644 --- a/include/lbann/layers/math/binary.hpp +++ b/include/lbann/layers/math/binary.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/math/clamp.hpp b/include/lbann/layers/math/clamp.hpp index a12070f9b94..4b79dc06c09 100644 --- a/include/lbann/layers/math/clamp.hpp +++ b/include/lbann/layers/math/clamp.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/math/unary.hpp b/include/lbann/layers/math/unary.hpp index e955a19ebee..73034b0593f 100644 --- a/include/lbann/layers/math/unary.hpp +++ b/include/lbann/layers/math/unary.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/misc/channelwise_mean.hpp b/include/lbann/layers/misc/channelwise_mean.hpp index 0b0253518ba..5889b853256 100644 --- a/include/lbann/layers/misc/channelwise_mean.hpp +++ b/include/lbann/layers/misc/channelwise_mean.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/misc/covariance.hpp b/include/lbann/layers/misc/covariance.hpp index 66e5cbd0f05..8f31d12d545 100644 --- a/include/lbann/layers/misc/covariance.hpp +++ b/include/lbann/layers/misc/covariance.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/misc/mini_batch_index.hpp b/include/lbann/layers/misc/mini_batch_index.hpp index e7b24675d18..51538000dce 100644 --- a/include/lbann/layers/misc/mini_batch_index.hpp +++ b/include/lbann/layers/misc/mini_batch_index.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/misc/mini_batch_size.hpp b/include/lbann/layers/misc/mini_batch_size.hpp index a827e15a104..5a1445ef422 100644 --- a/include/lbann/layers/misc/mini_batch_size.hpp +++ b/include/lbann/layers/misc/mini_batch_size.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/misc/variance.hpp b/include/lbann/layers/misc/variance.hpp index c8139a32651..bc36581b73f 100644 --- a/include/lbann/layers/misc/variance.hpp +++ b/include/lbann/layers/misc/variance.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/regularizers/batch_normalization.hpp b/include/lbann/layers/regularizers/batch_normalization.hpp index 744ce6e26a0..2f896fcf081 100644 --- a/include/lbann/layers/regularizers/batch_normalization.hpp +++ b/include/lbann/layers/regularizers/batch_normalization.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/regularizers/dropout.hpp b/include/lbann/layers/regularizers/dropout.hpp index 3fa652b07da..d19f4be4125 100644 --- a/include/lbann/layers/regularizers/dropout.hpp +++ b/include/lbann/layers/regularizers/dropout.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/regularizers/local_response_normalization.hpp b/include/lbann/layers/regularizers/local_response_normalization.hpp index ca348d3755d..23ff7051fab 100644 --- a/include/lbann/layers/regularizers/local_response_normalization.hpp +++ b/include/lbann/layers/regularizers/local_response_normalization.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/regularizers/regularizer.hpp b/include/lbann/layers/regularizers/regularizer.hpp index ed8d93e7b06..c01b892c820 100644 --- a/include/lbann/layers/regularizers/regularizer.hpp +++ b/include/lbann/layers/regularizers/regularizer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/regularizers/selu_dropout.hpp b/include/lbann/layers/regularizers/selu_dropout.hpp index 34d474f0bb8..a2b3d6475a3 100644 --- a/include/lbann/layers/regularizers/selu_dropout.hpp +++ b/include/lbann/layers/regularizers/selu_dropout.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/bernoulli.hpp b/include/lbann/layers/transform/bernoulli.hpp index 9fa26dce56c..d3e827e6ee7 100644 --- a/include/lbann/layers/transform/bernoulli.hpp +++ b/include/lbann/layers/transform/bernoulli.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/categorical_random.hpp b/include/lbann/layers/transform/categorical_random.hpp index 3ed7bd87f73..ac756dbeb5f 100644 --- a/include/lbann/layers/transform/categorical_random.hpp +++ b/include/lbann/layers/transform/categorical_random.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/concatenation.hpp b/include/lbann/layers/transform/concatenation.hpp index 66fc671a1ac..5355787269f 100644 --- a/include/lbann/layers/transform/concatenation.hpp +++ b/include/lbann/layers/transform/concatenation.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/constant.hpp b/include/lbann/layers/transform/constant.hpp index 01c96c23f35..f4390884a56 100644 --- a/include/lbann/layers/transform/constant.hpp +++ b/include/lbann/layers/transform/constant.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/crop.hpp b/include/lbann/layers/transform/crop.hpp index 65c3b435dfe..f0b37b293d3 100644 --- a/include/lbann/layers/transform/crop.hpp +++ b/include/lbann/layers/transform/crop.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/discrete_random.hpp b/include/lbann/layers/transform/discrete_random.hpp index b8e4f3ad600..c668971726f 100644 --- a/include/lbann/layers/transform/discrete_random.hpp +++ b/include/lbann/layers/transform/discrete_random.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/dummy.hpp b/include/lbann/layers/transform/dummy.hpp index 4a9e08a58cd..ec451fbe08e 100644 --- a/include/lbann/layers/transform/dummy.hpp +++ b/include/lbann/layers/transform/dummy.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/evaluation.hpp b/include/lbann/layers/transform/evaluation.hpp index afff0e1b625..014ff9e3849 100644 --- a/include/lbann/layers/transform/evaluation.hpp +++ b/include/lbann/layers/transform/evaluation.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/gaussian.hpp b/include/lbann/layers/transform/gaussian.hpp index 307a5058a38..7ab43afc3a7 100644 --- a/include/lbann/layers/transform/gaussian.hpp +++ b/include/lbann/layers/transform/gaussian.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/hadamard.hpp b/include/lbann/layers/transform/hadamard.hpp index 4df2ee23c25..04426334b91 100644 --- a/include/lbann/layers/transform/hadamard.hpp +++ b/include/lbann/layers/transform/hadamard.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/in_top_k.hpp b/include/lbann/layers/transform/in_top_k.hpp index ad21ae28637..85abe8caba4 100644 --- a/include/lbann/layers/transform/in_top_k.hpp +++ b/include/lbann/layers/transform/in_top_k.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/pooling.hpp b/include/lbann/layers/transform/pooling.hpp index f7c960c86aa..abf6689aa82 100644 --- a/include/lbann/layers/transform/pooling.hpp +++ b/include/lbann/layers/transform/pooling.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/reduction.hpp b/include/lbann/layers/transform/reduction.hpp index e7df5643f15..15df56534e1 100644 --- a/include/lbann/layers/transform/reduction.hpp +++ b/include/lbann/layers/transform/reduction.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/reshape.hpp b/include/lbann/layers/transform/reshape.hpp index e056c5d28de..7770080ff69 100644 --- a/include/lbann/layers/transform/reshape.hpp +++ b/include/lbann/layers/transform/reshape.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/slice.hpp b/include/lbann/layers/transform/slice.hpp index 2a682edc34e..62143bc32b8 100644 --- a/include/lbann/layers/transform/slice.hpp +++ b/include/lbann/layers/transform/slice.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/sort.hpp b/include/lbann/layers/transform/sort.hpp index 455f69085ad..8d04e25a795 100644 --- a/include/lbann/layers/transform/sort.hpp +++ b/include/lbann/layers/transform/sort.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/split.hpp b/include/lbann/layers/transform/split.hpp index 3a5aaa6c79c..a7f151f7452 100644 --- a/include/lbann/layers/transform/split.hpp +++ b/include/lbann/layers/transform/split.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/stop_gradient.hpp b/include/lbann/layers/transform/stop_gradient.hpp index 31ae6d1d5cb..4adeafbb205 100644 --- a/include/lbann/layers/transform/stop_gradient.hpp +++ b/include/lbann/layers/transform/stop_gradient.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/sum.hpp b/include/lbann/layers/transform/sum.hpp index 009ff86b873..ab9ce9a4af6 100644 --- a/include/lbann/layers/transform/sum.hpp +++ b/include/lbann/layers/transform/sum.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/tessellate.hpp b/include/lbann/layers/transform/tessellate.hpp index a2ffb4e6393..eafe02cb9df 100644 --- a/include/lbann/layers/transform/tessellate.hpp +++ b/include/lbann/layers/transform/tessellate.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/transform.hpp b/include/lbann/layers/transform/transform.hpp index b26cabe076c..98b2a169ea3 100644 --- a/include/lbann/layers/transform/transform.hpp +++ b/include/lbann/layers/transform/transform.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/uniform.hpp b/include/lbann/layers/transform/uniform.hpp index a22e3ae015e..b10bbb03375 100644 --- a/include/lbann/layers/transform/uniform.hpp +++ b/include/lbann/layers/transform/uniform.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/unpooling.hpp b/include/lbann/layers/transform/unpooling.hpp index decf7d979d2..9a88eabcc1a 100644 --- a/include/lbann/layers/transform/unpooling.hpp +++ b/include/lbann/layers/transform/unpooling.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/weighted_sum.hpp b/include/lbann/layers/transform/weighted_sum.hpp index 9289707b483..5f77caeaa9a 100644 --- a/include/lbann/layers/transform/weighted_sum.hpp +++ b/include/lbann/layers/transform/weighted_sum.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/layers/transform/weights.hpp b/include/lbann/layers/transform/weights.hpp index 8ffb89dd892..f6d74931347 100644 --- a/include/lbann/layers/transform/weights.hpp +++ b/include/lbann/layers/transform/weights.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/lbann.hpp b/include/lbann/lbann.hpp index 3a15b6b03ca..5b1ba94d470 100644 --- a/include/lbann/lbann.hpp +++ b/include/lbann/lbann.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/metrics/layer_metric.hpp b/include/lbann/metrics/layer_metric.hpp index 7eefbb6d30e..f0f9c811504 100644 --- a/include/lbann/metrics/layer_metric.hpp +++ b/include/lbann/metrics/layer_metric.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -58,9 +58,9 @@ class layer_metric : public metric { std::vector get_layer_pointers() const override; /** Set list of pointers to layers. */ void set_layer_pointers(std::vector layers) override; - + protected: - + void setup(model& m) override; EvalType evaluate(execution_mode mode, int mini_batch_size) override; @@ -87,7 +87,7 @@ class layer_metric : public metric { /** Get corresponding evaluation layer. */ abstract_evaluation_layer& get_evaluation_layer(); - + }; } // namespace lbann diff --git a/include/lbann/metrics/metric.hpp b/include/lbann/metrics/metric.hpp index 4e06b59ad06..d270c361bb5 100644 --- a/include/lbann/metrics/metric.hpp +++ b/include/lbann/metrics/metric.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/models/directed_acyclic_graph.hpp b/include/lbann/models/directed_acyclic_graph.hpp index 6178afcea3c..a47c6a8f123 100644 --- a/include/lbann/models/directed_acyclic_graph.hpp +++ b/include/lbann/models/directed_acyclic_graph.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/models/model.hpp b/include/lbann/models/model.hpp index 130d7cf9d41..7e8671a5289 100644 --- a/include/lbann/models/model.hpp +++ b/include/lbann/models/model.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/objective_functions/layer_term.hpp b/include/lbann/objective_functions/layer_term.hpp index c5720a527ed..7a3622537fe 100644 --- a/include/lbann/objective_functions/layer_term.hpp +++ b/include/lbann/objective_functions/layer_term.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -35,7 +35,7 @@ namespace lbann { class layer_term : public objective_function_term { public: layer_term(EvalType scale_factor = EvalType(1)); - layer_term* copy() const override { return new layer_term(*this); } + layer_term* copy() const override { return new layer_term(*this); } std::string name() const override { return "evaluation layer term"; } /** Set corresponding layer. */ @@ -44,7 +44,7 @@ class layer_term : public objective_function_term { Layer& get_layer(); /** Get corresponding layer (const). */ const Layer& get_layer() const; - + void setup(model& m) override; void start_evaluation() override; @@ -52,14 +52,14 @@ class layer_term : public objective_function_term { EvalType finish_evaluation() override; void differentiate() override; - + void compute_weight_regularization() override {}; private: - + /** Get corresponding evaluation layer. */ abstract_evaluation_layer& get_evaluation_layer(); - + }; } // namespace lbann diff --git a/include/lbann/objective_functions/objective_function.hpp b/include/lbann/objective_functions/objective_function.hpp index 241b6ae9069..9e0195bdb80 100644 --- a/include/lbann/objective_functions/objective_function.hpp +++ b/include/lbann/objective_functions/objective_function.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/objective_functions/objective_function_term.hpp b/include/lbann/objective_functions/objective_function_term.hpp index 33d1f1fb947..1fa13bff220 100644 --- a/include/lbann/objective_functions/objective_function_term.hpp +++ b/include/lbann/objective_functions/objective_function_term.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/objective_functions/weight_regularization/l2.hpp b/include/lbann/objective_functions/weight_regularization/l2.hpp index 0c469f06b27..d8ef6fa47c0 100644 --- a/include/lbann/objective_functions/weight_regularization/l2.hpp +++ b/include/lbann/objective_functions/weight_regularization/l2.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/optimizers/adagrad.hpp b/include/lbann/optimizers/adagrad.hpp index 05a06949246..9a5cc8adbe6 100644 --- a/include/lbann/optimizers/adagrad.hpp +++ b/include/lbann/optimizers/adagrad.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/optimizers/adam.hpp b/include/lbann/optimizers/adam.hpp index 753dff1682c..696c8416599 100644 --- a/include/lbann/optimizers/adam.hpp +++ b/include/lbann/optimizers/adam.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/optimizers/hypergradient_adam.hpp b/include/lbann/optimizers/hypergradient_adam.hpp index b838db9694c..b0d362ad02e 100644 --- a/include/lbann/optimizers/hypergradient_adam.hpp +++ b/include/lbann/optimizers/hypergradient_adam.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/optimizers/optimizer.hpp b/include/lbann/optimizers/optimizer.hpp index 094d92f1160..6e0e9ee6712 100644 --- a/include/lbann/optimizers/optimizer.hpp +++ b/include/lbann/optimizers/optimizer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/optimizers/rmsprop.hpp b/include/lbann/optimizers/rmsprop.hpp index 8b9a0f33594..a8debaa076c 100644 --- a/include/lbann/optimizers/rmsprop.hpp +++ b/include/lbann/optimizers/rmsprop.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/optimizers/sgd.hpp b/include/lbann/optimizers/sgd.hpp index 18e8fbb05c1..2d59b8c2ffe 100644 --- a/include/lbann/optimizers/sgd.hpp +++ b/include/lbann/optimizers/sgd.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/proto/factories.hpp b/include/lbann/proto/factories.hpp index f92721b7b28..ca68f30975d 100644 --- a/include/lbann/proto/factories.hpp +++ b/include/lbann/proto/factories.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/proto/init_image_data_readers.hpp b/include/lbann/proto/init_image_data_readers.hpp index 9dac3da1b12..f35a5797e2b 100644 --- a/include/lbann/proto/init_image_data_readers.hpp +++ b/include/lbann/proto/init_image_data_readers.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/cnpy_utils.hpp b/include/lbann/utils/cnpy_utils.hpp index 2dcb677118e..d4c195361dc 100644 --- a/include/lbann/utils/cnpy_utils.hpp +++ b/include/lbann/utils/cnpy_utils.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/compiler_control.hpp b/include/lbann/utils/compiler_control.hpp index 460b9bb21b1..e4f001f3195 100644 --- a/include/lbann/utils/compiler_control.hpp +++ b/include/lbann/utils/compiler_control.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/cublas.hpp b/include/lbann/utils/cublas.hpp index 5e0e7cefbaf..49225ff2336 100644 --- a/include/lbann/utils/cublas.hpp +++ b/include/lbann/utils/cublas.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/cuda.hpp b/include/lbann/utils/cuda.hpp index 99ebc170c6d..87201c0fe8d 100644 --- a/include/lbann/utils/cuda.hpp +++ b/include/lbann/utils/cuda.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -139,19 +139,19 @@ template __device__ __forceinline__ T min(const T& x, const T& y); template __device__ __forceinline__ T max(const T& x, const T& y); template __device__ __forceinline__ T mod(const T& x, const T& y); template __device__ __forceinline__ T pow(const T& x, const T& y); - + // Numeric limits template constexpr __device__ __forceinline__ T min(); template constexpr __device__ __forceinline__ T max(); template constexpr __device__ __forceinline__ T epsilon(); template __device__ __forceinline__ T infinity(); - + #endif // __CUDACC__ // ------------------------------------------------------------- // Utilities for CUDA events // ------------------------------------------------------------- - + /** Wrapper class for a CUDA event. */ class event_wrapper { public: @@ -177,7 +177,7 @@ class event_wrapper { */ cudaStream_t m_stream; }; - + // ------------------------------------------------------------- // Helper functions for entrywise operations // ------------------------------------------------------------- @@ -199,7 +199,7 @@ template void apply_entrywise_binary_operator(const AbsMat& input1, const AbsMat& input2, AbsMat& output); - + /** Apply an entry-wise unary operator to GPU data. * The input and output data must be on GPU, have the same @@ -217,7 +217,7 @@ template void apply_entrywise_binary_operator(const AbsDistMat& input1, const AbsDistMat& input2, AbsDistMat& output); - + #endif // __CUDACC__ // ------------------------------------------------------------- @@ -271,13 +271,13 @@ class allocator cudaStream_t m_stream; /** Thrust execution policy. */ system_type m_system; - + }; /** Thrust device vector. */ template using vector = ::thrust::device_vector>; - + } // namespace thrust } // namespace cuda diff --git a/include/lbann/utils/cudnn.hpp b/include/lbann/utils/cudnn.hpp index a666a0967d7..e6a507624c7 100644 --- a/include/lbann/utils/cudnn.hpp +++ b/include/lbann/utils/cudnn.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/cyg_profile.hpp b/include/lbann/utils/cyg_profile.hpp index 2dbe237b546..55801e478c5 100644 --- a/include/lbann/utils/cyg_profile.hpp +++ b/include/lbann/utils/cyg_profile.hpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////xecu -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/dataset.hpp b/include/lbann/utils/dataset.hpp index f2337513d78..2c1373f3807 100644 --- a/include/lbann/utils/dataset.hpp +++ b/include/lbann/utils/dataset.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/description.hpp b/include/lbann/utils/description.hpp index f22848d9cc5..b9a86b8c965 100644 --- a/include/lbann/utils/description.hpp +++ b/include/lbann/utils/description.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/entrywise_operator.hpp b/include/lbann/utils/entrywise_operator.hpp index cdcc31f9fb5..50172bc7700 100644 --- a/include/lbann/utils/entrywise_operator.hpp +++ b/include/lbann/utils/entrywise_operator.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/exception.hpp b/include/lbann/utils/exception.hpp index c2e8849edce..c487eb6af64 100644 --- a/include/lbann/utils/exception.hpp +++ b/include/lbann/utils/exception.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -79,7 +79,7 @@ class exception : public std::exception { * Reports the exception message and the stack trace. */ void print_report(std::ostream& os = std::cerr) const; - + private: /** Human-readable exception message. */ std::string m_message; @@ -87,10 +87,10 @@ class exception : public std::exception { * The stack trace is recorded when the exception is constructed. */ std::string m_stack_trace; - + }; using lbann_exception = exception; - + } // namespace lbann #endif // LBANN_UTILS_EXCEPTION_HPP_INCLUDED diff --git a/include/lbann/utils/file_utils.hpp b/include/lbann/utils/file_utils.hpp index 4b882ef3cd5..53f9c9b6be0 100644 --- a/include/lbann/utils/file_utils.hpp +++ b/include/lbann/utils/file_utils.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/glob.hpp b/include/lbann/utils/glob.hpp index 4ab6729afe1..bb4b3ad0eeb 100644 --- a/include/lbann/utils/glob.hpp +++ b/include/lbann/utils/glob.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/graph.hpp b/include/lbann/utils/graph.hpp index 052b6af7119..f9d4522762a 100644 --- a/include/lbann/utils/graph.hpp +++ b/include/lbann/utils/graph.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/im2col.hpp b/include/lbann/utils/im2col.hpp index 266ad8b1b51..7579eb4fa4e 100644 --- a/include/lbann/utils/im2col.hpp +++ b/include/lbann/utils/im2col.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/impl/cuda.hpp b/include/lbann/utils/impl/cuda.hpp index 8373ae6d4e8..56b1ed27d9b 100644 --- a/include/lbann/utils/impl/cuda.hpp +++ b/include/lbann/utils/impl/cuda.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/jag_utils.hpp b/include/lbann/utils/jag_utils.hpp index 243650c2d8c..ae822a77c72 100644 --- a/include/lbann/utils/jag_utils.hpp +++ b/include/lbann/utils/jag_utils.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/lbann_library.hpp b/include/lbann/utils/lbann_library.hpp index 3f01b4ef82e..215a63ad542 100644 --- a/include/lbann/utils/lbann_library.hpp +++ b/include/lbann/utils/lbann_library.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/mild_exception.hpp b/include/lbann/utils/mild_exception.hpp index a2afedb95a7..2b23b6b74d8 100644 --- a/include/lbann/utils/mild_exception.hpp +++ b/include/lbann/utils/mild_exception.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/number_theory.hpp b/include/lbann/utils/number_theory.hpp index e879c851090..335dcff133f 100644 --- a/include/lbann/utils/number_theory.hpp +++ b/include/lbann/utils/number_theory.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/omp_diagnostics.hpp b/include/lbann/utils/omp_diagnostics.hpp index 06fa4a6c666..9eaecde981c 100644 --- a/include/lbann/utils/omp_diagnostics.hpp +++ b/include/lbann/utils/omp_diagnostics.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/omp_pragma.hpp b/include/lbann/utils/omp_pragma.hpp index c1c1096aa54..df960f3ca12 100644 --- a/include/lbann/utils/omp_pragma.hpp +++ b/include/lbann/utils/omp_pragma.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/peek_map.hpp b/include/lbann/utils/peek_map.hpp index 6f0ffe27772..ee44dc52b3f 100644 --- a/include/lbann/utils/peek_map.hpp +++ b/include/lbann/utils/peek_map.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/profiling.hpp b/include/lbann/utils/profiling.hpp index 97684aab356..8985dc2faf5 100644 --- a/include/lbann/utils/profiling.hpp +++ b/include/lbann/utils/profiling.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/random.hpp b/include/lbann/utils/random.hpp index cab906015ed..dd48d1ee787 100644 --- a/include/lbann/utils/random.hpp +++ b/include/lbann/utils/random.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/stack_profiler.hpp b/include/lbann/utils/stack_profiler.hpp index c5ca88b8465..4719c3b96fe 100644 --- a/include/lbann/utils/stack_profiler.hpp +++ b/include/lbann/utils/stack_profiler.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/stack_trace.hpp b/include/lbann/utils/stack_trace.hpp index 748958eb730..9c2333fa589 100644 --- a/include/lbann/utils/stack_trace.hpp +++ b/include/lbann/utils/stack_trace.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -47,14 +47,14 @@ std::string get(); * Fatal signals are those that cause an abnormal termination by * default, according to the POSIX C standard * (http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/signal.h.html). - * + * * This functionality is somewhat risky since the handler calls * non-reentrant functions, which can result in undefined behavior * (see https://www.ibm.com/developerworks/library/l-reent/). */ void register_signal_handler(std::string file_base = ""); -} //namespace stack_trace +} //namespace stack_trace } //namespace lbann #endif // LBANN_UTILS_STACK_TRACE_HPP_INCLUDED diff --git a/include/lbann/utils/statistics.hpp b/include/lbann/utils/statistics.hpp index 95bb166c148..b7176b71702 100644 --- a/include/lbann/utils/statistics.hpp +++ b/include/lbann/utils/statistics.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/summary.hpp b/include/lbann/utils/summary.hpp index f574432f663..dea6e19cd2b 100644 --- a/include/lbann/utils/summary.hpp +++ b/include/lbann/utils/summary.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/threads/thread_utils.hpp b/include/lbann/utils/threads/thread_utils.hpp index abee7b4c6aa..514ff1e4549 100644 --- a/include/lbann/utils/threads/thread_utils.hpp +++ b/include/lbann/utils/threads/thread_utils.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/utils/timer.hpp b/include/lbann/utils/timer.hpp index 9a7b88336d3..73bd072a678 100644 --- a/include/lbann/utils/timer.hpp +++ b/include/lbann/utils/timer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/weights/initializer.hpp b/include/lbann/weights/initializer.hpp index 14b6e609d9c..84f696d9554 100644 --- a/include/lbann/weights/initializer.hpp +++ b/include/lbann/weights/initializer.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/weights/variance_scaling_initializers.hpp b/include/lbann/weights/variance_scaling_initializers.hpp index 4cf05c5975b..c6256cfe956 100644 --- a/include/lbann/weights/variance_scaling_initializers.hpp +++ b/include/lbann/weights/variance_scaling_initializers.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/include/lbann/weights/weights.hpp b/include/lbann/weights/weights.hpp index 1515f25989d..784869331fa 100644 --- a/include/lbann/weights/weights.hpp +++ b/include/lbann/weights/weights.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/lbann_license_template.txt b/lbann_license_template.txt index d4ac28fc8b4..4c0bb7d4139 100644 --- a/lbann_license_template.txt +++ b/lbann_license_template.txt @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. -// Produced at the Lawrence Livermore National Laboratory. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. +// Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. // @@ -9,7 +9,7 @@ // // This file is part of LBANN: Livermore Big Artificial Neural Network // Toolkit. For details, see http://software.llnl.gov/LBANN or -// https://github.com/LLNL/LBANN. +// https://github.com/LLNL/LBANN. // // Licensed under the Apache License, Version 2.0 (the "Licensee"); you // may not use this file except in compliance with the License. You may diff --git a/model_zoo/jag_utils/build_index.cpp b/model_zoo/jag_utils/build_index.cpp index 29660ae9c40..9a92153b940 100644 --- a/model_zoo/jag_utils/build_index.cpp +++ b/model_zoo/jag_utils/build_index.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/check_for_duplicate_samples.cpp b/model_zoo/jag_utils/check_for_duplicate_samples.cpp index beb0f18c5c9..553f7aaa4be 100644 --- a/model_zoo/jag_utils/check_for_duplicate_samples.cpp +++ b/model_zoo/jag_utils/check_for_duplicate_samples.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/check_images.cpp b/model_zoo/jag_utils/check_images.cpp index 4f943dcc176..29dc779fdf3 100644 --- a/model_zoo/jag_utils/check_images.cpp +++ b/model_zoo/jag_utils/check_images.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/compute_min_max_images.cpp b/model_zoo/jag_utils/compute_min_max_images.cpp index 1d2a305793b..42167e082ac 100644 --- a/model_zoo/jag_utils/compute_min_max_images.cpp +++ b/model_zoo/jag_utils/compute_min_max_images.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/compute_per_channel_image_avg_min_max.cpp b/model_zoo/jag_utils/compute_per_channel_image_avg_min_max.cpp index d862b4824a5..8a5745c1a29 100644 --- a/model_zoo/jag_utils/compute_per_channel_image_avg_min_max.cpp +++ b/model_zoo/jag_utils/compute_per_channel_image_avg_min_max.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/detect_corruption.cpp b/model_zoo/jag_utils/detect_corruption.cpp index f7ff73607fb..b42b67271b3 100644 --- a/model_zoo/jag_utils/detect_corruption.cpp +++ b/model_zoo/jag_utils/detect_corruption.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -46,7 +46,7 @@ using namespace lbann; void get_input_names(std::unordered_set &s); void get_scalar_names(std::unordered_set &s); void get_image_names(std::unordered_set &s); -void print_errs(world_comm_ptr &comm, int np, int rank, std::ostringstream &s, const char *msg); +void print_errs(world_comm_ptr &comm, int np, int rank, std::ostringstream &s, const char *msg); //========================================================================== int main(int argc, char *argv[]) { @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) { conduit::Node n_ok; conduit::Node tmp; int h = 0; - + // used to ensure all values are used double total = 0; for (size_t j=rank; j &s) { void print_errs(world_comm_ptr &comm, int np, int rank, std::ostringstream &s, const char *msg) { comm->global_barrier(); - if (rank == 0) { std::cerr << "\n" << msg << "\n"; } + if (rank == 0) { std::cerr << "\n" << msg << "\n"; } for (int i=0; iglobal_barrier(); if (rank == i) { @@ -258,5 +258,5 @@ void print_errs(world_comm_ptr &comm, int np, int rank, std::ostringstream &s, c } } comm->global_barrier(); -} +} #endif //#ifdef LBANN_HAS_CONDUIT diff --git a/model_zoo/jag_utils/dump_bundle.cpp b/model_zoo/jag_utils/dump_bundle.cpp index a16fc4ff7b0..7191a65fa96 100644 --- a/model_zoo/jag_utils/dump_bundle.cpp +++ b/model_zoo/jag_utils/dump_bundle.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/extract_random_samples.cpp b/model_zoo/jag_utils/extract_random_samples.cpp index 6664f67dc10..7937183aa68 100644 --- a/model_zoo/jag_utils/extract_random_samples.cpp +++ b/model_zoo/jag_utils/extract_random_samples.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/generate_corrupt_samples.cpp b/model_zoo/jag_utils/generate_corrupt_samples.cpp index dd2152ae765..3a2181ea6d8 100644 --- a/model_zoo/jag_utils/generate_corrupt_samples.cpp +++ b/model_zoo/jag_utils/generate_corrupt_samples.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/load_balance.cpp b/model_zoo/jag_utils/load_balance.cpp index 1c0954eb154..5a3403bae68 100644 --- a/model_zoo/jag_utils/load_balance.cpp +++ b/model_zoo/jag_utils/load_balance.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/load_bundle2raw.cpp b/model_zoo/jag_utils/load_bundle2raw.cpp index 19b61a77a11..703a39edafd 100644 --- a/model_zoo/jag_utils/load_bundle2raw.cpp +++ b/model_zoo/jag_utils/load_bundle2raw.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/test_conduit_hdf5.cpp b/model_zoo/jag_utils/test_conduit_hdf5.cpp index a35e23354ca..3c2d6955bfa 100644 --- a/model_zoo/jag_utils/test_conduit_hdf5.cpp +++ b/model_zoo/jag_utils/test_conduit_hdf5.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/test_conduit_with_mpi.cpp b/model_zoo/jag_utils/test_conduit_with_mpi.cpp index 45d4f2ea14b..bb86c0708f9 100644 --- a/model_zoo/jag_utils/test_conduit_with_mpi.cpp +++ b/model_zoo/jag_utils/test_conduit_with_mpi.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/jag_utils/test_mpi.cpp b/model_zoo/jag_utils/test_mpi.cpp index ddb27168b87..92a78ef4f1d 100644 --- a/model_zoo/jag_utils/test_mpi.cpp +++ b/model_zoo/jag_utils/test_mpi.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/lbann.cpp b/model_zoo/lbann.cpp index d6caf5d15b0..868b3e1d362 100644 --- a/model_zoo/lbann.cpp +++ b/model_zoo/lbann.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/lbann2.cpp b/model_zoo/lbann2.cpp index b7a3a58de7d..b72ddd2a38f 100644 --- a/model_zoo/lbann2.cpp +++ b/model_zoo/lbann2.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/lbann_aecycgan.cpp b/model_zoo/lbann_aecycgan.cpp index c25a9fb7bfc..699b779117a 100644 --- a/model_zoo/lbann_aecycgan.cpp +++ b/model_zoo/lbann_aecycgan.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/lbann_cycgan.cpp b/model_zoo/lbann_cycgan.cpp index f91161fb97a..3093075aa7e 100644 --- a/model_zoo/lbann_cycgan.cpp +++ b/model_zoo/lbann_cycgan.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/lbann_gan.cpp b/model_zoo/lbann_gan.cpp index 7c36af1b848..2db1b291bf6 100644 --- a/model_zoo/lbann_gan.cpp +++ b/model_zoo/lbann_gan.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/lbann_help.cpp b/model_zoo/lbann_help.cpp index ae520085f52..a297877a36a 100644 --- a/model_zoo/lbann_help.cpp +++ b/model_zoo/lbann_help.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/lbann_inf.cpp b/model_zoo/lbann_inf.cpp index fdc7161b272..252e944e256 100644 --- a/model_zoo/lbann_inf.cpp +++ b/model_zoo/lbann_inf.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/tests/comm_test.cpp b/model_zoo/tests/comm_test.cpp index 808debf35c9..4975e133cb2 100644 --- a/model_zoo/tests/comm_test.cpp +++ b/model_zoo/tests/comm_test.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/tests/conduit_timing_test.cpp b/model_zoo/tests/conduit_timing_test.cpp index 5ac0ae7655a..a37cee28f54 100644 --- a/model_zoo/tests/conduit_timing_test.cpp +++ b/model_zoo/tests/conduit_timing_test.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/model_zoo/tests/test_utils.hpp b/model_zoo/tests/test_utils.hpp index 66d9702d988..0b86f9e7666 100644 --- a/model_zoo/tests/test_utils.hpp +++ b/model_zoo/tests/test_utils.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/Elemental_extensions.cpp b/src/Elemental_extensions.cpp index 6d6f35bd4c4..bcea0cb6dfe 100644 --- a/src/Elemental_extensions.cpp +++ b/src/Elemental_extensions.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/base.cpp b/src/base.cpp index e4224a86b49..f67fd982d84 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_check_dataset.cpp b/src/callbacks/callback_check_dataset.cpp index 33fb1403eba..5bf0702b54c 100644 --- a/src/callbacks/callback_check_dataset.cpp +++ b/src/callbacks/callback_check_dataset.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_check_gradients.cpp b/src/callbacks/callback_check_gradients.cpp index 8cf7ad7b0db..9f133f467da 100644 --- a/src/callbacks/callback_check_gradients.cpp +++ b/src/callbacks/callback_check_gradients.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_check_init.cpp b/src/callbacks/callback_check_init.cpp index ba5a0d04f57..2d50f07dad1 100644 --- a/src/callbacks/callback_check_init.cpp +++ b/src/callbacks/callback_check_init.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_check_metric.cpp b/src/callbacks/callback_check_metric.cpp index 8b50d1bcf36..2e3719a2c82 100644 --- a/src/callbacks/callback_check_metric.cpp +++ b/src/callbacks/callback_check_metric.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_checknan.cpp b/src/callbacks/callback_checknan.cpp index 1d2f8d9525f..143ec4ad776 100644 --- a/src/callbacks/callback_checknan.cpp +++ b/src/callbacks/callback_checknan.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_checkpoint.cpp b/src/callbacks/callback_checkpoint.cpp index d33b4fbed37..2fafefaf836 100644 --- a/src/callbacks/callback_checkpoint.cpp +++ b/src/callbacks/callback_checkpoint.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_checksmall.cpp b/src/callbacks/callback_checksmall.cpp index 578e9fde39b..e310c64b6da 100644 --- a/src/callbacks/callback_checksmall.cpp +++ b/src/callbacks/callback_checksmall.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_confusion_matrix.cpp b/src/callbacks/callback_confusion_matrix.cpp index d0a13e09f92..03eef71e449 100644 --- a/src/callbacks/callback_confusion_matrix.cpp +++ b/src/callbacks/callback_confusion_matrix.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_debug.cpp b/src/callbacks/callback_debug.cpp index 0bc05c0297c..ffb391272d6 100644 --- a/src/callbacks/callback_debug.cpp +++ b/src/callbacks/callback_debug.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_debug_io.cpp b/src/callbacks/callback_debug_io.cpp index 36f70ab8e9e..78bedc27c11 100644 --- a/src/callbacks/callback_debug_io.cpp +++ b/src/callbacks/callback_debug_io.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_dump_error_signals.cpp b/src/callbacks/callback_dump_error_signals.cpp index 97a510b2ea9..f204a1caef4 100644 --- a/src/callbacks/callback_dump_error_signals.cpp +++ b/src/callbacks/callback_dump_error_signals.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_dump_gradients.cpp b/src/callbacks/callback_dump_gradients.cpp index a45ff04ef69..7f2a55c25af 100644 --- a/src/callbacks/callback_dump_gradients.cpp +++ b/src/callbacks/callback_dump_gradients.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_dump_minibatch_sample_indices.cpp b/src/callbacks/callback_dump_minibatch_sample_indices.cpp index b6f7557aaf5..cd0aec7dba7 100644 --- a/src/callbacks/callback_dump_minibatch_sample_indices.cpp +++ b/src/callbacks/callback_dump_minibatch_sample_indices.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_dump_outputs.cpp b/src/callbacks/callback_dump_outputs.cpp index 0a5bac4658a..2c5fc57cb34 100644 --- a/src/callbacks/callback_dump_outputs.cpp +++ b/src/callbacks/callback_dump_outputs.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_dump_weights.cpp b/src/callbacks/callback_dump_weights.cpp index 03b0ebe678c..4129a2a2acd 100644 --- a/src/callbacks/callback_dump_weights.cpp +++ b/src/callbacks/callback_dump_weights.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_early_stopping.cpp b/src/callbacks/callback_early_stopping.cpp index e7bdfd37eab..d7af962290b 100644 --- a/src/callbacks/callback_early_stopping.cpp +++ b/src/callbacks/callback_early_stopping.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_gpu_memory_usage.cpp b/src/callbacks/callback_gpu_memory_usage.cpp index a4628595e51..4cacebf1a81 100644 --- a/src/callbacks/callback_gpu_memory_usage.cpp +++ b/src/callbacks/callback_gpu_memory_usage.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_imcomm.cpp b/src/callbacks/callback_imcomm.cpp index 2f2a5383fa5..014d5724af8 100644 --- a/src/callbacks/callback_imcomm.cpp +++ b/src/callbacks/callback_imcomm.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_io.cpp b/src/callbacks/callback_io.cpp index 5ea1cb3b178..640172f7f07 100644 --- a/src/callbacks/callback_io.cpp +++ b/src/callbacks/callback_io.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_learning_rate.cpp b/src/callbacks/callback_learning_rate.cpp index 0db04680e9b..07c33580ffd 100644 --- a/src/callbacks/callback_learning_rate.cpp +++ b/src/callbacks/callback_learning_rate.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_ltfb.cpp b/src/callbacks/callback_ltfb.cpp index 79fbf058243..4ec15242449 100644 --- a/src/callbacks/callback_ltfb.cpp +++ b/src/callbacks/callback_ltfb.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_perturb_adam.cpp b/src/callbacks/callback_perturb_adam.cpp index 5f877b35e86..7a170be15cf 100644 --- a/src/callbacks/callback_perturb_adam.cpp +++ b/src/callbacks/callback_perturb_adam.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_print.cpp b/src/callbacks/callback_print.cpp index 723572c2c0d..85b31d0e56d 100644 --- a/src/callbacks/callback_print.cpp +++ b/src/callbacks/callback_print.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_replace_weights.cpp b/src/callbacks/callback_replace_weights.cpp index ef92a1333bf..d177a36f1a9 100644 --- a/src/callbacks/callback_replace_weights.cpp +++ b/src/callbacks/callback_replace_weights.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_save_images.cpp b/src/callbacks/callback_save_images.cpp index 7696755fbc2..83dac7384c8 100644 --- a/src/callbacks/callback_save_images.cpp +++ b/src/callbacks/callback_save_images.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_save_model.cpp b/src/callbacks/callback_save_model.cpp index cf6e90e8717..b9efbd08354 100644 --- a/src/callbacks/callback_save_model.cpp +++ b/src/callbacks/callback_save_model.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_summary.cpp b/src/callbacks/callback_summary.cpp index 02f14de3027..a5d66de440a 100644 --- a/src/callbacks/callback_summary.cpp +++ b/src/callbacks/callback_summary.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_sync_layers.cpp b/src/callbacks/callback_sync_layers.cpp index 395f4fae1b1..de8fb939c55 100644 --- a/src/callbacks/callback_sync_layers.cpp +++ b/src/callbacks/callback_sync_layers.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_sync_selected.cpp b/src/callbacks/callback_sync_selected.cpp index 5cce3b09667..8844cd176b2 100644 --- a/src/callbacks/callback_sync_selected.cpp +++ b/src/callbacks/callback_sync_selected.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_timeline.cpp b/src/callbacks/callback_timeline.cpp index b841a4eeae3..c4701078d29 100644 --- a/src/callbacks/callback_timeline.cpp +++ b/src/callbacks/callback_timeline.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_timer.cpp b/src/callbacks/callback_timer.cpp index 358a3657425..2300951a335 100644 --- a/src/callbacks/callback_timer.cpp +++ b/src/callbacks/callback_timer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/callback_variable_minibatch.cpp b/src/callbacks/callback_variable_minibatch.cpp index 617e57402d4..5300b881b84 100644 --- a/src/callbacks/callback_variable_minibatch.cpp +++ b/src/callbacks/callback_variable_minibatch.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/callbacks/profiler.cpp b/src/callbacks/profiler.cpp index b75df354f8d..05c0fddb215 100644 --- a/src/callbacks/profiler.cpp +++ b/src/callbacks/profiler.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/comm.cpp b/src/comm.cpp index f03a8352691..24c545064ea 100644 --- a/src/comm.cpp +++ b/src/comm.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_augmenter.cpp b/src/data_readers/cv_augmenter.cpp index 3237eb0be2c..2418d592399 100644 --- a/src/data_readers/cv_augmenter.cpp +++ b/src/data_readers/cv_augmenter.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_colorizer.cpp b/src/data_readers/cv_colorizer.cpp index ecc89eb379f..4606623cf70 100644 --- a/src/data_readers/cv_colorizer.cpp +++ b/src/data_readers/cv_colorizer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_cropper.cpp b/src/data_readers/cv_cropper.cpp index 05bdc37564e..6e16b09466a 100644 --- a/src/data_readers/cv_cropper.cpp +++ b/src/data_readers/cv_cropper.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_decolorizer.cpp b/src/data_readers/cv_decolorizer.cpp index a2f5b4d0d2d..9d7f7ae3a14 100644 --- a/src/data_readers/cv_decolorizer.cpp +++ b/src/data_readers/cv_decolorizer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_mean_extractor.cpp b/src/data_readers/cv_mean_extractor.cpp index 62256d60389..4026e71bcb3 100644 --- a/src/data_readers/cv_mean_extractor.cpp +++ b/src/data_readers/cv_mean_extractor.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -61,7 +61,7 @@ cv_mean_extractor *cv_mean_extractor::clone() const { /** Set up the internal matrices used to accumulate image statistics, * and initialize the batch size. */ -void cv_mean_extractor::set(const unsigned int width, const unsigned int height, +void cv_mean_extractor::set(const unsigned int width, const unsigned int height, const unsigned int n_ch, const unsigned int batch_sz) { if (!m_sum.empty() || (width == 0u) || (height == 0u) || (n_ch == 0u) || (batch_sz == 0u)) { std::stringstream err; @@ -98,7 +98,7 @@ void cv_mean_extractor::create_matrices(const unsigned int width, const unsigned } void cv_mean_extractor::reset() { - // convert to a single change image before resetting the values as the + // convert to a single change image before resetting the values as the // dimension of Scalar is limited to 4 (4 channels) cv::Mat m_sum_1ch = m_sum.reshape(1); m_sum_1ch.setTo(static_cast(0)); @@ -121,7 +121,7 @@ bool cv_mean_extractor::determine_transform(const cv::Mat& image) { if (m_sum.empty()) { create_matrices(image.cols, image.rows, image.channels()); reset(); - + m_enabled = true; } else { m_enabled = check_if_cv_Mat_has_same_shape(image, m_avg); diff --git a/src/data_readers/cv_normalizer.cpp b/src/data_readers/cv_normalizer.cpp index 4430a23775b..88099544bfc 100644 --- a/src/data_readers/cv_normalizer.cpp +++ b/src/data_readers/cv_normalizer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_process.cpp b/src/data_readers/cv_process.cpp index b47fccb4c0c..2864aeeca61 100644 --- a/src/data_readers/cv_process.cpp +++ b/src/data_readers/cv_process.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -222,7 +222,7 @@ bool cv_process::preprocess(cv::Mat& image, unsigned int tr_start, unsigned int const unsigned int num_trs = static_cast(m_transforms.size()); const bool lazy_normalization = (tr_end == num_trs) && to_fuse_normalizer_with_copy(); - const unsigned int n_immediate_transforms + const unsigned int n_immediate_transforms = std::min((lazy_normalization? m_normalizer_idx : num_trs), tr_end); for (size_t i = tr_start; i < n_immediate_transforms; ++i) { @@ -248,7 +248,7 @@ bool cv_process::postprocess(cv::Mat& image) { bool ok = true; const bool lazy_normalization = to_fuse_normalizer_with_copy(); - const unsigned int n_immediate_transforms + const unsigned int n_immediate_transforms = (lazy_normalization? m_normalizer_idx : m_transforms.size()); // If normalizer is the last transform in the preprocessing pipeline, it will diff --git a/src/data_readers/cv_process_patches.cpp b/src/data_readers/cv_process_patches.cpp index 39bb1051e69..08a227741a9 100644 --- a/src/data_readers/cv_process_patches.cpp +++ b/src/data_readers/cv_process_patches.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_resizer.cpp b/src/data_readers/cv_resizer.cpp index 7d3cd1c9b08..e3c12c0844a 100644 --- a/src/data_readers/cv_resizer.cpp +++ b/src/data_readers/cv_resizer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -61,7 +61,7 @@ void cv_resizer::set(const unsigned int width, const unsigned int height, } void cv_resizer::reset() { - m_enabled = false; + m_enabled = false; m_interpolation = m_interpolation_choices[0]; } @@ -115,4 +115,3 @@ std::ostream& cv_resizer::print(std::ostream& os) const { } // end of namespace lbann #endif // LBANN_HAS_OPENCV - diff --git a/src/data_readers/cv_subtractor.cpp b/src/data_readers/cv_subtractor.cpp index 7eb24826ff2..b52e1c1391c 100644 --- a/src/data_readers/cv_subtractor.cpp +++ b/src/data_readers/cv_subtractor.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_transform.cpp b/src/data_readers/cv_transform.cpp index 3c6378cdf6e..1a0774b2813 100644 --- a/src/data_readers/cv_transform.cpp +++ b/src/data_readers/cv_transform.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/cv_utils.cpp b/src/data_readers/cv_utils.cpp index 30048b40dcd..9a730775344 100644 --- a/src/data_readers/cv_utils.cpp +++ b/src/data_readers/cv_utils.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader.cpp b/src/data_readers/data_reader.cpp index df99a65be19..bcdef9d9b68 100644 --- a/src/data_readers/data_reader.cpp +++ b/src/data_readers/data_reader.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_ascii.cpp b/src/data_readers/data_reader_ascii.cpp index b5d80416e2c..854c6348861 100644 --- a/src/data_readers/data_reader_ascii.cpp +++ b/src/data_readers/data_reader_ascii.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_cifar10.cpp b/src/data_readers/data_reader_cifar10.cpp index fb4cb32a6e6..5b69c79d7c3 100644 --- a/src/data_readers/data_reader_cifar10.cpp +++ b/src/data_readers/data_reader_cifar10.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_csv.cpp b/src/data_readers/data_reader_csv.cpp index 25c67bcc7d7..3b1b80b37fd 100644 --- a/src/data_readers/data_reader_csv.cpp +++ b/src/data_readers/data_reader_csv.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_image.cpp b/src/data_readers/data_reader_image.cpp index c0e40476091..596d08d344f 100644 --- a/src/data_readers/data_reader_image.cpp +++ b/src/data_readers/data_reader_image.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_imagenet.cpp b/src/data_readers/data_reader_imagenet.cpp index 3ee457f15d9..fc46023737e 100644 --- a/src/data_readers/data_reader_imagenet.cpp +++ b/src/data_readers/data_reader_imagenet.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_imagenet_patches.cpp b/src/data_readers/data_reader_imagenet_patches.cpp index 6c4be8ee89d..f577474ba04 100644 --- a/src/data_readers/data_reader_imagenet_patches.cpp +++ b/src/data_readers/data_reader_imagenet_patches.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_jag.cpp b/src/data_readers/data_reader_jag.cpp index c6a0708b305..1003d4eb90e 100644 --- a/src/data_readers/data_reader_jag.cpp +++ b/src/data_readers/data_reader_jag.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_jag_conduit.cpp b/src/data_readers/data_reader_jag_conduit.cpp index da9ba831993..b9214a680aa 100644 --- a/src/data_readers/data_reader_jag_conduit.cpp +++ b/src/data_readers/data_reader_jag_conduit.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_merge_features.cpp b/src/data_readers/data_reader_merge_features.cpp index 4e501932ab2..6f444a04b7f 100644 --- a/src/data_readers/data_reader_merge_features.cpp +++ b/src/data_readers/data_reader_merge_features.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_merge_samples.cpp b/src/data_readers/data_reader_merge_samples.cpp index be3416ed120..ec6560968d7 100644 --- a/src/data_readers/data_reader_merge_samples.cpp +++ b/src/data_readers/data_reader_merge_samples.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Semy_num_readersity, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Semy_num_readersity, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_mesh.cpp b/src/data_readers/data_reader_mesh.cpp index c31f9ffff1c..1d3d2318294 100644 --- a/src/data_readers/data_reader_mesh.cpp +++ b/src/data_readers/data_reader_mesh.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_mnist.cpp b/src/data_readers/data_reader_mnist.cpp index a1a8edf4308..b7b0612efac 100644 --- a/src/data_readers/data_reader_mnist.cpp +++ b/src/data_readers/data_reader_mnist.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_mnist_siamese.cpp b/src/data_readers/data_reader_mnist_siamese.cpp index 960f303ef93..9f7f2fce6a4 100644 --- a/src/data_readers/data_reader_mnist_siamese.cpp +++ b/src/data_readers/data_reader_mnist_siamese.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_moving_mnist.cpp b/src/data_readers/data_reader_moving_mnist.cpp index bd61492db2c..b570f826e4e 100644 --- a/src/data_readers/data_reader_moving_mnist.cpp +++ b/src/data_readers/data_reader_moving_mnist.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_multi_images.cpp b/src/data_readers/data_reader_multi_images.cpp index 707f6702b69..f1f5208758f 100644 --- a/src/data_readers/data_reader_multi_images.cpp +++ b/src/data_readers/data_reader_multi_images.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_multihead_siamese.cpp b/src/data_readers/data_reader_multihead_siamese.cpp index 059ac7c5edf..cdb4c582042 100644 --- a/src/data_readers/data_reader_multihead_siamese.cpp +++ b/src/data_readers/data_reader_multihead_siamese.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_nci.cpp b/src/data_readers/data_reader_nci.cpp index 0a42e3d4342..7993bbee23b 100644 --- a/src/data_readers/data_reader_nci.cpp +++ b/src/data_readers/data_reader_nci.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_numpy.cpp b/src/data_readers/data_reader_numpy.cpp index 9b144c0354b..8f7b9715977 100644 --- a/src/data_readers/data_reader_numpy.cpp +++ b/src/data_readers/data_reader_numpy.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_numpy_npz.cpp b/src/data_readers/data_reader_numpy_npz.cpp index c62ba3708a3..695242dd2bd 100644 --- a/src/data_readers/data_reader_numpy_npz.cpp +++ b/src/data_readers/data_reader_numpy_npz.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_numpy_npz_conduit.cpp b/src/data_readers/data_reader_numpy_npz_conduit.cpp index 43406b86238..79dfd8196ec 100644 --- a/src/data_readers/data_reader_numpy_npz_conduit.cpp +++ b/src/data_readers/data_reader_numpy_npz_conduit.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -83,19 +83,19 @@ void numpy_npz_conduit_reader::load() { if (! (opts->get_bool("preload_data_store") || opts->get_bool("use_data_store"))) { LBANN_ERROR("numpy_npz_conduit_reader requires data_store; please pass either --use_data_store or --preload_data_store on the cmd line"); - } + } //dah - for now, I assume the input file contains, on each line, the complete // pathname of an npz file. This will no doubt change in the future. // I'd like to call load_list_of_samples(), but the sample_list class - // is too specialized -- it checks data in a manner particular to + // is too specialized -- it checks data in a manner particular to // conduit, and that doesn't apply here. std::string infile = get_data_filename(); read_filelist(m_comm, infile, m_filenames); - // fills in: m_num_samples, m_num_features, m_num_response_features, - // m_data_dims, m_data_word_size, m_response_word_size + // fills in: m_num_samples, m_num_features, m_num_response_features, + // m_data_dims, m_data_word_size, m_response_word_size fill_in_metadata(); if (m_num_labels == 0 && !opts->get_bool("preload_data_store") && opts->get_bool("use_data_store")) { @@ -162,7 +162,7 @@ void numpy_npz_conduit_reader::preload_data_store() { if (t < my_min) { my_min = t; } if (t > my_max) { my_max = t; } } - int trainer_min = m_comm->trainer_allreduce(my_min, El::mpi::MIN); + int trainer_min = m_comm->trainer_allreduce(my_min, El::mpi::MIN); int trainer_max = m_comm->trainer_allreduce(my_max, El::mpi::MAX); // dah - commenting out sanity checks, as I don't know if they're @@ -217,7 +217,7 @@ bool numpy_npz_conduit_reader::fetch_datum(Mat& X, int data_id, int mb_idx) { // will through an exception TODO: relook later if (priming_data_store() || m_model->get_execution_mode() == execution_mode::testing) { m_data_store->set_conduit_node(data_id, node); - } + } } const char *char_data = node[LBANN_DATA_ID_STR(data_id) + "/data/data"].value(); @@ -232,7 +232,7 @@ bool numpy_npz_conduit_reader::fetch_datum(Mat& X, int data_id, int mb_idx) { LBANN_OMP_PARALLEL_FOR for(int j = 0; j < m_num_features; j++) { dest[j] = data[j] * m_scaling_factor_int16; - } + } } else { void *data = (void*)char_data_2; @@ -297,7 +297,7 @@ bool numpy_npz_conduit_reader::fetch_response(Mat& Y, int data_id, int mb_idx) { const char *char_data = node[LBANN_DATA_ID_STR(data_id) + "/responses/data"].value(); void *responses = (void*)char_data; //char *char_data_2 = const_cast(char_data); - //void *responses = (void*) + //void *responses = (void*) /* if (m_response_word_size == 4) { responses = (void *) reinterpret_cast(char_data_2); @@ -348,7 +348,7 @@ void numpy_npz_conduit_reader::fill_in_metadata() { // Ensure we understand the word sizes size_t word_size = node[LBANN_DATA_ID_STR(data_id) + "/data/word_size"].value(); if (!(word_size == 2 || word_size == 4 || word_size == 8)) { - LBANN_ERROR("numpy_npz_conduit_reader: word size " + + LBANN_ERROR("numpy_npz_conduit_reader: word size " + std::to_string(word_size) + " not supported"); } m_data_word_size = word_size; diff --git a/src/data_readers/data_reader_pilot2_molecular.cpp b/src/data_readers/data_reader_pilot2_molecular.cpp index 5e60c1fc027..e48a56610e1 100644 --- a/src/data_readers/data_reader_pilot2_molecular.cpp +++ b/src/data_readers/data_reader_pilot2_molecular.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_python.cpp b/src/data_readers/data_reader_python.cpp index c432b37f145..13853fd0a65 100644 --- a/src/data_readers/data_reader_python.cpp +++ b/src/data_readers/data_reader_python.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_synthetic.cpp b/src/data_readers/data_reader_synthetic.cpp index bf1999d0349..d8f3ea207d4 100644 --- a/src/data_readers/data_reader_synthetic.cpp +++ b/src/data_readers/data_reader_synthetic.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/data_reader_triplet.cpp b/src/data_readers/data_reader_triplet.cpp index 6d1b97eb43e..f2ee426a594 100644 --- a/src/data_readers/data_reader_triplet.cpp +++ b/src/data_readers/data_reader_triplet.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/image_preprocessor.cpp b/src/data_readers/image_preprocessor.cpp index ce9f4d018fa..5166ab6ed8e 100644 --- a/src/data_readers/image_preprocessor.cpp +++ b/src/data_readers/image_preprocessor.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/image_utils.cpp b/src/data_readers/image_utils.cpp index e15879ff0f1..64102e334c5 100644 --- a/src/data_readers/image_utils.cpp +++ b/src/data_readers/image_utils.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/lbann_data_generator.cpp b/src/data_readers/lbann_data_generator.cpp index 70330cafdd5..f215248d906 100644 --- a/src/data_readers/lbann_data_generator.cpp +++ b/src/data_readers/lbann_data_generator.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/numpy_conduit_converter.cpp b/src/data_readers/numpy_conduit_converter.cpp index 3f746760285..25ddf445689 100644 --- a/src/data_readers/numpy_conduit_converter.cpp +++ b/src/data_readers/numpy_conduit_converter.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -29,7 +29,7 @@ #include "lbann/utils/exception.hpp" #include "lbann/data_store/data_store_conduit.hpp" #include - + namespace lbann { //static diff --git a/src/data_readers/offline_patches_npz.cpp b/src/data_readers/offline_patches_npz.cpp index 2734eb115ab..506623d547a 100644 --- a/src/data_readers/offline_patches_npz.cpp +++ b/src/data_readers/offline_patches_npz.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -41,7 +41,7 @@ offline_patches_npz::offline_patches_npz(size_t npatches, std::string divider) m_num_patches = npatches; m_variant_divider = divider; } - + offline_patches_npz::offline_patches_npz(size_t npatches) : m_checked_ok(false), m_lbann_format(false) { diff --git a/src/data_readers/patchworks/patchworks.cpp b/src/data_readers/patchworks/patchworks.cpp index 3264f0d30e8..40fa91cea9f 100644 --- a/src/data_readers/patchworks/patchworks.cpp +++ b/src/data_readers/patchworks/patchworks.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/patchworks/patchworks_ROI.cpp b/src/data_readers/patchworks/patchworks_ROI.cpp index e7e3b6e8b0c..e9084640af3 100644 --- a/src/data_readers/patchworks/patchworks_ROI.cpp +++ b/src/data_readers/patchworks/patchworks_ROI.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/patchworks/patchworks_patch_descriptor.cpp b/src/data_readers/patchworks/patchworks_patch_descriptor.cpp index 915655e3413..42751ebe550 100644 --- a/src/data_readers/patchworks/patchworks_patch_descriptor.cpp +++ b/src/data_readers/patchworks/patchworks_patch_descriptor.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_readers/patchworks/patchworks_stats.cpp b/src/data_readers/patchworks/patchworks_stats.cpp index cea8384e86b..9216fbceab0 100644 --- a/src/data_readers/patchworks/patchworks_stats.cpp +++ b/src/data_readers/patchworks/patchworks_stats.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/data_store/data_store_conduit.cpp b/src/data_store/data_store_conduit.cpp index ff6a04dc01e..1bf930cd932 100644 --- a/src/data_store/data_store_conduit.cpp +++ b/src/data_store/data_store_conduit.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -57,7 +57,7 @@ data_store_conduit::data_store_conduit( m_trainer_master = m_comm->am_trainer_master(); m_rank_in_trainer = m_comm->get_rank_in_trainer(); m_np_in_trainer = m_comm->get_procs_per_trainer(); - + options *opts = options::get(); m_super_node = opts->get_bool("super_node"); @@ -369,12 +369,12 @@ const conduit::Node & data_store_conduit::get_conduit_node(int data_id) const { std::unordered_map::const_iterator t3 = m_data.find(data_id); if (t3 == m_data.end()) { LBANN_ERROR("failed to find data_id: " + std::to_string(data_id) + " in m_data; m_data.size: " + std::to_string(m_data.size())); - } + } return t3->second; } std::unordered_map::const_iterator t2 = m_minibatch_data.find(data_id); - // if not preloaded, and get_label() or get_response() is called, + // if not preloaded, and get_label() or get_response() is called, // we need to check m_data if (t2 == m_minibatch_data.end()) { std::unordered_map::const_iterator t3 = m_data.find(data_id); diff --git a/src/io/data_buffers/generic_io_buffer.cpp b/src/io/data_buffers/generic_io_buffer.cpp index d6bce674ee7..c45322da2b2 100644 --- a/src/io/data_buffers/generic_io_buffer.cpp +++ b/src/io/data_buffers/generic_io_buffer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/io/data_buffers/partitioned_io_buffer.cpp b/src/io/data_buffers/partitioned_io_buffer.cpp index c7b4538a090..a57bfab9e06 100644 --- a/src/io/data_buffers/partitioned_io_buffer.cpp +++ b/src/io/data_buffers/partitioned_io_buffer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/io/file_io.cpp b/src/io/file_io.cpp index 56ab2e76adf..7761fcc53c8 100644 --- a/src/io/file_io.cpp +++ b/src/io/file_io.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/io/persist.cpp b/src/io/persist.cpp index 59feb807240..87513600bcd 100644 --- a/src/io/persist.cpp +++ b/src/io/persist.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/activations.cpp b/src/layers/activations/activations.cpp index b0e799e6c9b..6b45f0c0b63 100644 --- a/src/layers/activations/activations.cpp +++ b/src/layers/activations/activations.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/activations.cu b/src/layers/activations/activations.cu index 6657babcae8..16696e11910 100644 --- a/src/layers/activations/activations.cu +++ b/src/layers/activations/activations.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/elu.cpp b/src/layers/activations/elu.cpp index 3ab074f0fc3..4a4083b8a78 100644 --- a/src/layers/activations/elu.cpp +++ b/src/layers/activations/elu.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/elu.cu b/src/layers/activations/elu.cu index b24ef0cf51e..f6d6f1581fb 100644 --- a/src/layers/activations/elu.cu +++ b/src/layers/activations/elu.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/leaky_relu.cpp b/src/layers/activations/leaky_relu.cpp index 08083a8d80a..e808e35a017 100644 --- a/src/layers/activations/leaky_relu.cpp +++ b/src/layers/activations/leaky_relu.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/leaky_relu.cu b/src/layers/activations/leaky_relu.cu index 8adbdd1b778..e87d9a39af0 100644 --- a/src/layers/activations/leaky_relu.cu +++ b/src/layers/activations/leaky_relu.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/log_softmax.cpp b/src/layers/activations/log_softmax.cpp index 53e41eac449..737d1ec1045 100644 --- a/src/layers/activations/log_softmax.cpp +++ b/src/layers/activations/log_softmax.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/log_softmax.cu b/src/layers/activations/log_softmax.cu index 83f08c99c88..d7ce82c5f9c 100644 --- a/src/layers/activations/log_softmax.cu +++ b/src/layers/activations/log_softmax.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/softmax.cpp b/src/layers/activations/softmax.cpp index 90ea3a560b6..e56788fd43f 100644 --- a/src/layers/activations/softmax.cpp +++ b/src/layers/activations/softmax.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/activations/softmax.cu b/src/layers/activations/softmax.cu index 8ef0f909ebe..a58d38c760a 100644 --- a/src/layers/activations/softmax.cu +++ b/src/layers/activations/softmax.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/image/bilinear_resize.cpp b/src/layers/image/bilinear_resize.cpp index c3ffbb36b19..4e293070d1c 100644 --- a/src/layers/image/bilinear_resize.cpp +++ b/src/layers/image/bilinear_resize.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/image/bilinear_resize.cu b/src/layers/image/bilinear_resize.cu index f970875aa50..166b87c753c 100644 --- a/src/layers/image/bilinear_resize.cu +++ b/src/layers/image/bilinear_resize.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -48,7 +48,7 @@ __global__ void fp_kernel(El::Int num_samples, constexpr DataType one = 1; const El::Int gid = threadIdx.x + blockIdx.x * blockDim.x; const El::Int num_threads = blockDim.x * gridDim.x; - + // Stride between interpolation points const auto& x_stride = static_cast(input_width) / output_width; const auto& y_stride = static_cast(input_height) / output_height; @@ -74,7 +74,7 @@ __global__ void fp_kernel(El::Int num_samples, const auto input_row = static_cast(cuda::floor(y - half)); const auto& input_row0 = cuda::max(input_row, El::Int(0)); const auto& input_row1 = cuda::min(input_row+1, input_height-1); - + // Interpolation point relative to input pixel centers const auto& unit_x = x - (input_col + half); const auto& unit_y = y - (input_row + half); @@ -106,14 +106,14 @@ __global__ void fp_kernel(El::Int num_samples, + pixel01 * unit_x * (one - unit_y) + pixel10 * (one - unit_x) * unit_y + pixel11 * unit_x * unit_y); - + } - -} - + } - +} + + template <> void bilinear_resize_layer::fp_compute() { @@ -153,7 +153,7 @@ void bilinear_resize_layer::fp_comp m_height, m_width, local_output.Buffer(), local_output.LDim()); } - + } - + } // namespace lbann diff --git a/src/layers/layer.cpp b/src/layers/layer.cpp index d18d7cd889a..2fabfe77505 100644 --- a/src/layers/layer.cpp +++ b/src/layers/layer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/learning/fully_connected.cpp b/src/layers/learning/fully_connected.cpp index a9551de873c..730a58631be 100644 --- a/src/layers/learning/fully_connected.cpp +++ b/src/layers/learning/fully_connected.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/categorical_accuracy.cpp b/src/layers/loss/categorical_accuracy.cpp index 4234d50030d..f10f80c599c 100644 --- a/src/layers/loss/categorical_accuracy.cpp +++ b/src/layers/loss/categorical_accuracy.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/categorical_accuracy.cu b/src/layers/loss/categorical_accuracy.cu index 870ff989b1d..c91f3359bce 100644 --- a/src/layers/loss/categorical_accuracy.cu +++ b/src/layers/loss/categorical_accuracy.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -49,7 +49,7 @@ __global__ void fill_indices_kernel(El::Int local_height, indices[row + col*local_height] = col_shift + row * col_stride; } } - + /** Find largest entry within each CUDA block. * Each block is assigned several entries from the same mini-batch * sample and it finds the largest entry. Results are output to @@ -73,7 +73,7 @@ __global__ void reduce_max_entries_kernel(El::Int height, El::Int width, const El::Int bidy = blockIdx.y; const El::Int nthreadsx = blockDim.x * gridDim.x; const El::Int nblocksx = gridDim.x; - + // Reduce each matrix column independently for (El::Int col = bidy; col < width; col += gridDim.y) { @@ -115,7 +115,7 @@ __global__ void reduce_max_entries_kernel(El::Int height, El::Int width, } } - + } /** Compute sample-wise categorical accuracy. @@ -137,7 +137,7 @@ __global__ void compute_accuracy_kernel(El::Int local_width, DataType(1) : DataType(0)); } } - + /** GPU implementation of categorical accuracy layer forward prop. */ void fp_gpu(lbann_comm& comm, const AbsDistMat& predictions, @@ -154,7 +154,7 @@ void fp_gpu(lbann_comm& comm, const auto& local_height = local_predictions.Height(); const auto& local_width = local_predictions.Width(); if (local_width < 1) { return; } - + // Column communicator auto&& col_comm = predictions.ColComm(); const auto& col_comm_rank = El::mpi::Rank(col_comm); @@ -361,7 +361,7 @@ void fp_gpu(lbann_comm& comm, prediction_inds.data().get(), label_inds.data().get(), local_loss.Buffer(), local_loss.LDim()); } - + } } // namespace diff --git a/src/layers/loss/cross_entropy.cpp b/src/layers/loss/cross_entropy.cpp index 4190b9076a4..65eda604540 100644 --- a/src/layers/loss/cross_entropy.cpp +++ b/src/layers/loss/cross_entropy.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/cross_entropy.cu b/src/layers/loss/cross_entropy.cu index db90a46d314..73ba9e2d226 100644 --- a/src/layers/loss/cross_entropy.cu +++ b/src/layers/loss/cross_entropy.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -39,7 +39,7 @@ __global__ void fp_kernel(int height, int width, const DataType* __restrict__ ground_truth, int ground_truth_ldim, DataType* __restrict__ contribution) { - + // Indices const int tid = threadIdx.x; const int gidx = threadIdx.x + blockIdx.x * blockDim.x; @@ -72,11 +72,11 @@ __global__ void fp_kernel(int height, int width, if (tid == 0) { cuda::atomic_add(&contribution[col], shared_contribution[0]); } - + } - + } - + void local_fp_gpu(const AbsMat& local_prediction, const AbsMat& local_ground_truth, AbsMat& local_contribution) { @@ -110,7 +110,7 @@ __global__ void bp_kernel(int height, int width, int gradient_wrt_prediction_ldim, DataType* __restrict__ gradient_wrt_ground_truth, int gradient_wrt_ground_truth_ldim) { - + // Indices const int gidx = threadIdx.x + blockIdx.x * blockDim.x; const int bidy = blockIdx.y; @@ -128,7 +128,7 @@ __global__ void bp_kernel(int height, int width, dxhat = - dy * std::log(x); } } - + } void local_bp_gpu(const AbsMat& local_prediction, diff --git a/src/layers/loss/entrywise.cpp b/src/layers/loss/entrywise.cpp index f7dacbd5d18..112a9c6861f 100644 --- a/src/layers/loss/entrywise.cpp +++ b/src/layers/loss/entrywise.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/entrywise.cu b/src/layers/loss/entrywise.cu index 952707e1669..c206dc815f6 100644 --- a/src/layers/loss/entrywise.cu +++ b/src/layers/loss/entrywise.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/l1_norm.cpp b/src/layers/loss/l1_norm.cpp index 1c43504574a..1d20295719a 100644 --- a/src/layers/loss/l1_norm.cpp +++ b/src/layers/loss/l1_norm.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/l1_norm.cu b/src/layers/loss/l1_norm.cu index 54da2bc1dc7..1dfda1aac6e 100644 --- a/src/layers/loss/l1_norm.cu +++ b/src/layers/loss/l1_norm.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -36,7 +36,7 @@ __global__ void fp_kernel(El::Int local_height, const DataType* __restrict__ input, El::Int input_ldim, DataType* __restrict__ contribution) { - + // Indices const El::Int tid = threadIdx.x; const El::Int gidx = threadIdx.x + blockIdx.x * blockDim.x; @@ -66,11 +66,11 @@ __global__ void fp_kernel(El::Int local_height, if (tid == 0) { cuda::atomic_add(&contribution[col], shared_contribution[0]); } - + } - + } - + void local_fp_gpu(const AbsMat& local_input, AbsMat& local_contribution) { El::Zero(local_contribution); if (!local_input.IsEmpty()) { diff --git a/src/layers/loss/l2_norm2.cpp b/src/layers/loss/l2_norm2.cpp index 419a54805a2..258179d883f 100644 --- a/src/layers/loss/l2_norm2.cpp +++ b/src/layers/loss/l2_norm2.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/l2_norm2.cu b/src/layers/loss/l2_norm2.cu index 84fda9d3508..1a02a1096c2 100644 --- a/src/layers/loss/l2_norm2.cu +++ b/src/layers/loss/l2_norm2.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -36,7 +36,7 @@ __global__ void fp_kernel(El::Int local_height, const DataType* __restrict__ input, El::Int input_ldim, DataType* __restrict__ contribution) { - + // Indices const El::Int tid = threadIdx.x; const El::Int gidx = threadIdx.x + blockIdx.x * blockDim.x; @@ -66,11 +66,11 @@ __global__ void fp_kernel(El::Int local_height, if (tid == 0) { cuda::atomic_add(&contribution[col], shared_contribution[0]); } - + } - + } - + void local_fp_gpu(const AbsMat& local_input, AbsMat& local_contribution) { El::Zero(local_contribution); if (!local_input.IsEmpty()) { diff --git a/src/layers/loss/mean_absolute_error.cpp b/src/layers/loss/mean_absolute_error.cpp index 2e60c7c4c78..e497f11add6 100644 --- a/src/layers/loss/mean_absolute_error.cpp +++ b/src/layers/loss/mean_absolute_error.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/mean_absolute_error.cu b/src/layers/loss/mean_absolute_error.cu index 9eb7adc2f78..ba7c224c899 100644 --- a/src/layers/loss/mean_absolute_error.cu +++ b/src/layers/loss/mean_absolute_error.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -38,7 +38,7 @@ __global__ void fp_kernel(int global_height, const DataType* __restrict__ ground_truth, int ground_truth_ldim, DataType* __restrict__ contribution) { - + // Indices const int tid = threadIdx.x; const int gidx = threadIdx.x + blockIdx.x * blockDim.x; @@ -70,11 +70,11 @@ __global__ void fp_kernel(int global_height, shared_contribution[0] /= global_height; cuda::atomic_add(&contribution[col], shared_contribution[0]); } - + } - + } - + void local_fp_gpu(El::Int height, const AbsMat& local_prediction, const AbsMat& local_ground_truth, @@ -110,7 +110,7 @@ __global__ void bp_kernel(int global_height, int gradient_wrt_prediction_ldim, DataType* __restrict__ gradient_wrt_ground_truth, int gradient_wrt_ground_truth_ldim) { - + // Indices const int gidx = threadIdx.x + blockIdx.x * blockDim.x; const int bidy = blockIdx.y; @@ -136,7 +136,7 @@ __global__ void bp_kernel(int global_height, } } } - + } void local_bp_gpu(El::Int height, diff --git a/src/layers/loss/mean_squared_error.cpp b/src/layers/loss/mean_squared_error.cpp index a662e5139cd..19df1b60b4c 100644 --- a/src/layers/loss/mean_squared_error.cpp +++ b/src/layers/loss/mean_squared_error.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/mean_squared_error.cu b/src/layers/loss/mean_squared_error.cu index 98a5ab149fa..024b676b39f 100644 --- a/src/layers/loss/mean_squared_error.cu +++ b/src/layers/loss/mean_squared_error.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -38,7 +38,7 @@ __global__ void fp_kernel(int global_height, const DataType* __restrict__ ground_truth, int ground_truth_ldim, DataType* __restrict__ contribution) { - + // Indices const int tid = threadIdx.x; const int gidx = threadIdx.x + blockIdx.x * blockDim.x; @@ -70,11 +70,11 @@ __global__ void fp_kernel(int global_height, shared_contribution[0] /= global_height; cuda::atomic_add(&contribution[col], shared_contribution[0]); } - + } - + } - + void local_fp_gpu(El::Int height, const AbsMat& local_prediction, const AbsMat& local_ground_truth, @@ -110,7 +110,7 @@ __global__ void bp_kernel(int global_height, int gradient_wrt_prediction_ldim, DataType* __restrict__ gradient_wrt_ground_truth, int gradient_wrt_ground_truth_ldim) { - + // Indices const int gidx = threadIdx.x + blockIdx.x * blockDim.x; const int bidy = blockIdx.y; @@ -128,7 +128,7 @@ __global__ void bp_kernel(int global_height, dxhat = - 2 * err * dy / global_height; } } - + } void local_bp_gpu(El::Int height, diff --git a/src/layers/loss/top_k_categorical_accuracy.cpp b/src/layers/loss/top_k_categorical_accuracy.cpp index 602c08ef6bb..9cad631a78c 100644 --- a/src/layers/loss/top_k_categorical_accuracy.cpp +++ b/src/layers/loss/top_k_categorical_accuracy.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/loss/top_k_categorical_accuracy.cu b/src/layers/loss/top_k_categorical_accuracy.cu index db0ffeec781..7ea4f64a77a 100644 --- a/src/layers/loss/top_k_categorical_accuracy.cu +++ b/src/layers/loss/top_k_categorical_accuracy.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/math/binary.cpp b/src/layers/math/binary.cpp index dd36627d899..774bc7c7bf5 100644 --- a/src/layers/math/binary.cpp +++ b/src/layers/math/binary.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/math/binary.cu b/src/layers/math/binary.cu index 005e7ec3642..401ea2c94b8 100644 --- a/src/layers/math/binary.cu +++ b/src/layers/math/binary.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/math/clamp.cpp b/src/layers/math/clamp.cpp index 17b6b7072f2..0815cc2ee61 100644 --- a/src/layers/math/clamp.cpp +++ b/src/layers/math/clamp.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/math/clamp.cu b/src/layers/math/clamp.cu index 0174a99e45b..31e4064f745 100644 --- a/src/layers/math/clamp.cu +++ b/src/layers/math/clamp.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/math/unary.cpp b/src/layers/math/unary.cpp index c622999d8df..f0d8954e0dd 100644 --- a/src/layers/math/unary.cpp +++ b/src/layers/math/unary.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/math/unary.cu b/src/layers/math/unary.cu index 4844ac67eb8..143381522e7 100644 --- a/src/layers/math/unary.cu +++ b/src/layers/math/unary.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/misc/channelwise_mean.cpp b/src/layers/misc/channelwise_mean.cpp index 0d2af9a8bb5..fa9561ef6c6 100644 --- a/src/layers/misc/channelwise_mean.cpp +++ b/src/layers/misc/channelwise_mean.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/misc/channelwise_mean.cu b/src/layers/misc/channelwise_mean.cu index d67f2b8b2e4..e4aa15c3850 100644 --- a/src/layers/misc/channelwise_mean.cu +++ b/src/layers/misc/channelwise_mean.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/misc/covariance.cpp b/src/layers/misc/covariance.cpp index 74ece68121a..5387a7f5605 100644 --- a/src/layers/misc/covariance.cpp +++ b/src/layers/misc/covariance.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/misc/covariance.cu b/src/layers/misc/covariance.cu index c750b7b7b1c..4d1b544922c 100644 --- a/src/layers/misc/covariance.cu +++ b/src/layers/misc/covariance.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -46,7 +46,7 @@ __global__ void mean_contribution_kernel(El::Int height, const DataType* __restrict__ input1, El::Int input1_ldim, DataType* __restrict__ contribution) { - + // Indices const El::Int tid = threadIdx.x; const El::Int gidx = threadIdx.x + blockIdx.x * blockDim.x; @@ -55,7 +55,7 @@ __global__ void mean_contribution_kernel(El::Int height, // Compute local contribution for each matrix column for (El::Int col = bidy; col < width; col += gridDim.y) { - + // Compute contributions for each thread DataType private_contribution0 = 0; DataType private_contribution1 = 0; @@ -63,7 +63,7 @@ __global__ void mean_contribution_kernel(El::Int height, private_contribution0 += input0[row + col * input0_ldim]; private_contribution1 += input1[row + col * input1_ldim]; } - + // Shared memory reduction to get contribution for each block /// @todo unroll loops __shared__ DataType shared_contribution0[block_size]; @@ -83,11 +83,11 @@ __global__ void mean_contribution_kernel(El::Int height, cuda::atomic_add(&contribution[2*col+1], scale * shared_contribution1[0]); } - + } - + } - + /** Compute local contributions to covariances. */ template __global__ void covariance_contribution_kernel(El::Int height, @@ -99,7 +99,7 @@ __global__ void covariance_contribution_kernel(El::Int height, El::Int input1_ldim, const DataType* __restrict__ means, DataType* __restrict__ contribution) { - + // Indices const El::Int tid = threadIdx.x; const El::Int gidx = threadIdx.x + blockIdx.x * blockDim.x; @@ -110,7 +110,7 @@ __global__ void covariance_contribution_kernel(El::Int height, for (El::Int col = bidy; col < width; col += gridDim.y) { const auto& mean0 = means[2*col]; const auto& mean1 = means[2*col+1]; - + // Compute contributions for each thread DataType private_contribution = 0; for (El::Int row = gidx; row < height; row += nthreadsx) { @@ -133,9 +133,9 @@ __global__ void covariance_contribution_kernel(El::Int height, cuda::atomic_add(&contribution[col], scale * shared_contribution[0]); } - + } - + } /** Compute gradients w.r.t. inputs. */ @@ -170,7 +170,7 @@ void covariance_backprop_kernel(El::Int height, dx1 = dy * scale * (x0 - mean0); } } - + /** GPU forward prop implementation. * We use a two-pass algorithm since it is more numerically stable * than the naive single-pass algorithm. @@ -187,7 +187,7 @@ void fp_gpu(const AbsDistMat& input0, const auto& local_input1 = static_cast(input1.LockedMatrix()); auto& local_means = static_cast(means.Matrix()); auto& local_workspace = static_cast(workspace.Matrix()); - + // Dimensions const auto& height = input0.Height(); const auto& width = input0.Width(); @@ -235,7 +235,7 @@ void fp_gpu(const AbsDistMat& input0, } El::AllReduce(workspace, workspace.RedundantComm()); El::Copy(workspace, output); - + } /** GPU backprop implementation. @@ -257,7 +257,7 @@ void bp_gpu(const AbsDistMat& input0, auto& local_gradient_wrt_input1 = static_cast(gradient_wrt_input1.Matrix()); const auto& local_means = static_cast(means.LockedMatrix()); auto& local_workspace = static_cast(workspace.Matrix()); - + // Dimensions const auto& height = input0.Height(); const auto& local_height = local_input0.Height(); @@ -285,7 +285,7 @@ void bp_gpu(const AbsDistMat& input0, } } // namespace - + template <> void covariance_layer ::fp_compute() { diff --git a/src/layers/misc/variance.cpp b/src/layers/misc/variance.cpp index 8c80b611e47..49e4f7e8f9e 100644 --- a/src/layers/misc/variance.cpp +++ b/src/layers/misc/variance.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/misc/variance.cu b/src/layers/misc/variance.cu index f30192737c7..02ace16d465 100644 --- a/src/layers/misc/variance.cu +++ b/src/layers/misc/variance.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -38,7 +38,7 @@ __global__ void variance_contribution_kernel(El::Int height, El::Int input_ldim, const DataType* __restrict__ means, DataType* __restrict__ contribution) { - + // Indices const El::Int tid = threadIdx.x; const El::Int gidx = threadIdx.x + blockIdx.x * blockDim.x; @@ -48,7 +48,7 @@ __global__ void variance_contribution_kernel(El::Int height, // Compute local contribution for each matrix column for (El::Int col = bidy; col < width; col += gridDim.y) { const auto& mean = means[col]; - + // Compute contributions for each thread DataType private_contribution = 0; for (El::Int row = gidx; row < height; row += nthreadsx) { @@ -70,9 +70,9 @@ __global__ void variance_contribution_kernel(El::Int height, cuda::atomic_add(&contribution[col], scale * shared_contribution[0]); } - + } - + } __global__ @@ -98,7 +98,7 @@ void variance_backprop_kernel(El::Int height, dx = dy * scale * (x - mean); } } - + /** GPU forward prop implementation. * We use a two-pass algorithm since it is more numerically stable * than the naive single-pass algorithm. @@ -113,7 +113,7 @@ void fp_gpu(const AbsDistMat& input, const auto& local_input = static_cast(input.LockedMatrix()); auto& local_means = static_cast(means.Matrix()); auto& local_workspace = static_cast(workspace.Matrix()); - + // Dimensions const auto& height = input.Height(); const auto& width = input.Width(); @@ -155,7 +155,7 @@ void fp_gpu(const AbsDistMat& input, } El::AllReduce(workspace, workspace.RedundantComm()); El::Copy(workspace, output); - + } /** GPU backprop implementation. @@ -173,7 +173,7 @@ void bp_gpu(const AbsDistMat& input, auto& local_gradient_wrt_input = static_cast(gradient_wrt_input.Matrix()); const auto& local_means = static_cast(means.LockedMatrix()); auto& local_workspace = static_cast(workspace.Matrix()); - + // Dimensions const auto& height = input.Height(); const auto& local_height = local_input.Height(); @@ -199,7 +199,7 @@ void bp_gpu(const AbsDistMat& input, } } // namespace - + template <> void variance_layer ::fp_compute() { diff --git a/src/layers/regularizers/batch_normalization.cpp b/src/layers/regularizers/batch_normalization.cpp index f08e7d634e2..5d1535f01c7 100644 --- a/src/layers/regularizers/batch_normalization.cpp +++ b/src/layers/regularizers/batch_normalization.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/regularizers/batch_normalization.cu b/src/layers/regularizers/batch_normalization.cu index b44900e8372..ae679ec1c64 100644 --- a/src/layers/regularizers/batch_normalization.cu +++ b/src/layers/regularizers/batch_normalization.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/transform/crop.cpp b/src/layers/transform/crop.cpp index 2065d32b68e..b319cee2985 100644 --- a/src/layers/transform/crop.cpp +++ b/src/layers/transform/crop.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -27,7 +27,7 @@ #include "lbann/layers/transform/crop.hpp" namespace lbann { - + template <> void crop_layer::fp_compute_3d() { fp_compute_nd(); diff --git a/src/layers/transform/crop.cu b/src/layers/transform/crop.cu index fc6e9dfde34..460b7e4404c 100644 --- a/src/layers/transform/crop.cu +++ b/src/layers/transform/crop.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -66,7 +66,7 @@ __global__ void fp_compute_3d_kernel( offz = min(max(offz, El::Int(0)), num_offsets_z - 1); offy = min(max(offy, El::Int(0)), num_offsets_y - 1); offx = min(max(offx, El::Int(0)), num_offsets_x - 1); - + // Iterate through output entries in mini-batch sample for (El::Int output_pos = gidx; output_pos < output_size; @@ -89,10 +89,10 @@ __global__ void fp_compute_3d_kernel( // Copy entry output_entry = input_entry; - + } } - + } /** CUDA kernel for 3D tensor crop backprop. @@ -130,7 +130,7 @@ __global__ void bp_compute_3d_kernel( offz = min(max(offz, El::Int(0)), num_offsets_z - 1); offy = min(max(offy, El::Int(0)), num_offsets_y - 1); offx = min(max(offx, El::Int(0)), num_offsets_x - 1); - + // Iterate through output entries in mini-batch sample for (El::Int output_pos = gidx; output_pos < output_size; @@ -153,14 +153,14 @@ __global__ void bp_compute_3d_kernel( // Copy entry input_entry = output_entry; - + } } - + } - + } // namespace - + template <> void crop_layer::fp_compute_3d() { @@ -190,7 +190,7 @@ void crop_layer::fp_compute_3d() { local_output.Buffer(), local_output.LDim(), local_crop_pos.LockedBuffer(), local_crop_pos.LDim()); } - + } template <> @@ -204,7 +204,7 @@ void crop_layer::bp_compute_3d() { const auto& local_gradient_wrt_output = get_local_prev_error_signals(); const auto& local_crop_pos = get_local_prev_activations(1); auto& local_gradient_wrt_input = get_local_error_signals(0); - + // Tensor dimensions const auto& local_width = local_gradient_wrt_input.Width(); const auto input_dims = get_input_dims(); @@ -226,7 +226,7 @@ void crop_layer::bp_compute_3d() { local_gradient_wrt_input.Buffer(), local_gradient_wrt_input.LDim(), local_crop_pos.LockedBuffer(), local_crop_pos.LDim()); } - + } } // namespace lbann diff --git a/src/layers/transform/evaluation.cpp b/src/layers/transform/evaluation.cpp index 93114cabf0f..9bbae41007d 100644 --- a/src/layers/transform/evaluation.cpp +++ b/src/layers/transform/evaluation.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/transform/in_top_k.cpp b/src/layers/transform/in_top_k.cpp index 331a4dafacc..0ce65b1e454 100644 --- a/src/layers/transform/in_top_k.cpp +++ b/src/layers/transform/in_top_k.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/transform/in_top_k.cu b/src/layers/transform/in_top_k.cu index fdc9aa54ad8..1331f1c18ee 100644 --- a/src/layers/transform/in_top_k.cu +++ b/src/layers/transform/in_top_k.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/transform/sort.cpp b/src/layers/transform/sort.cpp index bbe611aed5d..72aa76835da 100644 --- a/src/layers/transform/sort.cpp +++ b/src/layers/transform/sort.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/transform/sort.cu b/src/layers/transform/sort.cu index 32227b044b8..d8aeb743438 100644 --- a/src/layers/transform/sort.cu +++ b/src/layers/transform/sort.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -46,11 +46,11 @@ void sort_layer auto& local_indices = *m_indices; const auto& local_height = local_input.Height(); const auto& local_width = local_input.Width(); - + // GPU objects auto&& stream = El::GPUManager::Stream(); cuda::thrust::allocator<> alloc(stream); - + // Sort each matrix column El::Copy(local_input, local_output); for (El::Int col = 0; col < local_width; ++col) { @@ -68,7 +68,7 @@ void sort_layer ::thrust::less()); } } - + } template <> @@ -81,11 +81,11 @@ void sort_layer const auto& local_indices = *m_indices; const auto& local_height = local_gradient_wrt_input.Height(); const auto& local_width = local_gradient_wrt_input.Width(); - + // GPU objects auto&& stream = El::GPUManager::Stream(); cuda::thrust::allocator<> alloc(stream); - + // Scatter gradients based on sorted indices for (El::Int col = 0; col < local_width; ++col) { const ::thrust::device_ptr inds(m_indices->LockedBuffer(0, col)); @@ -95,7 +95,7 @@ void sort_layer grad_wrt_out, grad_wrt_out + local_height, inds, grad_wrt_in); } - + } } // namespace lbann diff --git a/src/layers/transform/tessellate.cpp b/src/layers/transform/tessellate.cpp index 9398dc4e686..6c5c0dd09c9 100644 --- a/src/layers/transform/tessellate.cpp +++ b/src/layers/transform/tessellate.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/layers/transform/tessellate.cu b/src/layers/transform/tessellate.cu index 5e52047039e..94f4bd7110b 100644 --- a/src/layers/transform/tessellate.cu +++ b/src/layers/transform/tessellate.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/metrics/layer_metric.cpp b/src/metrics/layer_metric.cpp index a0d0a924ca5..16e193d185b 100644 --- a/src/metrics/layer_metric.cpp +++ b/src/metrics/layer_metric.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/metrics/metric.cpp b/src/metrics/metric.cpp index 8a103497d7b..80c75d5df8f 100644 --- a/src/metrics/metric.cpp +++ b/src/metrics/metric.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/models/directed_acyclic_graph.cpp b/src/models/directed_acyclic_graph.cpp index 3fb25f2cd52..cf0b8d623d9 100644 --- a/src/models/directed_acyclic_graph.cpp +++ b/src/models/directed_acyclic_graph.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/models/model.cpp b/src/models/model.cpp index 7dcbcaa8f77..7d8f163d920 100644 --- a/src/models/model.cpp +++ b/src/models/model.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/objective_functions/layer_term.cpp b/src/objective_functions/layer_term.cpp index 52e63135190..74d3edb9d9a 100644 --- a/src/objective_functions/layer_term.cpp +++ b/src/objective_functions/layer_term.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -62,7 +62,7 @@ abstract_evaluation_layer& layer_term::get_evaluation_layer() { } return *eval; } - + void layer_term::setup(model& m) { objective_function_term::setup(m); get_evaluation_layer().set_scale(m_scale_factor); diff --git a/src/objective_functions/objective_function.cpp b/src/objective_functions/objective_function.cpp index 3507de264b7..2c642070389 100644 --- a/src/objective_functions/objective_function.cpp +++ b/src/objective_functions/objective_function.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/objective_functions/objective_function_term.cpp b/src/objective_functions/objective_function_term.cpp index 9d492e9a1e1..67b6f649ac9 100644 --- a/src/objective_functions/objective_function_term.cpp +++ b/src/objective_functions/objective_function_term.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/objective_functions/weight_regularization/l2.cpp b/src/objective_functions/weight_regularization/l2.cpp index 52559def033..288c5adc4cd 100644 --- a/src/objective_functions/weight_regularization/l2.cpp +++ b/src/objective_functions/weight_regularization/l2.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/objective_functions/weight_regularization/l2.cu b/src/objective_functions/weight_regularization/l2.cu index 7d632504a71..f459a80ebc2 100644 --- a/src/objective_functions/weight_regularization/l2.cu +++ b/src/objective_functions/weight_regularization/l2.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -69,11 +69,11 @@ __global__ void accumulate_contribution_kernel(El::Int height, if (tid == 0) { cuda::atomic_add(contribution, shared_contribution[0]); } - + } - + } // namespace - + template <> void l2_weight_regularization::accumulate_contribution(const GPUMat& vals, GPUMat& contribution) { @@ -90,5 +90,5 @@ void l2_weight_regularization::accumulate_contribution(const GP contribution.Buffer()); } } - + } // namespace lbann diff --git a/src/optimizers/adagrad.cpp b/src/optimizers/adagrad.cpp index b42ed735aa2..49198956f82 100644 --- a/src/optimizers/adagrad.cpp +++ b/src/optimizers/adagrad.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/adagrad.cu b/src/optimizers/adagrad.cu index 568a28a0080..39360e1f2be 100644 --- a/src/optimizers/adagrad.cu +++ b/src/optimizers/adagrad.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/adam.cpp b/src/optimizers/adam.cpp index d0b3444f22e..37a6c912f5c 100644 --- a/src/optimizers/adam.cpp +++ b/src/optimizers/adam.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/adam.cu b/src/optimizers/adam.cu index 4d4cfd9aec5..335ea3fcd6f 100644 --- a/src/optimizers/adam.cu +++ b/src/optimizers/adam.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/hypergradient_adam.cpp b/src/optimizers/hypergradient_adam.cpp index db3d9762e96..0da3b9852bb 100644 --- a/src/optimizers/hypergradient_adam.cpp +++ b/src/optimizers/hypergradient_adam.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/optimizer.cpp b/src/optimizers/optimizer.cpp index fc52a90fe21..7320ddbe696 100644 --- a/src/optimizers/optimizer.cpp +++ b/src/optimizers/optimizer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/rmsprop.cpp b/src/optimizers/rmsprop.cpp index e28dc17a481..870af9f0470 100644 --- a/src/optimizers/rmsprop.cpp +++ b/src/optimizers/rmsprop.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/rmsprop.cu b/src/optimizers/rmsprop.cu index 4d53511d20b..f312c43d103 100644 --- a/src/optimizers/rmsprop.cu +++ b/src/optimizers/rmsprop.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/sgd.cpp b/src/optimizers/sgd.cpp index b1ebf3b744b..147a7ee2937 100644 --- a/src/optimizers/sgd.cpp +++ b/src/optimizers/sgd.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/optimizers/sgd.cu b/src/optimizers/sgd.cu index 88f40a62207..8a51f93cf6e 100644 --- a/src/optimizers/sgd.cu +++ b/src/optimizers/sgd.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/proto/factories/callback_factory.cpp b/src/proto/factories/callback_factory.cpp index afd1f7ec370..6a3eb421f61 100644 --- a/src/proto/factories/callback_factory.cpp +++ b/src/proto/factories/callback_factory.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/proto/factories/factories.cpp b/src/proto/factories/factories.cpp index 629e419ac00..617e639d8c1 100644 --- a/src/proto/factories/factories.cpp +++ b/src/proto/factories/factories.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/proto/factories/layer_factory.cpp b/src/proto/factories/layer_factory.cpp index 7cd2b2782fe..2521314d2ae 100644 --- a/src/proto/factories/layer_factory.cpp +++ b/src/proto/factories/layer_factory.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/proto/factories/layer_graph_factory.cpp b/src/proto/factories/layer_graph_factory.cpp index 4a384a2acd5..5e8c12dd98e 100644 --- a/src/proto/factories/layer_graph_factory.cpp +++ b/src/proto/factories/layer_graph_factory.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/proto/factories/model_factory.cpp b/src/proto/factories/model_factory.cpp index 5d92a9e1802..c3ceb22e725 100644 --- a/src/proto/factories/model_factory.cpp +++ b/src/proto/factories/model_factory.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/proto/factories/objective_function_factory.cpp b/src/proto/factories/objective_function_factory.cpp index c284538fcc3..9ca69a151bf 100644 --- a/src/proto/factories/objective_function_factory.cpp +++ b/src/proto/factories/objective_function_factory.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/proto/factories/optimizer_factory.cpp b/src/proto/factories/optimizer_factory.cpp index 8ba69185168..a4215b4e644 100644 --- a/src/proto/factories/optimizer_factory.cpp +++ b/src/proto/factories/optimizer_factory.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/proto/factories/weights_factory.cpp b/src/proto/factories/weights_factory.cpp index a5e19ffb5c1..17ded03f1ae 100644 --- a/src/proto/factories/weights_factory.cpp +++ b/src/proto/factories/weights_factory.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -31,7 +31,7 @@ namespace proto { namespace { -/** Construct a weights initialization specified with prototext. */ +/** Construct a weights initialization specified with prototext. */ weights_initializer* construct_initializer(const lbann_data::Weights& proto_weights) { // Constant initialization @@ -45,7 +45,7 @@ weights_initializer* construct_initializer(const lbann_data::Weights& proto_weig const auto& params = proto_weights.value_initializer(); return new value_initializer(parse_list(params.values())); } - + // Random initialization if (proto_weights.has_uniform_initializer()) { const auto& params = proto_weights.uniform_initializer(); @@ -94,7 +94,7 @@ weights* construct_weights(lbann_comm* comm, // Instantiate weights weights* w = new weights(comm); - + // Set weights name if provided const auto& name = proto_weights.name(); const auto& parsed_name = parse_list(name); diff --git a/src/proto/init_image_data_readers.cpp b/src/proto/init_image_data_readers.cpp index 78480470b59..65a13c52d80 100644 --- a/src/proto/init_image_data_readers.cpp +++ b/src/proto/init_image_data_readers.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -318,8 +318,8 @@ void init_image_data_reader(const lbann_data::Reader& pb_readme, const lbann_dat std::shared_ptr pp; // set up the image preprocessor - if ((name == "imagenet") || (name == "jag_conduit") || - (name == "multihead_siamese") || (name == "mnist_siamese") || + if ((name == "imagenet") || (name == "jag_conduit") || + (name == "multihead_siamese") || (name == "mnist_siamese") || (name == "multi_images") || (name == "moving_mnist")) { pp = std::make_shared(); } else if (name == "imagenet_patches") { diff --git a/src/utils/cnpy_utils.cpp b/src/utils/cnpy_utils.cpp index 153d0f7ca96..a9936a7a269 100644 --- a/src/utils/cnpy_utils.cpp +++ b/src/utils/cnpy_utils.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/cublas.cpp b/src/utils/cublas.cpp index 5a7fa981cfe..765b02d9ae3 100644 --- a/src/utils/cublas.cpp +++ b/src/utils/cublas.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/cuda.cu b/src/utils/cuda.cu index 23fc459bfac..2838f6e1f58 100644 --- a/src/utils/cuda.cu +++ b/src/utils/cuda.cu @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -50,7 +50,7 @@ event_wrapper& event_wrapper::operator=(const event_wrapper& other) { if (!other.query()) { record(m_stream); } return *this; } - + event_wrapper::~event_wrapper() { cudaEventDestroy(m_event); } diff --git a/src/utils/cudnn.cpp b/src/utils/cudnn.cpp index ee7f5956cec..90debc6dc68 100644 --- a/src/utils/cudnn.cpp +++ b/src/utils/cudnn.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/description.cpp b/src/utils/description.cpp index ef78662a86d..d572216b7ea 100644 --- a/src/utils/description.cpp +++ b/src/utils/description.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/exception.cpp b/src/utils/exception.cpp index eb68ab6917a..93a71aaa3a1 100644 --- a/src/utils/exception.cpp +++ b/src/utils/exception.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -29,7 +29,7 @@ #include "lbann/comm.hpp" namespace lbann { - + exception::exception(std::string message, bool print) : m_message(message), m_stack_trace(stack_trace::get()) { @@ -46,7 +46,7 @@ exception::exception(std::string message, bool print) // Print report to standard error stream if (print) { print_report(std::cerr); } - + } const char* exception::what() const noexcept { diff --git a/src/utils/file_utils.cpp b/src/utils/file_utils.cpp index 76472794ebd..b2c806f9ac5 100644 --- a/src/utils/file_utils.cpp +++ b/src/utils/file_utils.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/graph.cpp b/src/utils/graph.cpp index 949eca3f3ab..1987676a0a8 100644 --- a/src/utils/graph.cpp +++ b/src/utils/graph.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/im2col.cpp b/src/utils/im2col.cpp index 409692eedc9..aa374dd0ccf 100644 --- a/src/utils/im2col.cpp +++ b/src/utils/im2col.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/lbann_library.cpp b/src/utils/lbann_library.cpp index 3034d621191..5c82d30c8b2 100644 --- a/src/utils/lbann_library.cpp +++ b/src/utils/lbann_library.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/number_theory.cpp b/src/utils/number_theory.cpp index 31e93b109fe..5e39d255ec9 100644 --- a/src/utils/number_theory.cpp +++ b/src/utils/number_theory.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -33,7 +33,7 @@ namespace lbann { namespace number_theory { int prime(int n) { - if (n < 0) { + if (n < 0) { std::stringstream err; err << "invalid index (" << n << ")"; LBANN_ERROR(err.str()); @@ -64,7 +64,7 @@ int prime(int n) { } std::vector prime_factors(int n) { - if (n < 2) { + if (n < 2) { std::stringstream err; err << "invalid number to factorize (" << n << ")"; LBANN_ERROR(err.str()); @@ -98,7 +98,7 @@ std::vector balanced_factors(int n, int num_factors) { // Trivial case when n = 1 if (n == 1) { return std::vector(num_factors, 1); }; - + // Get prime factorization const auto& primes = prime_factors(n); diff --git a/src/utils/omp_diagnostics.cpp b/src/utils/omp_diagnostics.cpp index b95e9296208..77b6ce6a2bc 100644 --- a/src/utils/omp_diagnostics.cpp +++ b/src/utils/omp_diagnostics.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/profiling.cpp b/src/utils/profiling.cpp index 17ec1e53ac8..cc237411778 100644 --- a/src/utils/profiling.cpp +++ b/src/utils/profiling.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/protobuf_utils.cpp b/src/utils/protobuf_utils.cpp index 84feb007eff..f93b62609ed 100644 --- a/src/utils/protobuf_utils.cpp +++ b/src/utils/protobuf_utils.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/random.cpp b/src/utils/random.cpp index 69a945e99d0..799bf06d43e 100644 --- a/src/utils/random.cpp +++ b/src/utils/random.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/stack_trace.cpp b/src/utils/stack_trace.cpp index eb57c1621f3..bb6a3a2be91 100644 --- a/src/utils/stack_trace.cpp +++ b/src/utils/stack_trace.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -74,10 +74,10 @@ std::string get() { ss << std::endl; } std::free(symbols); - + return ss.str(); } - + namespace { /** Get human-readable description of signal. */ @@ -119,19 +119,19 @@ std::string signal_description(int signal) { SIGNAL_CASE(SIGURG, "high bandwidth data is available at a socket"); SIGNAL_CASE(SIGXCPU, "CPU time limit exceeded"); SIGNAL_CASE(SIGXFSZ, "file size limit exceeded"); -#undef SIGNAL_CASE +#undef SIGNAL_CASE // Construct signal description std::stringstream ss; ss << "signal " << signal; if (!desc.empty()) { ss << " (" << desc << ")"; } return ss.str(); - + } /** Base name for stack trace output file. */ std::string stack_trace_file_base = ""; - + /** Signal handler. * Output signal name and stack trace to standard error and to a file * (if desired). @@ -158,7 +158,7 @@ void handle_signal(int signal) { // Terminate program El::mpi::Abort(El::mpi::COMM_WORLD, 1); - + } } // namespace @@ -181,8 +181,8 @@ void register_signal_handler(std::string file_base) { for (const auto& signal : fatal_signals) { sigaction(signal, &sa, nullptr); } - + } -} //namespace stack_trace +} //namespace stack_trace } //namespace lbann diff --git a/src/utils/statistics.cpp b/src/utils/statistics.cpp index 6a0de434834..f4ec27d3f0f 100644 --- a/src/utils/statistics.cpp +++ b/src/utils/statistics.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/summary.cpp b/src/utils/summary.cpp index edb3642adbd..fddb0446882 100644 --- a/src/utils/summary.cpp +++ b/src/utils/summary.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/utils/threads/thread_utils.cpp b/src/utils/threads/thread_utils.cpp index db4a4756bdf..1c1cf18165e 100644 --- a/src/utils/threads/thread_utils.cpp +++ b/src/utils/threads/thread_utils.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/weights/initializer.cpp b/src/weights/initializer.cpp index bdf13768142..01c49c72db3 100644 --- a/src/weights/initializer.cpp +++ b/src/weights/initializer.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/weights/variance_scaling_initializers.cpp b/src/weights/variance_scaling_initializers.cpp index 14cb11fdafd..278a81f5a11 100644 --- a/src/weights/variance_scaling_initializers.cpp +++ b/src/weights/variance_scaling_initializers.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/src/weights/weights.cpp b/src/weights/weights.cpp index d2414870122..ee5fa776e0c 100644 --- a/src/weights/weights.cpp +++ b/src/weights/weights.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/test_numpy_conduit_cache.cpp b/test_numpy_conduit_cache.cpp index 5de3c179c80..79928889029 100644 --- a/test_numpy_conduit_cache.cpp +++ b/test_numpy_conduit_cache.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tests/test_shuffled_indices.cpp b/tests/test_shuffled_indices.cpp index 662db6f4716..d260a341f01 100644 --- a/tests/test_shuffled_indices.cpp +++ b/tests/test_shuffled_indices.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tests/test_stack_tracing/test_lbann_exception_tracing.cpp b/tests/test_stack_tracing/test_lbann_exception_tracing.cpp index 8ab22a97546..634182a54f8 100644 --- a/tests/test_stack_tracing/test_lbann_exception_tracing.cpp +++ b/tests/test_stack_tracing/test_lbann_exception_tracing.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tests/test_stack_tracing/test_sigint_tracing.cpp b/tests/test_stack_tracing/test_sigint_tracing.cpp index c7b6ca5e5ab..bdf6526a8eb 100644 --- a/tests/test_stack_tracing/test_sigint_tracing.cpp +++ b/tests/test_stack_tracing/test_sigint_tracing.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) { options *opts = options::get(); opts->init(argc, argv); - //must be called after opts->init(); must also specify "--catch-signals" + //must be called after opts->init(); must also specify "--catch-signals" //on cmd line stack_trace::register_handler(); diff --git a/tests/test_stack_tracing/test_sigsev_tracing.cpp b/tests/test_stack_tracing/test_sigsev_tracing.cpp index 5ccdb29be67..e6e1d153454 100644 --- a/tests/test_stack_tracing/test_sigsev_tracing.cpp +++ b/tests/test_stack_tracing/test_sigsev_tracing.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) { options *opts = options::get(); opts->init(argc, argv); - //must be called after opts->init(); must also specify "--catch-signals" + //must be called after opts->init(); must also specify "--catch-signals" //on cmd line stack_trace::register_handler(); diff --git a/tools/compute_mean/compute_mean.cpp b/tools/compute_mean/compute_mean.cpp index 5b24467e529..a5533cfa903 100644 --- a/tools/compute_mean/compute_mean.cpp +++ b/tools/compute_mean/compute_mean.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/file_utils.hpp b/tools/compute_mean/file_utils.hpp index 37fa89cae00..fadda6826bd 100644 --- a/tools/compute_mean/file_utils.hpp +++ b/tools/compute_mean/file_utils.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/image_list.cpp b/tools/compute_mean/image_list.cpp index e1b0b5e90b6..26bd744bbc7 100644 --- a/tools/compute_mean/image_list.cpp +++ b/tools/compute_mean/image_list.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/image_list.hpp b/tools/compute_mean/image_list.hpp index eba7477cb2c..99e15210396 100644 --- a/tools/compute_mean/image_list.hpp +++ b/tools/compute_mean/image_list.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/lbann/base.hpp b/tools/compute_mean/lbann/base.hpp index 0e97ec8a77b..8a942ffd58b 100644 --- a/tools/compute_mean/lbann/base.hpp +++ b/tools/compute_mean/lbann/base.hpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////////xecu -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/lbann/utils/exception.hpp b/tools/compute_mean/lbann/utils/exception.hpp index 238cc38eea5..b46b1d6d5e0 100644 --- a/tools/compute_mean/lbann/utils/exception.hpp +++ b/tools/compute_mean/lbann/utils/exception.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/lbann/utils/random.cpp b/tools/compute_mean/lbann/utils/random.cpp index 1ee547ad85a..21092142969 100644 --- a/tools/compute_mean/lbann/utils/random.cpp +++ b/tools/compute_mean/lbann/utils/random.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/lbann/utils/random.hpp b/tools/compute_mean/lbann/utils/random.hpp index da2a80b3b6d..05012751658 100644 --- a/tools/compute_mean/lbann/utils/random.hpp +++ b/tools/compute_mean/lbann/utils/random.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/mean_image.cpp b/tools/compute_mean/mean_image.cpp index 9ab70d68a80..fe1d471313f 100644 --- a/tools/compute_mean/mean_image.cpp +++ b/tools/compute_mean/mean_image.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/mean_image.hpp b/tools/compute_mean/mean_image.hpp index 2b4a65ebba0..d0b2beee4c7 100644 --- a/tools/compute_mean/mean_image.hpp +++ b/tools/compute_mean/mean_image.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/mpi_states.cpp b/tools/compute_mean/mpi_states.cpp index 9a63561e124..8ddb587aa39 100644 --- a/tools/compute_mean/mpi_states.cpp +++ b/tools/compute_mean/mpi_states.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/mpi_states.hpp b/tools/compute_mean/mpi_states.hpp index fd85895f22a..f4c7b9d94e5 100644 --- a/tools/compute_mean/mpi_states.hpp +++ b/tools/compute_mean/mpi_states.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/params.cpp b/tools/compute_mean/params.cpp index be345851c95..5ee3bd21033 100644 --- a/tools/compute_mean/params.cpp +++ b/tools/compute_mean/params.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/params.hpp b/tools/compute_mean/params.hpp index 1617896df26..66e171e9714 100644 --- a/tools/compute_mean/params.hpp +++ b/tools/compute_mean/params.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/process_images.cpp b/tools/compute_mean/process_images.cpp index d642f5dd7b5..480ae3f5dfd 100644 --- a/tools/compute_mean/process_images.cpp +++ b/tools/compute_mean/process_images.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/process_images.hpp b/tools/compute_mean/process_images.hpp index 7f08cc75816..f6173a67588 100644 --- a/tools/compute_mean/process_images.hpp +++ b/tools/compute_mean/process_images.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/text_read.hpp b/tools/compute_mean/text_read.hpp index 3377c52f039..bfe1f69217d 100644 --- a/tools/compute_mean/text_read.hpp +++ b/tools/compute_mean/text_read.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/uniform_mean.cpp b/tools/compute_mean/uniform_mean.cpp index 5203b6dcc04..3b360d18d06 100644 --- a/tools/compute_mean/uniform_mean.cpp +++ b/tools/compute_mean/uniform_mean.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. @@ -71,7 +71,7 @@ cv::Scalar reduce_image(const cv::Mat image) { /** * Scale the mean pixel to the depth of the output image with the adjustment for rounding. - * Convert to the unit scale if to_unit_scale is set when in_depth is of integral and + * Convert to the unit scale if to_unit_scale is set when in_depth is of integral and * out_depth is of float. */ cv::Scalar scale_pixel(const cv::Scalar pixel_m, const int in_depth, const int out_depth) { diff --git a/tools/compute_mean/walltimes.cpp b/tools/compute_mean/walltimes.cpp index fae81b6ede5..5ffef72bc96 100644 --- a/tools/compute_mean/walltimes.cpp +++ b/tools/compute_mean/walltimes.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file. diff --git a/tools/compute_mean/walltimes.hpp b/tools/compute_mean/walltimes.hpp index 36f969b3133..0b7487d56a6 100644 --- a/tools/compute_mean/walltimes.hpp +++ b/tools/compute_mean/walltimes.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////// -// Copyright (c) 2014-2016, Lawrence Livermore National Security, LLC. +// Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC. // Produced at the Lawrence Livermore National Laboratory. // Written by the LBANN Research Team (B. Van Essen, et al.) listed in // the CONTRIBUTORS file.