From ce3a573e12a5044775e41d3b2e4fc57d44facb81 Mon Sep 17 00:00:00 2001
From: Ryan Curtin <ryan@ratml.org>
Date: Sun, 4 Sep 2022 11:11:20 -0400
Subject: [PATCH] Clean up includes for tests.

---
 src/mlpack/tests/ann/layer/adaptive_max_pooling.cpp  | 11 +----------
 src/mlpack/tests/ann/layer/adaptive_mean_pooling.cpp | 11 +----------
 src/mlpack/tests/ann/layer/add_merge.cpp             | 11 +----------
 src/mlpack/tests/ann/layer/alpha_dropout.cpp         |  4 +---
 src/mlpack/tests/ann/layer/batch_norm.cpp            | 12 ++----------
 src/mlpack/tests/ann/layer/convolution.cpp           |  6 +-----
 src/mlpack/tests/ann/layer/dropout.cpp               |  4 +---
 src/mlpack/tests/ann/layer/grouped_convolution.cpp   |  6 +-----
 src/mlpack/tests/ann/layer/identity.cpp              | 11 +----------
 src/mlpack/tests/ann/layer/linear3d.cpp              |  7 +------
 src/mlpack/tests/ann/layer/linear_no_bias.cpp        |  6 +-----
 src/mlpack/tests/ann/layer/log_softmax.cpp           |  6 +-----
 src/mlpack/tests/ann/layer/max_pooling.cpp           |  5 +----
 src/mlpack/tests/ann/layer/mean_pooling.cpp          | 11 +----------
 src/mlpack/tests/ann/layer/padding.cpp               |  5 +----
 src/mlpack/tests/ann/layer/softmax.cpp               | 11 +----------
 16 files changed, 17 insertions(+), 110 deletions(-)

diff --git a/src/mlpack/tests/ann/layer/adaptive_max_pooling.cpp b/src/mlpack/tests/ann/layer/adaptive_max_pooling.cpp
index 3acabad1ed..ea20856ff2 100644
--- a/src/mlpack/tests/ann/layer/adaptive_max_pooling.cpp
+++ b/src/mlpack/tests/ann/layer/adaptive_max_pooling.cpp
@@ -11,16 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/init_rules/glorot_init.hpp>
-#include <mlpack/methods/ann/init_rules/const_init.hpp>
-#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/loss_functions/mean_squared_error.hpp>
-#include <mlpack/methods/ann/loss_functions/binary_cross_entropy_loss.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/adaptive_mean_pooling.cpp b/src/mlpack/tests/ann/layer/adaptive_mean_pooling.cpp
index 11af81406c..5ea5a69f92 100644
--- a/src/mlpack/tests/ann/layer/adaptive_mean_pooling.cpp
+++ b/src/mlpack/tests/ann/layer/adaptive_mean_pooling.cpp
@@ -11,16 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/init_rules/glorot_init.hpp>
-#include <mlpack/methods/ann/init_rules/const_init.hpp>
-#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/loss_functions/mean_squared_error.hpp>
-#include <mlpack/methods/ann/loss_functions/binary_cross_entropy_loss.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/add_merge.cpp b/src/mlpack/tests/ann/layer/add_merge.cpp
index dbf2036462..4aab072366 100644
--- a/src/mlpack/tests/ann/layer/add_merge.cpp
+++ b/src/mlpack/tests/ann/layer/add_merge.cpp
@@ -11,16 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/init_rules/glorot_init.hpp>
-#include <mlpack/methods/ann/init_rules/const_init.hpp>
-#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/loss_functions/mean_squared_error.hpp>
-#include <mlpack/methods/ann/loss_functions/binary_cross_entropy_loss.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/alpha_dropout.cpp b/src/mlpack/tests/ann/layer/alpha_dropout.cpp
index ffe28d1ec9..e3fce77844 100644
--- a/src/mlpack/tests/ann/layer/alpha_dropout.cpp
+++ b/src/mlpack/tests/ann/layer/alpha_dropout.cpp
@@ -11,9 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/batch_norm.cpp b/src/mlpack/tests/ann/layer/batch_norm.cpp
index 5790e7eafc..ff51b600f7 100644
--- a/src/mlpack/tests/ann/layer/batch_norm.cpp
+++ b/src/mlpack/tests/ann/layer/batch_norm.cpp
@@ -10,17 +10,9 @@
  * 3-clause BSD license along with mlpack.  If not, see
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
+#define MLPACK_ENABLE_ANN_SERIALIZATION
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/init_rules/glorot_init.hpp>
-#include <mlpack/methods/ann/init_rules/const_init.hpp>
-#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/loss_functions/mean_squared_error.hpp>
-#include <mlpack/methods/ann/loss_functions/binary_cross_entropy_loss.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/convolution.cpp b/src/mlpack/tests/ann/layer/convolution.cpp
index 7c6be35bfc..65bad201f0 100644
--- a/src/mlpack/tests/ann/layer/convolution.cpp
+++ b/src/mlpack/tests/ann/layer/convolution.cpp
@@ -11,11 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/dropout.cpp b/src/mlpack/tests/ann/layer/dropout.cpp
index 3da290502f..31389dd98f 100644
--- a/src/mlpack/tests/ann/layer/dropout.cpp
+++ b/src/mlpack/tests/ann/layer/dropout.cpp
@@ -11,9 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/grouped_convolution.cpp b/src/mlpack/tests/ann/layer/grouped_convolution.cpp
index 21c3f99b44..cdb61a472f 100644
--- a/src/mlpack/tests/ann/layer/grouped_convolution.cpp
+++ b/src/mlpack/tests/ann/layer/grouped_convolution.cpp
@@ -10,11 +10,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/identity.cpp b/src/mlpack/tests/ann/layer/identity.cpp
index 9653b8d8e2..fe45f380ca 100644
--- a/src/mlpack/tests/ann/layer/identity.cpp
+++ b/src/mlpack/tests/ann/layer/identity.cpp
@@ -11,16 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/init_rules/glorot_init.hpp>
-#include <mlpack/methods/ann/init_rules/const_init.hpp>
-#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/loss_functions/mean_squared_error.hpp>
-#include <mlpack/methods/ann/loss_functions/binary_cross_entropy_loss.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/linear3d.cpp b/src/mlpack/tests/ann/layer/linear3d.cpp
index a8f73b21ce..ac2771e9ac 100644
--- a/src/mlpack/tests/ann/layer/linear3d.cpp
+++ b/src/mlpack/tests/ann/layer/linear3d.cpp
@@ -11,12 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/loss_functions/mean_squared_error.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/linear_no_bias.cpp b/src/mlpack/tests/ann/layer/linear_no_bias.cpp
index 5a56e37cb8..e446e86bb7 100644
--- a/src/mlpack/tests/ann/layer/linear_no_bias.cpp
+++ b/src/mlpack/tests/ann/layer/linear_no_bias.cpp
@@ -11,11 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/log_softmax.cpp b/src/mlpack/tests/ann/layer/log_softmax.cpp
index 2686c90eff..d6b14dbab0 100644
--- a/src/mlpack/tests/ann/layer/log_softmax.cpp
+++ b/src/mlpack/tests/ann/layer/log_softmax.cpp
@@ -11,11 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/loss_functions/binary_cross_entropy_loss.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/max_pooling.cpp b/src/mlpack/tests/ann/layer/max_pooling.cpp
index 300181a28e..ecadac8108 100644
--- a/src/mlpack/tests/ann/layer/max_pooling.cpp
+++ b/src/mlpack/tests/ann/layer/max_pooling.cpp
@@ -11,10 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/mean_pooling.cpp b/src/mlpack/tests/ann/layer/mean_pooling.cpp
index f648f9ef13..341d47f24d 100644
--- a/src/mlpack/tests/ann/layer/mean_pooling.cpp
+++ b/src/mlpack/tests/ann/layer/mean_pooling.cpp
@@ -11,16 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/init_rules/glorot_init.hpp>
-#include <mlpack/methods/ann/init_rules/const_init.hpp>
-#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/loss_functions/mean_squared_error.hpp>
-#include <mlpack/methods/ann/loss_functions/binary_cross_entropy_loss.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/padding.cpp b/src/mlpack/tests/ann/layer/padding.cpp
index 2a25baed50..a782bf0e2c 100644
--- a/src/mlpack/tests/ann/layer/padding.cpp
+++ b/src/mlpack/tests/ann/layer/padding.cpp
@@ -11,10 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"
diff --git a/src/mlpack/tests/ann/layer/softmax.cpp b/src/mlpack/tests/ann/layer/softmax.cpp
index afbf517112..d013a48f63 100644
--- a/src/mlpack/tests/ann/layer/softmax.cpp
+++ b/src/mlpack/tests/ann/layer/softmax.cpp
@@ -11,16 +11,7 @@
  * http://www.opensource.org/licenses/BSD-3-Clause for more information.
  */
 #include <mlpack/core.hpp>
-
-#include <mlpack/methods/ann/layer/layer.hpp>
-#include <mlpack/methods/ann/layer/layer_types.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
-#include <mlpack/methods/ann/init_rules/glorot_init.hpp>
-#include <mlpack/methods/ann/init_rules/const_init.hpp>
-#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/loss_functions/mean_squared_error.hpp>
-#include <mlpack/methods/ann/loss_functions/binary_cross_entropy_loss.hpp>
-#include <mlpack/methods/ann/ffn.hpp>
+#include <mlpack/methods/ann.hpp>
 
 #include "../../test_catch_tools.hpp"
 #include "../../catch.hpp"