[mlpack-git] master: Add CMake files to build and test the activation functions. (459b7fe)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/967adc4746d7e638422cdf1c373d2865ff4e8d4c...459b7fece612ce048a922503bba1eb3626807cbb

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

commit 459b7fece612ce048a922503bba1eb3626807cbb
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Sat Aug 29 15:47:51 2015 +0200

    Add CMake files to build and test the activation functions.


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

459b7fece612ce048a922503bba1eb3626807cbb
 src/mlpack/methods/ann/CMakeLists.txt                            | 9 +++++++++
 .../initialization_methods => ann/init_rules}/CMakeLists.txt     | 3 +++
 src/mlpack/methods/{amf/init_rules => ann/layer}/CMakeLists.txt  | 9 ++++++---
 .../learning_policies => ann/optimizer}/CMakeLists.txt           | 2 +-
 .../methods/ann/{ => performance_functions}/CMakeLists.txt       | 5 +++--
 .../{perceptron/learning_policies => ann/trainer}/CMakeLists.txt | 2 +-
 src/mlpack/tests/CMakeLists.txt                                  | 1 +
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/mlpack/methods/ann/CMakeLists.txt b/src/mlpack/methods/ann/CMakeLists.txt
index 8424f69..b3aa79e 100644
--- a/src/mlpack/methods/ann/CMakeLists.txt
+++ b/src/mlpack/methods/ann/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Define the files we need to compile
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
+  ffn.hpp
+  network_traits.hpp
 )
 
 # Add directory name to sources.
@@ -13,3 +15,10 @@ endforeach()
 set(MLPACK_SRCS ${MLPACK_SRCS} ${DIR_SRCS} PARENT_SCOPE)
 
 add_subdirectory(activation_functions)
+add_subdirectory(convolution_rules)
+add_subdirectory(init_rules)
+add_subdirectory(layer)
+add_subdirectory(optimizer)
+add_subdirectory(performance_functions)
+add_subdirectory(trainer)
+add_subdirectory(pooling_rules)
diff --git a/src/mlpack/methods/perceptron/initialization_methods/CMakeLists.txt b/src/mlpack/methods/ann/init_rules/CMakeLists.txt
similarity index 85%
copy from src/mlpack/methods/perceptron/initialization_methods/CMakeLists.txt
copy to src/mlpack/methods/ann/init_rules/CMakeLists.txt
index d5d9c31..f3d6a98 100644
--- a/src/mlpack/methods/perceptron/initialization_methods/CMakeLists.txt
+++ b/src/mlpack/methods/ann/init_rules/CMakeLists.txt
@@ -2,6 +2,9 @@
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
   random_init.hpp
+  oivs_init.hpp
+  kathirvalavakumar_subavathi_init.hpp
+  nguyen_widrow_init.hpp
   zero_init.hpp
 )
 
diff --git a/src/mlpack/methods/amf/init_rules/CMakeLists.txt b/src/mlpack/methods/ann/layer/CMakeLists.txt
similarity index 76%
copy from src/mlpack/methods/amf/init_rules/CMakeLists.txt
copy to src/mlpack/methods/ann/layer/CMakeLists.txt
index f8ff4b6..82c63ae 100644
--- a/src/mlpack/methods/amf/init_rules/CMakeLists.txt
+++ b/src/mlpack/methods/ann/layer/CMakeLists.txt
@@ -1,9 +1,12 @@
 # Define the files we need to compile
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
-  random_init.hpp
-  random_acol_init.hpp
-  average_init.hpp
+  layer_traits.hpp
+  binary_classification_layer.hpp
+  base_layer.hpp
+  bias_layer.hpp
+  dropout_layer.hpp
+  linear_layer.hpp
 )
 
 # Add directory name to sources.
diff --git a/src/mlpack/methods/perceptron/learning_policies/CMakeLists.txt b/src/mlpack/methods/ann/optimizer/CMakeLists.txt
similarity index 93%
copy from src/mlpack/methods/perceptron/learning_policies/CMakeLists.txt
copy to src/mlpack/methods/ann/optimizer/CMakeLists.txt
index 119239d..f67cff1 100644
--- a/src/mlpack/methods/perceptron/learning_policies/CMakeLists.txt
+++ b/src/mlpack/methods/ann/optimizer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Define the files we need to compile
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
-  simple_weight_update.hpp
+  rmsprop.hpp
 )
 
 # Add directory name to sources.
diff --git a/src/mlpack/methods/ann/CMakeLists.txt b/src/mlpack/methods/ann/performance_functions/CMakeLists.txt
similarity index 88%
copy from src/mlpack/methods/ann/CMakeLists.txt
copy to src/mlpack/methods/ann/performance_functions/CMakeLists.txt
index 8424f69..5047f81 100644
--- a/src/mlpack/methods/ann/CMakeLists.txt
+++ b/src/mlpack/methods/ann/performance_functions/CMakeLists.txt
@@ -1,6 +1,9 @@
 # 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
 )
 
 # Add directory name to sources.
@@ -11,5 +14,3 @@ endforeach()
 # Append sources (with directory name) to list of all MLPACK sources (used at
 # the parent scope).
 set(MLPACK_SRCS ${MLPACK_SRCS} ${DIR_SRCS} PARENT_SCOPE)
-
-add_subdirectory(activation_functions)
diff --git a/src/mlpack/methods/perceptron/learning_policies/CMakeLists.txt b/src/mlpack/methods/ann/trainer/CMakeLists.txt
similarity index 93%
copy from src/mlpack/methods/perceptron/learning_policies/CMakeLists.txt
copy to src/mlpack/methods/ann/trainer/CMakeLists.txt
index 119239d..192ceb8 100644
--- a/src/mlpack/methods/perceptron/learning_policies/CMakeLists.txt
+++ b/src/mlpack/methods/ann/trainer/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Define the files we need to compile
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
-  simple_weight_update.hpp
+  trainer.hpp
 )
 
 # Add directory name to sources.
diff --git a/src/mlpack/tests/CMakeLists.txt b/src/mlpack/tests/CMakeLists.txt
index cdf09f5..0b766cd 100644
--- a/src/mlpack/tests/CMakeLists.txt
+++ b/src/mlpack/tests/CMakeLists.txt
@@ -1,6 +1,7 @@
 # MLPACK test executable.
 add_executable(mlpack_test
   mlpack_test.cpp
+  activation_functions_test.cpp
   adaboost_test.cpp
   allkfn_test.cpp
   allknn_test.cpp