[mlpack-git] master: merge from mlpack (115b38b)

gitdub at mlpack.org gitdub at mlpack.org
Tue Mar 1 09:17:12 EST 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/a2e57d617e952f1ea2fda8a23e1c6bd2f78beb6d...1bedf15126f6bd0bc93a3233914ac95486a3c0da

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

commit 115b38b123afdd9dbee3472674f146ff3674673b
Merge: dbffa87 a2e57d6
Author: stereomatchingkiss <stereomatchingkiss at gmail.com>
Date:   Tue Mar 1 22:17:12 2016 +0800

    merge from mlpack


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

115b38b123afdd9dbee3472674f146ff3674673b
 README.md                                          |  2 +-
 src/mlpack/methods/ann/layer/conv_layer.hpp        | 20 ------------------
 src/mlpack/methods/ann/layer/dropout_layer.hpp     | 16 ---------------
 src/mlpack/methods/ann/layer/linear_layer.hpp      | 14 -------------
 src/mlpack/methods/ann/layer/lstm_layer.hpp        | 15 --------------
 .../ann/layer/multiclass_classification_layer.hpp  |  0
 src/mlpack/methods/ann/layer/one_hot_layer.hpp     |  0
 src/mlpack/methods/ann/layer/pooling_layer.hpp     | 24 ++++++++--------------
 src/mlpack/methods/ann/layer/recurrent_layer.hpp   |  0
 src/mlpack/methods/ann/layer/softmax_layer.hpp     | 14 -------------
 src/mlpack/methods/ann/layer/sparse_bias_layer.hpp | 14 -------------
 .../methods/ann/layer/sparse_input_layer.hpp       | 15 --------------
 .../methods/ann/layer/sparse_output_layer.hpp      | 17 ---------------
 13 files changed, 9 insertions(+), 142 deletions(-)

diff --cc src/mlpack/methods/ann/layer/pooling_layer.hpp
index 729235a,64add9b..d091e63
--- a/src/mlpack/methods/ann/layer/pooling_layer.hpp
+++ b/src/mlpack/methods/ann/layer/pooling_layer.hpp
@@@ -171,6 -155,6 +155,14 @@@ class PoolingLaye
    {    			
    }
    
++  /**
++   * Serialize the layer
++   */
++  template<typename Archive>
++  void Serialize(Archive& ar, const unsigned int /* version */)
++  {    				
++  }
++
   private:
    /**
     * Apply pooling to the input and store the results.




More information about the mlpack-git mailing list