From 79621896ade0b723ddf20dd596cb0e8591f8a917 Mon Sep 17 00:00:00 2001 From: Marcus Edel Date: Sun, 21 Jul 2019 15:41:10 +0200 Subject: [PATCH 1/3] Do not run the ANNLayerTest in parallel. --- src/mlpack/tests/CMakeLists.txt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/mlpack/tests/CMakeLists.txt b/src/mlpack/tests/CMakeLists.txt index 2ffe0e641d..80c1c231e1 100644 --- a/src/mlpack/tests/CMakeLists.txt +++ b/src/mlpack/tests/CMakeLists.txt @@ -187,11 +187,20 @@ add_custom_command(TARGET mlpack_test # The list of long running parallel tests set(parallel_tests + "ANNLayerTest;" "AsyncLearningTest;" - "SVDIncrementalTest;SVDBatchTest;" - "LocalCoordinateCodingTest;FeedForwardNetworkTest;SparseAutoencoderTest;" - "GMMTest;CFTest;ConvolutionalNetworkTest;HMMTest;LARSTest;" - "LogisticRegressionTest;GmmTrainMainTest;" + "SVDIncrementalTest;" + "SVDBatchTest;" + "LocalCoordinateCodingTest;" + "FeedForwardNetworkTest;" + "SparseAutoencoderTest;" + "GMMTest;" + "CFTest;" + "ConvolutionalNetworkTest;" + "HMMTest;" + "LARSTest;" + "LogisticRegressionTest;" + "GmmTrainMainTest;" "LinearSVMTest") # Add tests to the testing framework From 87deea1094617812007e78c3cc925c106f22f1c6 Mon Sep 17 00:00:00 2001 From: Marcus Edel Date: Sun, 21 Jul 2019 17:18:41 +0200 Subject: [PATCH 2/3] Add another layer in front of it. --- src/mlpack/tests/ann_layer_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mlpack/tests/ann_layer_test.cpp b/src/mlpack/tests/ann_layer_test.cpp index c936fab3f8..eb91f2c7e6 100644 --- a/src/mlpack/tests/ann_layer_test.cpp +++ b/src/mlpack/tests/ann_layer_test.cpp @@ -1921,6 +1921,7 @@ BOOST_AUTO_TEST_CASE(GradientAtrousConvolutionLayerTest) model = new FFN, RandomInitialization>(); model->Predictors() = input; model->Responses() = target; + model->Add >(); model->Add >(36, 36); model->Add >(1, 1, 3, 3, 1, 1, 0, 0, 6, 6, 2, 2); model->Add >(); From 8b0a56b91c53a9e36186a864d5dcfadd94e5d65b Mon Sep 17 00:00:00 2001 From: Marcus Edel Date: Sat, 27 Jul 2019 17:21:03 +0200 Subject: [PATCH 3/3] Swap Linear with Identity to only test the Convolution Gradient. --- src/mlpack/tests/ann_layer_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mlpack/tests/ann_layer_test.cpp b/src/mlpack/tests/ann_layer_test.cpp index eb91f2c7e6..0cc30f63e8 100644 --- a/src/mlpack/tests/ann_layer_test.cpp +++ b/src/mlpack/tests/ann_layer_test.cpp @@ -1922,7 +1922,6 @@ BOOST_AUTO_TEST_CASE(GradientAtrousConvolutionLayerTest) model->Predictors() = input; model->Responses() = target; model->Add >(); - model->Add >(36, 36); model->Add >(1, 1, 3, 3, 1, 1, 0, 0, 6, 6, 2, 2); model->Add >(); }