From c4e05d4f362f371350673d4c0e5cd4ff01ceaf2d Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Wed, 17 Aug 2022 18:17:41 -0400 Subject: [PATCH] Remove unnecessary #ifdefs. --- src/mlpack/bindings/R/tests/test_r_binding_main.cpp | 4 +--- src/mlpack/bindings/go/tests/test_go_binding_main.cpp | 4 +--- src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp | 4 +--- src/mlpack/bindings/python/tests/test_python_binding_main.cpp | 4 +--- src/mlpack/methods/adaboost/adaboost_classify_main.cpp | 4 +--- src/mlpack/methods/adaboost/adaboost_main.cpp | 4 +--- src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp | 4 +--- src/mlpack/methods/adaboost/adaboost_train_main.cpp | 4 +--- src/mlpack/methods/approx_kfn/approx_kfn_main.cpp | 4 +--- .../bayesian_linear_regression_main.cpp | 4 +--- src/mlpack/methods/cf/cf_main.cpp | 4 +--- src/mlpack/methods/dbscan/dbscan_main.cpp | 4 +--- src/mlpack/methods/decision_tree/decision_tree_main.cpp | 4 +--- src/mlpack/methods/det/det_main.cpp | 4 +--- src/mlpack/methods/emst/emst_main.cpp | 4 +--- src/mlpack/methods/fastmks/fastmks_main.cpp | 4 +--- src/mlpack/methods/gmm/gmm_generate_main.cpp | 4 +--- src/mlpack/methods/gmm/gmm_probability_main.cpp | 4 +--- src/mlpack/methods/gmm/gmm_train_main.cpp | 4 +--- src/mlpack/methods/hmm/hmm_generate_main.cpp | 4 +--- src/mlpack/methods/hmm/hmm_loglik_main.cpp | 4 +--- src/mlpack/methods/hmm/hmm_train_main.cpp | 4 +--- src/mlpack/methods/hmm/hmm_viterbi_main.cpp | 4 +--- src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp | 4 +--- src/mlpack/methods/kde/kde_main.cpp | 4 +--- src/mlpack/methods/kernel_pca/kernel_pca_main.cpp | 4 +--- src/mlpack/methods/kmeans/kmeans_main.cpp | 4 +--- src/mlpack/methods/lars/lars_main.cpp | 4 +--- .../methods/linear_regression/linear_regression_main.cpp | 4 +--- .../linear_regression/linear_regression_predict_main.cpp | 4 +--- .../linear_regression/linear_regression_train_main.cpp | 4 +--- src/mlpack/methods/linear_svm/linear_svm_main.cpp | 4 +--- src/mlpack/methods/lmnn/lmnn_main.cpp | 4 +--- .../local_coordinate_coding/local_coordinate_coding_main.cpp | 4 +--- .../methods/logistic_regression/logistic_regression_main.cpp | 4 +--- src/mlpack/methods/lsh/lsh_main.cpp | 4 +--- src/mlpack/methods/mean_shift/mean_shift_main.cpp | 4 +--- src/mlpack/methods/naive_bayes/nbc_main.cpp | 4 +--- src/mlpack/methods/nca/nca_main.cpp | 4 +--- src/mlpack/methods/neighbor_search/kfn_main.cpp | 4 +--- src/mlpack/methods/neighbor_search/knn_main.cpp | 4 +--- src/mlpack/methods/nmf/nmf_main.cpp | 4 +--- src/mlpack/methods/pca/pca_main.cpp | 4 +--- src/mlpack/methods/perceptron/perceptron_main.cpp | 4 +--- src/mlpack/methods/preprocess/image_converter_main.cpp | 4 +--- src/mlpack/methods/preprocess/preprocess_binarize_main.cpp | 4 +--- src/mlpack/methods/preprocess/preprocess_describe_main.cpp | 4 +--- src/mlpack/methods/preprocess/preprocess_imputer_main.cpp | 4 +--- .../methods/preprocess/preprocess_one_hot_encoding_main.cpp | 4 +--- src/mlpack/methods/preprocess/preprocess_scale_main.cpp | 4 +--- src/mlpack/methods/preprocess/preprocess_split_main.cpp | 4 +--- src/mlpack/methods/radical/radical_main.cpp | 4 +--- src/mlpack/methods/random_forest/random_forest_main.cpp | 4 +--- src/mlpack/methods/range_search/range_search_main.cpp | 4 +--- src/mlpack/methods/rann/krann_main.cpp | 4 +--- .../methods/softmax_regression/softmax_regression_main.cpp | 4 +--- src/mlpack/methods/sparse_coding/sparse_coding_main.cpp | 4 +--- 57 files changed, 57 insertions(+), 171 deletions(-) diff --git a/src/mlpack/bindings/R/tests/test_r_binding_main.cpp b/src/mlpack/bindings/R/tests/test_r_binding_main.cpp index 4bf0643da6..ff5bd0805a 100644 --- a/src/mlpack/bindings/R/tests/test_r_binding_main.cpp +++ b/src/mlpack/bindings/R/tests/test_r_binding_main.cpp @@ -12,9 +12,7 @@ #include #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME test_R_binding #include diff --git a/src/mlpack/bindings/go/tests/test_go_binding_main.cpp b/src/mlpack/bindings/go/tests/test_go_binding_main.cpp index 270a863d5f..53f11fc93f 100644 --- a/src/mlpack/bindings/go/tests/test_go_binding_main.cpp +++ b/src/mlpack/bindings/go/tests/test_go_binding_main.cpp @@ -12,9 +12,7 @@ #include #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME test_go_binding #include diff --git a/src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp b/src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp index 3c674dcd42..853191e578 100644 --- a/src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp +++ b/src/mlpack/bindings/julia/tests/test_julia_binding_main.cpp @@ -12,9 +12,7 @@ #include #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME test_julia_binding #include diff --git a/src/mlpack/bindings/python/tests/test_python_binding_main.cpp b/src/mlpack/bindings/python/tests/test_python_binding_main.cpp index ce14d78428..3384238eff 100644 --- a/src/mlpack/bindings/python/tests/test_python_binding_main.cpp +++ b/src/mlpack/bindings/python/tests/test_python_binding_main.cpp @@ -12,9 +12,7 @@ #include #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME test_python_binding #include diff --git a/src/mlpack/methods/adaboost/adaboost_classify_main.cpp b/src/mlpack/methods/adaboost/adaboost_classify_main.cpp index c3458dd35e..d8d29cce80 100644 --- a/src/mlpack/methods/adaboost/adaboost_classify_main.cpp +++ b/src/mlpack/methods/adaboost/adaboost_classify_main.cpp @@ -33,9 +33,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME adaboost_classify #include diff --git a/src/mlpack/methods/adaboost/adaboost_main.cpp b/src/mlpack/methods/adaboost/adaboost_main.cpp index 54df0b644e..f88d0ce103 100644 --- a/src/mlpack/methods/adaboost/adaboost_main.cpp +++ b/src/mlpack/methods/adaboost/adaboost_main.cpp @@ -33,9 +33,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME adaboost #include diff --git a/src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp b/src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp index 5873880b66..6bec53c74b 100644 --- a/src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp +++ b/src/mlpack/methods/adaboost/adaboost_probabilities_main.cpp @@ -33,9 +33,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME adaboost_probabilities #include diff --git a/src/mlpack/methods/adaboost/adaboost_train_main.cpp b/src/mlpack/methods/adaboost/adaboost_train_main.cpp index 1d3155ee5e..5975be7b7e 100644 --- a/src/mlpack/methods/adaboost/adaboost_train_main.cpp +++ b/src/mlpack/methods/adaboost/adaboost_train_main.cpp @@ -34,9 +34,7 @@ #include #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME adaboost_train #include diff --git a/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp b/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp index 48b7e80713..4f0897a9ad 100644 --- a/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp +++ b/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME approx_kfn #include diff --git a/src/mlpack/methods/bayesian_linear_regression/bayesian_linear_regression_main.cpp b/src/mlpack/methods/bayesian_linear_regression/bayesian_linear_regression_main.cpp index 94c780324f..7cb0657ce4 100644 --- a/src/mlpack/methods/bayesian_linear_regression/bayesian_linear_regression_main.cpp +++ b/src/mlpack/methods/bayesian_linear_regression/bayesian_linear_regression_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME bayesian_linear_regression #include diff --git a/src/mlpack/methods/cf/cf_main.cpp b/src/mlpack/methods/cf/cf_main.cpp index 41b44a9a06..35f4a59d0f 100644 --- a/src/mlpack/methods/cf/cf_main.cpp +++ b/src/mlpack/methods/cf/cf_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME cf #include diff --git a/src/mlpack/methods/dbscan/dbscan_main.cpp b/src/mlpack/methods/dbscan/dbscan_main.cpp index 544d334abb..beb650fbb6 100644 --- a/src/mlpack/methods/dbscan/dbscan_main.cpp +++ b/src/mlpack/methods/dbscan/dbscan_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME dbscan #include diff --git a/src/mlpack/methods/decision_tree/decision_tree_main.cpp b/src/mlpack/methods/decision_tree/decision_tree_main.cpp index 8333247e35..2fd35dd67b 100644 --- a/src/mlpack/methods/decision_tree/decision_tree_main.cpp +++ b/src/mlpack/methods/decision_tree/decision_tree_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME decision_tree #include diff --git a/src/mlpack/methods/det/det_main.cpp b/src/mlpack/methods/det/det_main.cpp index d5c1cd8f15..b63925832b 100644 --- a/src/mlpack/methods/det/det_main.cpp +++ b/src/mlpack/methods/det/det_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME det #include diff --git a/src/mlpack/methods/emst/emst_main.cpp b/src/mlpack/methods/emst/emst_main.cpp index b440181d32..61992817f8 100644 --- a/src/mlpack/methods/emst/emst_main.cpp +++ b/src/mlpack/methods/emst/emst_main.cpp @@ -26,9 +26,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME emst #include diff --git a/src/mlpack/methods/fastmks/fastmks_main.cpp b/src/mlpack/methods/fastmks/fastmks_main.cpp index f1e2122be1..862123b789 100644 --- a/src/mlpack/methods/fastmks/fastmks_main.cpp +++ b/src/mlpack/methods/fastmks/fastmks_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME fastmks #include diff --git a/src/mlpack/methods/gmm/gmm_generate_main.cpp b/src/mlpack/methods/gmm/gmm_generate_main.cpp index 61b774b7bb..0df2117cc1 100644 --- a/src/mlpack/methods/gmm/gmm_generate_main.cpp +++ b/src/mlpack/methods/gmm/gmm_generate_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME gmm_generate #include diff --git a/src/mlpack/methods/gmm/gmm_probability_main.cpp b/src/mlpack/methods/gmm/gmm_probability_main.cpp index 347a4ee0b1..77eaf93c4d 100644 --- a/src/mlpack/methods/gmm/gmm_probability_main.cpp +++ b/src/mlpack/methods/gmm/gmm_probability_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME gmm_probability #include diff --git a/src/mlpack/methods/gmm/gmm_train_main.cpp b/src/mlpack/methods/gmm/gmm_train_main.cpp index 9d8da8639c..23b6b088f4 100644 --- a/src/mlpack/methods/gmm/gmm_train_main.cpp +++ b/src/mlpack/methods/gmm/gmm_train_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME gmm_train #include diff --git a/src/mlpack/methods/hmm/hmm_generate_main.cpp b/src/mlpack/methods/hmm/hmm_generate_main.cpp index ccea373cf6..01e2f92435 100644 --- a/src/mlpack/methods/hmm/hmm_generate_main.cpp +++ b/src/mlpack/methods/hmm/hmm_generate_main.cpp @@ -13,9 +13,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME hmm_generate #include diff --git a/src/mlpack/methods/hmm/hmm_loglik_main.cpp b/src/mlpack/methods/hmm/hmm_loglik_main.cpp index 1fc41aaef3..147063e867 100644 --- a/src/mlpack/methods/hmm/hmm_loglik_main.cpp +++ b/src/mlpack/methods/hmm/hmm_loglik_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME hmm_loglik #include diff --git a/src/mlpack/methods/hmm/hmm_train_main.cpp b/src/mlpack/methods/hmm/hmm_train_main.cpp index a65d2c1f07..ff358d3be2 100644 --- a/src/mlpack/methods/hmm/hmm_train_main.cpp +++ b/src/mlpack/methods/hmm/hmm_train_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME hmm_train #include diff --git a/src/mlpack/methods/hmm/hmm_viterbi_main.cpp b/src/mlpack/methods/hmm/hmm_viterbi_main.cpp index 6a99ab2e3b..32900d3c47 100644 --- a/src/mlpack/methods/hmm/hmm_viterbi_main.cpp +++ b/src/mlpack/methods/hmm/hmm_viterbi_main.cpp @@ -12,9 +12,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME hmm_viterbi #include diff --git a/src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp b/src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp index e60f6c36e6..50a229eb7f 100644 --- a/src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp +++ b/src/mlpack/methods/hoeffding_trees/hoeffding_tree_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME hoeffding_tree #include diff --git a/src/mlpack/methods/kde/kde_main.cpp b/src/mlpack/methods/kde/kde_main.cpp index 62f6436724..55b946b0df 100644 --- a/src/mlpack/methods/kde/kde_main.cpp +++ b/src/mlpack/methods/kde/kde_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME kde #include diff --git a/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp b/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp index ef3af4ad0d..07f2669b6c 100644 --- a/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp +++ b/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME kernel_pca #include diff --git a/src/mlpack/methods/kmeans/kmeans_main.cpp b/src/mlpack/methods/kmeans/kmeans_main.cpp index 897ba57062..99c43e0168 100644 --- a/src/mlpack/methods/kmeans/kmeans_main.cpp +++ b/src/mlpack/methods/kmeans/kmeans_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME kmeans #include diff --git a/src/mlpack/methods/lars/lars_main.cpp b/src/mlpack/methods/lars/lars_main.cpp index e6fd184019..6fd22cb173 100644 --- a/src/mlpack/methods/lars/lars_main.cpp +++ b/src/mlpack/methods/lars/lars_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME lars #include diff --git a/src/mlpack/methods/linear_regression/linear_regression_main.cpp b/src/mlpack/methods/linear_regression/linear_regression_main.cpp index 91f3368bc6..7399e5770c 100644 --- a/src/mlpack/methods/linear_regression/linear_regression_main.cpp +++ b/src/mlpack/methods/linear_regression/linear_regression_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME linear_regression #include diff --git a/src/mlpack/methods/linear_regression/linear_regression_predict_main.cpp b/src/mlpack/methods/linear_regression/linear_regression_predict_main.cpp index e1cd09d21e..d97d1c6305 100644 --- a/src/mlpack/methods/linear_regression/linear_regression_predict_main.cpp +++ b/src/mlpack/methods/linear_regression/linear_regression_predict_main.cpp @@ -12,9 +12,7 @@ #include #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME linear_regression_predict #include diff --git a/src/mlpack/methods/linear_regression/linear_regression_train_main.cpp b/src/mlpack/methods/linear_regression/linear_regression_train_main.cpp index 0fe6dddca8..82ca85b3f4 100644 --- a/src/mlpack/methods/linear_regression/linear_regression_train_main.cpp +++ b/src/mlpack/methods/linear_regression/linear_regression_train_main.cpp @@ -12,9 +12,7 @@ #include #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME linear_regression_train #include diff --git a/src/mlpack/methods/linear_svm/linear_svm_main.cpp b/src/mlpack/methods/linear_svm/linear_svm_main.cpp index 40cc2f2282..dccb7ae66f 100644 --- a/src/mlpack/methods/linear_svm/linear_svm_main.cpp +++ b/src/mlpack/methods/linear_svm/linear_svm_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME linear_svm #include diff --git a/src/mlpack/methods/lmnn/lmnn_main.cpp b/src/mlpack/methods/lmnn/lmnn_main.cpp index 56682a82e5..7ab8c4798e 100644 --- a/src/mlpack/methods/lmnn/lmnn_main.cpp +++ b/src/mlpack/methods/lmnn/lmnn_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME lmnn #include diff --git a/src/mlpack/methods/local_coordinate_coding/local_coordinate_coding_main.cpp b/src/mlpack/methods/local_coordinate_coding/local_coordinate_coding_main.cpp index a93e14f0dc..5adb94a1fe 100644 --- a/src/mlpack/methods/local_coordinate_coding/local_coordinate_coding_main.cpp +++ b/src/mlpack/methods/local_coordinate_coding/local_coordinate_coding_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME local_coordinate_coding #include diff --git a/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp b/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp index 3504a31976..81b9624a90 100644 --- a/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp +++ b/src/mlpack/methods/logistic_regression/logistic_regression_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME logistic_regression #include diff --git a/src/mlpack/methods/lsh/lsh_main.cpp b/src/mlpack/methods/lsh/lsh_main.cpp index 1de208e279..14f1da9175 100644 --- a/src/mlpack/methods/lsh/lsh_main.cpp +++ b/src/mlpack/methods/lsh/lsh_main.cpp @@ -12,9 +12,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME lsh #include diff --git a/src/mlpack/methods/mean_shift/mean_shift_main.cpp b/src/mlpack/methods/mean_shift/mean_shift_main.cpp index 29dedde3ad..6893dcf6a4 100644 --- a/src/mlpack/methods/mean_shift/mean_shift_main.cpp +++ b/src/mlpack/methods/mean_shift/mean_shift_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME mean_shift #include diff --git a/src/mlpack/methods/naive_bayes/nbc_main.cpp b/src/mlpack/methods/naive_bayes/nbc_main.cpp index 79212253aa..dd00f1d97f 100644 --- a/src/mlpack/methods/naive_bayes/nbc_main.cpp +++ b/src/mlpack/methods/naive_bayes/nbc_main.cpp @@ -14,9 +14,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME nbc #include diff --git a/src/mlpack/methods/nca/nca_main.cpp b/src/mlpack/methods/nca/nca_main.cpp index e7b80792ab..d8d039d7ba 100644 --- a/src/mlpack/methods/nca/nca_main.cpp +++ b/src/mlpack/methods/nca/nca_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME nca #include diff --git a/src/mlpack/methods/neighbor_search/kfn_main.cpp b/src/mlpack/methods/neighbor_search/kfn_main.cpp index bda529acf1..f8e562c312 100644 --- a/src/mlpack/methods/neighbor_search/kfn_main.cpp +++ b/src/mlpack/methods/neighbor_search/kfn_main.cpp @@ -12,9 +12,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME kfn #include diff --git a/src/mlpack/methods/neighbor_search/knn_main.cpp b/src/mlpack/methods/neighbor_search/knn_main.cpp index 0c56a63ea5..0679e6375c 100644 --- a/src/mlpack/methods/neighbor_search/knn_main.cpp +++ b/src/mlpack/methods/neighbor_search/knn_main.cpp @@ -12,9 +12,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME knn #include diff --git a/src/mlpack/methods/nmf/nmf_main.cpp b/src/mlpack/methods/nmf/nmf_main.cpp index db4123f9a1..749b44138b 100644 --- a/src/mlpack/methods/nmf/nmf_main.cpp +++ b/src/mlpack/methods/nmf/nmf_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME nmf #include diff --git a/src/mlpack/methods/pca/pca_main.cpp b/src/mlpack/methods/pca/pca_main.cpp index 1c9e9ba541..d8f2c01458 100644 --- a/src/mlpack/methods/pca/pca_main.cpp +++ b/src/mlpack/methods/pca/pca_main.cpp @@ -12,9 +12,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME pca #include diff --git a/src/mlpack/methods/perceptron/perceptron_main.cpp b/src/mlpack/methods/perceptron/perceptron_main.cpp index 1e04361607..a7849780f2 100644 --- a/src/mlpack/methods/perceptron/perceptron_main.cpp +++ b/src/mlpack/methods/perceptron/perceptron_main.cpp @@ -14,9 +14,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME perceptron #include diff --git a/src/mlpack/methods/preprocess/image_converter_main.cpp b/src/mlpack/methods/preprocess/image_converter_main.cpp index 9e7e0281dd..2e8e0f0853 100644 --- a/src/mlpack/methods/preprocess/image_converter_main.cpp +++ b/src/mlpack/methods/preprocess/image_converter_main.cpp @@ -12,9 +12,7 @@ #include #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME image_converter #include diff --git a/src/mlpack/methods/preprocess/preprocess_binarize_main.cpp b/src/mlpack/methods/preprocess/preprocess_binarize_main.cpp index 922cb94207..5f237494d0 100644 --- a/src/mlpack/methods/preprocess/preprocess_binarize_main.cpp +++ b/src/mlpack/methods/preprocess/preprocess_binarize_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME preprocess_binarize #include diff --git a/src/mlpack/methods/preprocess/preprocess_describe_main.cpp b/src/mlpack/methods/preprocess/preprocess_describe_main.cpp index a9a0ececfd..9a7efe664d 100644 --- a/src/mlpack/methods/preprocess/preprocess_describe_main.cpp +++ b/src/mlpack/methods/preprocess/preprocess_describe_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME preprocess_describe #include diff --git a/src/mlpack/methods/preprocess/preprocess_imputer_main.cpp b/src/mlpack/methods/preprocess/preprocess_imputer_main.cpp index bea0e64e5f..71bac71cae 100644 --- a/src/mlpack/methods/preprocess/preprocess_imputer_main.cpp +++ b/src/mlpack/methods/preprocess/preprocess_imputer_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME preprocess_imputer #include diff --git a/src/mlpack/methods/preprocess/preprocess_one_hot_encoding_main.cpp b/src/mlpack/methods/preprocess/preprocess_one_hot_encoding_main.cpp index b240bca22b..3b7f1b3e1c 100644 --- a/src/mlpack/methods/preprocess/preprocess_one_hot_encoding_main.cpp +++ b/src/mlpack/methods/preprocess/preprocess_one_hot_encoding_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME preprocess_one_hot_encoding #include diff --git a/src/mlpack/methods/preprocess/preprocess_scale_main.cpp b/src/mlpack/methods/preprocess/preprocess_scale_main.cpp index cccf83163c..0199aebb68 100644 --- a/src/mlpack/methods/preprocess/preprocess_scale_main.cpp +++ b/src/mlpack/methods/preprocess/preprocess_scale_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME preprocess_scale #include diff --git a/src/mlpack/methods/preprocess/preprocess_split_main.cpp b/src/mlpack/methods/preprocess/preprocess_split_main.cpp index e5ddbe8e15..32c8acf8a3 100644 --- a/src/mlpack/methods/preprocess/preprocess_split_main.cpp +++ b/src/mlpack/methods/preprocess/preprocess_split_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME preprocess_split #include diff --git a/src/mlpack/methods/radical/radical_main.cpp b/src/mlpack/methods/radical/radical_main.cpp index 32b97e2f33..3a4c6730a8 100644 --- a/src/mlpack/methods/radical/radical_main.cpp +++ b/src/mlpack/methods/radical/radical_main.cpp @@ -12,9 +12,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME radical #include diff --git a/src/mlpack/methods/random_forest/random_forest_main.cpp b/src/mlpack/methods/random_forest/random_forest_main.cpp index aaa730c8a1..a71d131ed8 100644 --- a/src/mlpack/methods/random_forest/random_forest_main.cpp +++ b/src/mlpack/methods/random_forest/random_forest_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME random_forest #include diff --git a/src/mlpack/methods/range_search/range_search_main.cpp b/src/mlpack/methods/range_search/range_search_main.cpp index 8d2c04e539..8dce4b1da0 100644 --- a/src/mlpack/methods/range_search/range_search_main.cpp +++ b/src/mlpack/methods/range_search/range_search_main.cpp @@ -13,9 +13,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME range_search #include diff --git a/src/mlpack/methods/rann/krann_main.cpp b/src/mlpack/methods/rann/krann_main.cpp index 7c9a088095..9054fc619f 100644 --- a/src/mlpack/methods/rann/krann_main.cpp +++ b/src/mlpack/methods/rann/krann_main.cpp @@ -12,9 +12,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME krann #include diff --git a/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp b/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp index a32408d706..e4e4008152 100644 --- a/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp +++ b/src/mlpack/methods/softmax_regression/softmax_regression_main.cpp @@ -10,9 +10,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME softmax_regression #include diff --git a/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp b/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp index 2944be1a54..3801298d26 100644 --- a/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp +++ b/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp @@ -11,9 +11,7 @@ */ #include -#ifdef BINDING_NAME - #undef BINDING_NAME -#endif +#undef BINDING_NAME #define BINDING_NAME sparse_coding #include