[mlpack-git] master: Build the convolutional neural network code. (42d61df)

[gitdub at big.cc.gt.atl.ga.us]

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/91ae1062772a0f2bbca9a072769629c2d775ae64...42d61dfdbc9b0cbce59398e67ea58544b0fa1919

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

commit 42d61dfdbc9b0cbce59398e67ea58544b0fa1919
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Thu Sep 3 14:35:22 2015 +0200

    Build the convolutional neural network code.


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

42d61dfdbc9b0cbce59398e67ea58544b0fa1919
 src/mlpack/methods/ann/CMakeLists.txt                              | 3 +++
 .../{performance_functions => convolution_rules}/CMakeLists.txt    | 7 ++++---
 src/mlpack/methods/ann/layer/CMakeLists.txt                        | 2 ++
 .../initialization_methods => ann/pooling_rules}/CMakeLists.txt    | 4 ++--
 src/mlpack/tests/CMakeLists.txt                                    | 1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/methods/ann/CMakeLists.txt b/src/mlpack/methods/ann/CMakeLists.txt
index 8389fd7..1fb782c 100644
--- a/src/mlpack/methods/ann/CMakeLists.txt
+++ b/src/mlpack/methods/ann/CMakeLists.txt
@@ -2,6 +2,7 @@
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
   ffn.hpp
+  cnn.hpp
   network_traits.hpp
 )
 
@@ -20,3 +21,5 @@ add_subdirectory(layer)
 add_subdirectory(optimizer)
 add_subdirectory(performance_functions)
 add_subdirectory(trainer)
+add_subdirectory(pooling_rules)
+add_subdirectory(convolution_rules)
diff --git a/src/mlpack/methods/ann/performance_functions/CMakeLists.txt b/src/mlpack/methods/ann/convolution_rules/CMakeLists.txt
similarity index 82%
copy from src/mlpack/methods/ann/performance_functions/CMakeLists.txt
copy to src/mlpack/methods/ann/convolution_rules/CMakeLists.txt
index 5047f81..4511bef 100644
--- a/src/mlpack/methods/ann/performance_functions/CMakeLists.txt
+++ b/src/mlpack/methods/ann/convolution_rules/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Define the files we need to compile
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
-  mse_function.hpp
-  sse_function.hpp
-  cee_function.hpp
+  border_modes.hpp
+  naive_convolution.hpp
+  fft_convolution.hpp
+  svd_convolution.hpp
 )
 
 # Add directory name to sources.
diff --git a/src/mlpack/methods/ann/layer/CMakeLists.txt b/src/mlpack/methods/ann/layer/CMakeLists.txt
index 82c63ae..ec51329 100644
--- a/src/mlpack/methods/ann/layer/CMakeLists.txt
+++ b/src/mlpack/methods/ann/layer/CMakeLists.txt
@@ -7,6 +7,8 @@ set(SOURCES
   bias_layer.hpp
   dropout_layer.hpp
   linear_layer.hpp
+  conv_layer.hpp
+  pooling_layer.hpp
 )
 
 # Add directory name to sources.
diff --git a/src/mlpack/methods/perceptron/initialization_methods/CMakeLists.txt b/src/mlpack/methods/ann/pooling_rules/CMakeLists.txt
similarity index 91%
copy from src/mlpack/methods/perceptron/initialization_methods/CMakeLists.txt
copy to src/mlpack/methods/ann/pooling_rules/CMakeLists.txt
index d5d9c31..70ed3eb 100644
--- a/src/mlpack/methods/perceptron/initialization_methods/CMakeLists.txt
+++ b/src/mlpack/methods/ann/pooling_rules/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Define the files we need to compile
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
-  random_init.hpp
-  zero_init.hpp
+  max_pooling.hpp
+  mean_pooling.hpp
 )
 
 # Add directory name to sources.
diff --git a/src/mlpack/tests/CMakeLists.txt b/src/mlpack/tests/CMakeLists.txt
index 60a1163..fa65a7d 100644
--- a/src/mlpack/tests/CMakeLists.txt
+++ b/src/mlpack/tests/CMakeLists.txt
@@ -10,6 +10,7 @@ add_executable(mlpack_test
   aug_lagrangian_test.cpp
   cf_test.cpp
   cli_test.cpp
+  convolutional_network_test.cpp
   cosine_tree_test.cpp
   decision_stump_test.cpp
   det_test.cpp