[mlpack-git] master: Merge remote-tracking branch 'upstream/master' (638381a)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/4c8a8d1ccbc33916794fe0f6142fa5378ff8503d...93eb34cc4daf08cc331d1a22fccf44950b276daa

>---------------------------------------------------------------

commit 638381a37263a53c17d21484166ec1353a3e44c8
Merge: 24e6092 f0675d7
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date:   Thu Apr 7 17:15:21 2016 +0300

    Merge remote-tracking branch 'upstream/master'


>---------------------------------------------------------------

638381a37263a53c17d21484166ec1353a3e44c8
 CMake/ARMA_FindACML.cmake                          |  38 +--
 CMake/ARMA_FindACMLMP.cmake                        |  38 +--
 CMake/ARMA_FindARPACK.cmake                        |  36 +-
 CMake/ARMA_FindBLAS.cmake                          |  40 +--
 CMake/ARMA_FindCBLAS.cmake                         |  42 +--
 CMake/ARMA_FindCLAPACK.cmake                       |  44 +--
 CMake/ARMA_FindLAPACK.cmake                        |  40 +--
 CMake/ARMA_FindMKL.cmake                           |  80 ++---
 CMake/ARMA_FindOpenBLAS.cmake                      |  38 +--
 CMake/CreateArmaConfigInfo.cmake                   |  22 +-
 CMake/CreateGitVersionHeader.cmake                 |   8 +-
 CMake/FindArmadillo.cmake                          |  41 ++-
 CMake/FindBfd.cmake                                |   2 +-
 CMake/FindLibDL.cmake                              |   4 +-
 CMake/FindMatlabMex.cmake                          |  84 ++---
 CMake/ModifyMatlabPathdef.cmake                    |   4 +-
 CMake/TargetDistclean.cmake                        |   8 +-
 CMakeLists.txt                                     |  75 ++--
 COPYRIGHT.txt                                      |   3 +
 HISTORY.md                                         |   6 +
 README.md                                          |   2 +-
 doc/guide/build.hpp                                |   9 +-
 src/mlpack/CMakeLists.txt                          |  10 +-
 src/mlpack/bindings/CMakeLists.txt                 |   2 +-
 src/mlpack/bindings/matlab/CMakeLists.txt          |  16 +-
 src/mlpack/core.hpp                                |   8 +-
 src/mlpack/core/arma_extend/arma_extend.hpp        |  15 +
 src/mlpack/core/data/load_impl.hpp                 |  16 +-
 src/mlpack/core/data/save_impl.hpp                 |  18 +-
 src/mlpack/core/optimizers/CMakeLists.txt          |   2 +
 .../{rmsprop => adadelta}/CMakeLists.txt           |   4 +-
 .../rmsprop.hpp => adadelta/ada_delta.hpp}         |  77 ++---
 .../ada_delta_impl.hpp}                            |  55 +--
 .../optimizers/{rmsprop => adam}/CMakeLists.txt    |   4 +-
 .../{rmsprop/rmsprop.hpp => adam/adam.hpp}         |  74 ++--
 .../rmsprop_impl.hpp => adam/adam_impl.hpp}        |  63 ++--
 .../minibatch_sgd/minibatch_sgd_impl.hpp           |  14 +-
 src/mlpack/core/tree/cosine_tree/cosine_tree.cpp   |  54 +--
 .../tree/rectangle_tree/rectangle_tree_impl.hpp    |   3 +-
 src/mlpack/core/util/backtrace.cpp                 |  25 +-
 src/mlpack/core/util/cli.cpp                       |   4 +-
 src/mlpack/core/util/cli.hpp                       |   9 -
 src/mlpack/core/util/timers.cpp                    | 192 ++---------
 src/mlpack/core/util/timers.hpp                    |  49 +--
 src/mlpack/methods/ann/CMakeLists.txt              |   1 -
 .../kathirvalavakumar_subavathi_init.hpp           |   9 +-
 src/mlpack/methods/ann/layer/CMakeLists.txt        |   2 +
 src/mlpack/methods/ann/layer/dropconnect_layer.hpp | 353 +++++++++++++++++++
 src/mlpack/methods/ann/layer/empty_layer.hpp       | 126 +++++++
 src/mlpack/methods/ann/optimizer/CMakeLists.txt    |  17 -
 src/mlpack/methods/ann/optimizer/ada_delta.hpp     | 175 ----------
 src/mlpack/methods/ann/optimizer/adam.hpp          | 177 ----------
 src/mlpack/methods/ann/optimizer/rmsprop.hpp       | 163 ---------
 .../methods/ann/optimizer/steepest_descent.hpp     | 146 --------
 src/mlpack/methods/kmeans/dual_tree_kmeans.hpp     |   2 +-
 .../methods/kmeans/dual_tree_kmeans_impl.hpp       |  34 +-
 src/mlpack/methods/kmeans/elkan_kmeans_impl.hpp    |   2 +-
 src/mlpack/methods/lsh/lsh_main.cpp                |   7 +-
 .../neighbor_search/neighbor_search_rules_impl.hpp |   2 +-
 src/mlpack/tests/CMakeLists.txt                    |   2 +
 src/mlpack/tests/activation_functions_test.cpp     |   1 -
 src/mlpack/tests/ada_delta_test.cpp                | 150 ++++----
 src/mlpack/tests/adam_test.cpp                     | 152 ++++-----
 src/mlpack/tests/cli_test.cpp                      |   7 +-
 src/mlpack/tests/connection_traits_test.cpp        |  82 -----
 src/mlpack/tests/cosine_tree_test.cpp              |  56 ++-
 src/mlpack/tests/feedforward_network_test.cpp      | 215 ++++++++++++
 src/mlpack/tests/hmm_test.cpp                      |   4 +-
 src/mlpack/tests/lsh_test.cpp                      | 376 ++++++++++++++++-----
 src/mlpack/tests/minibatch_sgd_test.cpp            |  23 ++
 70 files changed, 1902 insertions(+), 1760 deletions(-)