Merge remote-tracking branch 'origin/master' into remove-directory-cmake

2022-08-18 09:54:46 -04:00
parent 3641f96175 915a93680a
commit 1fec985ea7
174 changed files with 700 additions and 285 deletions
@@ -241,7 +241,7 @@ if (DEBUG)
          ${LIBDL_INCLUDE_DIRS})
      set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${LIBBFD_LIBRARIES}
          ${LIBDL_LIBRARIES})
-      add_definitions(-DHAS_BFD_DL)
+      add_definitions(-DMLPACK_HAS_BFD_DL)
    else()
      message(WARNING "No libBFD and/or libDL has been found!")
    endif()
@@ -14,9 +14,9 @@ install(FILES
    "${CMAKE_CURRENT_SOURCE_DIR}/prereqs.hpp"
    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mlpack/")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/core" DESTINATION
-    "${CMAKE_INSTALL_INCLUDEDIR}/mlpack/core")
+    "${CMAKE_INSTALL_INCLUDEDIR}/mlpack")
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/methods" DESTINATION
-    "${CMAKE_INSTALL_INCLUDEDIR}/mlpack/methods")
+    "${CMAKE_INSTALL_INCLUDEDIR}/mlpack")

 # Extract the version number.
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/core/util/version.hpp"
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME test_R_binding

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME test_go_binding

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME test_julia_binding

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -157,9 +157,10 @@ get_property(CYTHON_INCLUDE_DIRECTORIES DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 set (CYTHON_INCLDIRS "${CYTHON_INCLUDE_DIRECTORIES}")

 # By default, Python appears to compile with -DNDEBUG, but if we are in debug
-# mode we don't want that.  We also want to disable HAS_BFD_DL if it is set.
+# mode we don't want that.  We also want to disable MLPACK_HAS_BFD_DL if it is
+# set.
 if (DEBUG)
-  set(DISABLE_CFLAGS "NDEBUG;HAS_BFD_DL" PARENT_SCOPE)
+  set(DISABLE_CFLAGS "NDEBUG;MLPACK_HAS_BFD_DL" PARENT_SCOPE)
 endif ()

 add_custom_target(python ALL DEPENDS mlpack)
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME test_python_binding

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -75,7 +75,7 @@
 #include <mlpack/core/math/math.hpp>

 // mlpack::backtrace only for linux
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
  #include <mlpack/core/util/backtrace.hpp>
 #endif

@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>

-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
  #include <execinfo.h>
  #include <signal.h>
  #include <unistd.h>
@@ -77,7 +77,7 @@ namespace mlpack {
 class Backtrace
 {
 public:
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
  /**
   * Constructor initialize fields and call GetAddress to retrieve addresses
   * for each frame of backtrace.
@@ -126,7 +126,7 @@ class Backtrace
  Frames frame;
  std::vector<Frames> stack;

-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
  // Binary File Descriptor objects.
  bfd* abfd;          // Descriptor datastructure.
  asymbol **syms;     // Symbols datastructure.
@@ -16,7 +16,7 @@

 namespace mlpack {

-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
 inline Backtrace::Backtrace(int maxDepth)
 {
  frame.address = NULL;
@@ -39,7 +39,7 @@ inline Backtrace::Backtrace()
 }
 #endif

-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
 inline void Backtrace::GetAddress(int maxDepth)
 {
  void* trace[maxDepth];
@@ -131,7 +131,7 @@ inline std::string Backtrace::ToString()
 {
  std::string stackStr;

-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
  std::ostringstream lineOss;
  std::ostringstream it;

@@ -14,7 +14,7 @@

 #include "log.hpp"

-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
  #include "backtrace.hpp"
 #endif

@@ -26,7 +26,7 @@ inline void Log::Assert(bool condition, const std::string& message)
 {
  if (!condition)
  {
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
    Backtrace bt;

    Log::Debug << bt.ToString();
@@ -55,7 +55,7 @@ class PrefixedOutStream
   * @param fatal If true, a std::runtime_error exception is thrown after
   *     printing a newline.
   * @param backtrace If true, attempt to print a backtrace (will only be
-   *     done if HAS_BFD_DL is defined).
+   *     done if MLPACK_HAS_BFD_DL is defined).
   */
  PrefixedOutStream(std::ostream& destination,
                    const char* prefix,
@@ -118,8 +118,8 @@ class PrefixedOutStream
  //! Discards input, prints nothing if true.
  bool ignoreInput;

-  //! If true, on a fatal error, a backtrace will be printed if HAS_BFD_DL is
-  //! defined.
+  //! If true, on a fatal error, a backtrace will be printed if
+  //! MLPACK_HAS_BFD_DL is ! defined.
  bool backtrace;

 private:
@@ -16,7 +16,7 @@
 // Just in case it hasn't been included.
 #include "prefixedoutstream.hpp"

-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
  #include "backtrace.hpp"
 #endif

@@ -222,7 +222,7 @@ PrefixedOutStream::BaseLogic(const T& val)
      destination << std::endl;

    // Print a backtrace, if we can.
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
    if (fatal && !ignoreInput && backtrace)
    {
      size_t nl;
@@ -354,7 +354,7 @@ PrefixedOutStream::BaseLogic(const T& val)
      destination << std::endl;

    // Print a backtrace, if we can.
-#ifdef HAS_BFD_DL
+#ifdef MLPACK_HAS_BFD_DL
    if (fatal && !ignoreInput)
    {
      size_t nl;
@@ -0,0 +1,11 @@
+/**
+ * @file adaboost.hpp
+ *
+ * Convenience include for mlpack/methods/adaboost/adaboost.hpp
+ */
+#ifndef MLPACK_ADABOOST_HPP
+#define MLPACK_ADABOOST_HPP
+
+#include "adaboost/adaboost.hpp"
+
+#endif
@@ -33,9 +33,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME adaboost_classify

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -33,9 +33,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME adaboost

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -33,9 +33,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME adaboost_probabilities

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -34,9 +34,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME adaboost_train

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file amf.hpp
+ *
+ * Convenience include for mlpack/methods/amf/amf.hpp
+ */
+#ifndef MLPACK_AMF_HPP
+#define MLPACK_AMF_HPP
+
+#include "amf/amf.hpp"
+
+#endif
@@ -0,0 +1,11 @@
+/**
+ * @file ann.hpp
+ *
+ * Convenience include for mlpack/methods/ann/ann.hpp
+ */
+#ifndef MLPACK_ANN_HPP
+#define MLPACK_ANN_HPP
+
+#include "ann/ann.hpp"
+
+#endif
@@ -0,0 +1,11 @@
+/**
+ * @file approx_kfn.hpp
+ *
+ * Convenience include for mlpack/methods/approx_kfn/approx_kfn.hpp
+ */
+#ifndef MLPACK_APPROX_KFN_HPP
+#define MLPACK_APPROX_KFN_HPP
+
+#include "approx_kfn/approx_kfn.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME approx_kfn

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file bayesian_linear_regression.hpp
+ *
+ * Convenience include for mlpack/methods/bayesian_linear_regression/bayesian_linear_regression.hpp
+ */
+#ifndef MLPACK_BAYESIAN_LINEAR_REGRESSION_HPP
+#define MLPACK_BAYESIAN_LINEAR_REGRESSION_HPP
+
+#include "bayesian_linear_regression/bayesian_linear_regression.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME bayesian_linear_regression

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file bias_svd.hpp
+ *
+ * Convenience include for mlpack/methods/bias_svd/bias_svd.hpp
+ */
+#ifndef MLPACK_BIAS_SVD_HPP
+#define MLPACK_BIAS_SVD_HPP
+
+#include "bias_svd/bias_svd.hpp"
+
+#endif
@@ -0,0 +1,11 @@
+/**
+ * @file block_krylov_svd.hpp
+ *
+ * Convenience include for mlpack/methods/block_krylov_svd/block_krylov_svd.hpp
+ */
+#ifndef MLPACK_BLOCK_KRYLOV_SVD_HPP
+#define MLPACK_BLOCK_KRYLOV_SVD_HPP
+
+#include "block_krylov_svd/block_krylov_svd.hpp"
+
+#endif
@@ -0,0 +1,11 @@
+/**
+ * @file cf.hpp
+ *
+ * Convenience include for mlpack/methods/cf/cf.hpp
+ */
+#ifndef MLPACK_CF_HPP
+#define MLPACK_CF_HPP
+
+#include "cf/cf.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME cf

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file dbscan.hpp
+ *
+ * Convenience include for mlpack/methods/dbscan/dbscan.hpp
+ */
+#ifndef MLPACK_DBSCAN_HPP
+#define MLPACK_DBSCAN_HPP
+
+#include "dbscan/dbscan.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME dbscan

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file decision_tree.hpp
+ *
+ * Convenience include for mlpack/methods/decision_tree/decision_tree.hpp
+ */
+#ifndef MLPACK_DECISION_TREE_HPP
+#define MLPACK_DECISION_TREE_HPP
+
+#include "decision_tree/decision_tree.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME decision_tree

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file det.hpp
+ *
+ * Convenience include for mlpack/methods/det/det.hpp
+ */
+#ifndef MLPACK_DET_HPP
+#define MLPACK_DET_HPP
+
+#include "det/det.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME det

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file emst.hpp
+ *
+ * Convenience include for mlpack/methods/emst/emst.hpp
+ */
+#ifndef MLPACK_EMST_HPP
+#define MLPACK_EMST_HPP
+
+#include "emst/emst.hpp"
+
+#endif
@@ -26,9 +26,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME emst

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file fastmks.hpp
+ *
+ * Convenience include for mlpack/methods/fastmks/fastmks.hpp
+ */
+#ifndef MLPACK_FASTMKS_HPP
+#define MLPACK_FASTMKS_HPP
+
+#include "fastmks/fastmks.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME fastmks

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file gmm.hpp
+ *
+ * Convenience include for mlpack/methods/gmm/gmm.hpp
+ */
+#ifndef MLPACK_GMM_HPP
+#define MLPACK_GMM_HPP
+
+#include "gmm/gmm.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME gmm_generate

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME gmm_probability

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME gmm_train

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file hmm.hpp
+ *
+ * Convenience include for mlpack/methods/hmm/hmm.hpp
+ */
+#ifndef MLPACK_HMM_HPP
+#define MLPACK_HMM_HPP
+
+#include "hmm/hmm.hpp"
+
+#endif
@@ -13,9 +13,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hmm_generate

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hmm_loglik

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hmm_train

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -12,9 +12,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hmm_viterbi

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file hoeffding_trees.hpp
+ *
+ * Convenience include for mlpack/methods/hoeffding_trees/hoeffding_trees.hpp
+ */
+#ifndef MLPACK_HOEFFDING_TREES_HPP
+#define MLPACK_HOEFFDING_TREES_HPP
+
+#include "hoeffding_trees/hoeffding_trees.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME hoeffding_tree

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file kde.hpp
+ *
+ * Convenience include for mlpack/methods/kde/kde.hpp
+ */
+#ifndef MLPACK_KDE_HPP
+#define MLPACK_KDE_HPP
+
+#include "kde/kde.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME kde

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file kernel_pca.hpp
+ *
+ * Convenience include for mlpack/methods/kernel_pca/kernel_pca.hpp
+ */
+#ifndef MLPACK_KERNEL_PCA_HPP
+#define MLPACK_KERNEL_PCA_HPP
+
+#include "kernel_pca/kernel_pca.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME kernel_pca

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file kmeans.hpp
+ *
+ * Convenience include for mlpack/methods/kmeans/kmeans.hpp
+ */
+#ifndef MLPACK_KMEANS_HPP
+#define MLPACK_KMEANS_HPP
+
+#include "kmeans/kmeans.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME kmeans

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file lars.hpp
+ *
+ * Convenience include for mlpack/methods/lars/lars.hpp
+ */
+#ifndef MLPACK_LARS_HPP
+#define MLPACK_LARS_HPP
+
+#include "lars/lars.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME lars

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file linear_regression.hpp
+ *
+ * Convenience include for mlpack/methods/linear_regression/linear_regression.hpp
+ */
+#ifndef MLPACK_LINEAR_REGRESSION_HPP
+#define MLPACK_LINEAR_REGRESSION_HPP
+
+#include "linear_regression/linear_regression.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME linear_regression

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME linear_regression_predict

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME linear_regression_train

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file linear_svm.hpp
+ *
+ * Convenience include for mlpack/methods/linear_svm/linear_svm.hpp
+ */
+#ifndef MLPACK_LINEAR_SVM_HPP
+#define MLPACK_LINEAR_SVM_HPP
+
+#include "linear_svm/linear_svm.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME linear_svm

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file lmnn.hpp
+ *
+ * Convenience include for mlpack/methods/lmnn/lmnn.hpp
+ */
+#ifndef MLPACK_LMNN_HPP
+#define MLPACK_LMNN_HPP
+
+#include "lmnn/lmnn.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME lmnn

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file local_coordinate_coding.hpp
+ *
+ * Convenience include for mlpack/methods/local_coordinate_coding/local_coordinate_coding.hpp
+ */
+#ifndef MLPACK_LOCAL_COORDINATE_CODING_HPP
+#define MLPACK_LOCAL_COORDINATE_CODING_HPP
+
+#include "local_coordinate_coding/local_coordinate_coding.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME local_coordinate_coding

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file logistic_regression.hpp
+ *
+ * Convenience include for mlpack/methods/logistic_regression/logistic_regression.hpp
+ */
+#ifndef MLPACK_LOGISTIC_REGRESSION_HPP
+#define MLPACK_LOGISTIC_REGRESSION_HPP
+
+#include "logistic_regression/logistic_regression.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME logistic_regression

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file lsh.hpp
+ *
+ * Convenience include for mlpack/methods/lsh/lsh.hpp
+ */
+#ifndef MLPACK_LSH_HPP
+#define MLPACK_LSH_HPP
+
+#include "lsh/lsh.hpp"
+
+#endif
@@ -12,9 +12,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME lsh

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file matrix_completion.hpp
+ *
+ * Convenience include for mlpack/methods/matrix_completion/matrix_completion.hpp
+ */
+#ifndef MLPACK_MATRIX_COMPLETION_HPP
+#define MLPACK_MATRIX_COMPLETION_HPP
+
+#include "matrix_completion/matrix_completion.hpp"
+
+#endif
@@ -0,0 +1,11 @@
+/**
+ * @file mean_shift.hpp
+ *
+ * Convenience include for mlpack/methods/mean_shift/mean_shift.hpp
+ */
+#ifndef MLPACK_MEAN_SHIFT_HPP
+#define MLPACK_MEAN_SHIFT_HPP
+
+#include "mean_shift/mean_shift.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME mean_shift

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file naive_bayes.hpp
+ *
+ * Convenience include for mlpack/methods/naive_bayes/naive_bayes.hpp
+ */
+#ifndef MLPACK_NAIVE_BAYES_HPP
+#define MLPACK_NAIVE_BAYES_HPP
+
+#include "naive_bayes/naive_bayes.hpp"
+
+#endif
@@ -14,9 +14,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME nbc

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file nca.hpp
+ *
+ * Convenience include for mlpack/methods/nca/nca.hpp
+ */
+#ifndef MLPACK_NCA_HPP
+#define MLPACK_NCA_HPP
+
+#include "nca/nca.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME nca

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file neighbor_search.hpp
+ *
+ * Convenience include for mlpack/methods/neighbor_search/neighbor_search.hpp
+ */
+#ifndef MLPACK_NEIGHBOR_SEARCH_HPP
+#define MLPACK_NEIGHBOR_SEARCH_HPP
+
+#include "neighbor_search/neighbor_search.hpp"
+
+#endif
@@ -12,9 +12,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME kfn

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -12,9 +12,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME knn

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file nmf.hpp
+ *
+ * Convenience include for mlpack/methods/nmf/nmf.hpp
+ */
+#ifndef MLPACK_NMF_HPP
+#define MLPACK_NMF_HPP
+
+#include "nmf/nmf.hpp"
+
+#endif
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME nmf

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file nystroem_method.hpp
+ *
+ * Convenience include for mlpack/methods/nystroem_method/nystroem_method.hpp
+ */
+#ifndef MLPACK_NYSTROEM_METHOD_HPP
+#define MLPACK_NYSTROEM_METHOD_HPP
+
+#include "nystroem_method/nystroem_method.hpp"
+
+#endif
@@ -0,0 +1,11 @@
+/**
+ * @file pca.hpp
+ *
+ * Convenience include for mlpack/methods/pca/pca.hpp
+ */
+#ifndef MLPACK_PCA_HPP
+#define MLPACK_PCA_HPP
+
+#include "pca/pca.hpp"
+
+#endif
@@ -12,9 +12,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME pca

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file perceptron.hpp
+ *
+ * Convenience include for mlpack/methods/perceptron/perceptron.hpp
+ */
+#ifndef MLPACK_PERCEPTRON_HPP
+#define MLPACK_PERCEPTRON_HPP
+
+#include "perceptron/perceptron.hpp"
+
+#endif
@@ -14,9 +14,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME perceptron

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file preprocess.hpp
+ *
+ * Convenience include for mlpack/methods/preprocess/preprocess.hpp
+ */
+#ifndef MLPACK_PREPROCESS_HPP
+#define MLPACK_PREPROCESS_HPP
+
+#include "preprocess/preprocess.hpp"
+
+#endif
@@ -12,9 +12,7 @@
 #include <mlpack/prereqs.hpp>
 #include <mlpack/core/util/io.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME image_converter

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_binarize

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_describe

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_imputer

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_one_hot_encoding

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_scale

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -11,9 +11,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME preprocess_split

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file quic_svd.hpp
+ *
+ * Convenience include for mlpack/methods/quic_svd/quic_svd.hpp
+ */
+#ifndef MLPACK_QUIC_SVD_HPP
+#define MLPACK_QUIC_SVD_HPP
+
+#include "quic_svd/quic_svd.hpp"
+
+#endif
@@ -0,0 +1,11 @@
+/**
+ * @file radical.hpp
+ *
+ * Convenience include for mlpack/methods/radical/radical.hpp
+ */
+#ifndef MLPACK_RADICAL_HPP
+#define MLPACK_RADICAL_HPP
+
+#include "radical/radical.hpp"
+
+#endif
@@ -12,9 +12,7 @@
 */
 #include <mlpack/core.hpp>

-#ifdef BINDING_NAME
-  #undef BINDING_NAME
-#endif
+#undef BINDING_NAME
 #define BINDING_NAME radical

 #include <mlpack/core/util/mlpack_main.hpp>
@@ -0,0 +1,11 @@
+/**
+ * @file random_forest.hpp
+ *
+ * Convenience include for mlpack/methods/random_forest/random_forest.hpp
+ */
+#ifndef MLPACK_RANDOM_FOREST_HPP
+#define MLPACK_RANDOM_FOREST_HPP
+
+#include "random_forest/random_forest.hpp"
+
+#endif
--- a/Show More
+++ b/Show More