[mlpack-git] master: Update the connection trait and there is no need to reset the delta, we already reset the delta in the network class (cnn, ffn). (67ab14a)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Jul 1 16:29:35 EDT 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/cf08dc96724f70468c8e31ced1761ed000b55b18...222a7e191f8a7925a4870ce1acbd68589899dfde

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

commit 67ab14a013a8be7b0caf831166c0973cf26263d8
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Mon Jun 29 20:11:07 2015 +0200

    Update the connection trait and there is no need to reset the delta, we already reset the delta in the network class (cnn, ffn).


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

67ab14a013a8be7b0caf831166c0973cf26263d8
 src/mlpack/methods/ann/connections/pooling_connection.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mlpack/methods/ann/connections/pooling_connection.hpp b/src/mlpack/methods/ann/connections/pooling_connection.hpp
index 5f5f3d2..7b37a8d 100644
--- a/src/mlpack/methods/ann/connections/pooling_connection.hpp
+++ b/src/mlpack/methods/ann/connections/pooling_connection.hpp
@@ -1,5 +1,5 @@
 /**
- * @file cnn_pooling_connection.hpp
+ * @file pooling_connection.hpp
  * @author Shangtong Zhang
  * @author Marcus Edel
  *
@@ -97,7 +97,6 @@ class PoolingConnection
   template<typename eT>
   void FeedBackward(const arma::Mat<eT>& error)
   {
-    delta.zeros();
     Unpooling(inputLayer.InputActivation(), error, inputLayer.Delta());
   }
 
@@ -110,7 +109,6 @@ class PoolingConnection
   template<typename eT>
   void FeedBackward(const arma::Cube<eT>& error)
   {
-    delta.zeros();
     for (size_t s = 0; s < error.n_slices; s++)
     {
       Unpooling(inputLayer.InputActivation().slice(s), error.slice(s),
@@ -266,6 +264,7 @@ class ConnectionTraits<
   static const bool IsSelfConnection = false;
   static const bool IsFullselfConnection = false;
   static const bool IsPoolingConnection = true;
+  static const bool IsIdentityConnection = false;
 };
 
 }; // namespace ann



More information about the mlpack-git mailing list