apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3271 from mlpack/conradsnicta-patch-1

Browse Source 
avoid deprecation warnings in Armadillo 11.2+
This commit is contained in:
Ryan Curtin
2022-09-11 12:29:40 -04:00
committed by GitHub
parent 9b0fa1a723 6206a4cdfe
commit b4d0efe8e2
3 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mlpack/tests/ann/layer/add_merge.cpp
+14 -16
View File
@@ -53,15 +53,14 @@ TEST_CASE("AddMergeTestCase", "[ANNLayerTest]")
module2.ComputeOutputDimensions();
// Calculated using torch.nn.MeanPool2d().
arma::mat result1, result2;
result1 << 1.5000 << 8.5000 << arma::endr
<< 3.5000 << 8.0000 << arma::endr
<< 5.5000 << 12.0000 << arma::endr
<< 7.0000 << 5.0000 << arma::endr;
arma::mat result1 = { { 1.5, 8.5 },
{ 3.5, 8.0 },
{ 5.5, 12.0 },
{ 7.0, 5.0 } };
result2 << 1.5000 << 8.5000 << arma::endr
<< 3.5000 << 8.0000 << arma::endr
<< 5.5000 << 12.0000 << arma::endr;
arma::mat result2 = { { 1.5, 8.5 },
{ 3.5, 8.0 },
{ 5.5, 12.0 } };
arma::mat output1, output2;
output1.set_size(8, 1);
@@ -75,15 +74,14 @@ TEST_CASE("AddMergeTestCase", "[ANNLayerTest]")
CheckMatrices(output1, result1, 1e-1);
CheckMatrices(output2, result2, 1e-1);
arma::mat prevDelta1, prevDelta2;
prevDelta1 << 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr;
arma::mat prevDelta1 = { { 3.6, -0.9 },
{ 3.6, -0.9 },
{ 3.6, -0.9 },
{ 3.6, -0.9 } };
prevDelta2 << 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr;
arma::mat prevDelta2 = { { 3.6, -0.9 },
{ 3.6, -0.9 },
{ 3.6, -0.9 } };
arma::mat delta1, delta2;
delta1.set_size(28, 1);
delta2.set_size(28, 1);
src/mlpack/tests/ann/layer/batch_norm.cpp
+4 -4
View File
@@ -29,10 +29,10 @@ using namespace mlpack::ann;
*/
TEST_CASE("BatchNormTest", "[ANNLayerTest]")
{
arma::mat input, output;
input << 5.1 << 3.5 << 1.4 << arma::endr
<< 4.9 << 3.0 << 1.4 << arma::endr
<< 4.7 << 3.2 << 1.3 << arma::endr;
arma::mat output;
arma::mat input = { { 5.1, 3.5, 1.4 },
{ 4.9, 3.0, 1.4 },
{ 4.7, 3.2, 1.3 } };
input = input.t();
src/mlpack/tests/ann/layer/mean_pooling.cpp
+15 -16
View File
@@ -47,15 +47,14 @@ TEST_CASE("MeanPoolingTestCase", "[ANNLayerTest]")
module2.ComputeOutputDimensions();
// Calculated using torch.nn.MeanPool2d().
arma::mat result1, result2;
result1 << 0.7500 << 4.2500 << arma::endr
<< 1.7500 << 4.0000 << arma::endr
<< 2.7500 << 6.0000 << arma::endr
<< 3.5000 << 2.5000 << arma::endr;
arma::mat result1 = { { 0.75, 4.25 },
{ 1.75, 4.00 },
{ 2.75, 6.00 },
{ 3.50, 2.50 } };
result2 << 0.7500 << 4.2500 << arma::endr
<< 1.7500 << 4.0000 << arma::endr
<< 2.7500 << 6.0000 << arma::endr;
arma::mat result2 = { { 0.75, 4.25 },
{ 1.75, 4.00 },
{ 2.75, 6.00 } };
arma::mat output1, output2;
output1.set_size(8, 1);
@@ -69,15 +68,15 @@ TEST_CASE("MeanPoolingTestCase", "[ANNLayerTest]")
CheckMatrices(output1, result1, 1e-1);
CheckMatrices(output2, result2, 1e-1);
arma::mat prevDelta1, prevDelta2;
prevDelta1 << 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr;
arma::mat prevDelta1 = { { 3.6, -0.9 },
{ 3.6, -0.9 },
{ 3.6, -0.9 },
{ 3.6, -0.9 } };
prevDelta2 << 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr
<< 3.6000 << -0.9000 << arma::endr;
arma::mat prevDelta2 = { { 3.6, -0.9 },
{ 3.6, -0.9 },
{ 3.6, -0.9 } };
arma::mat delta1, delta2;
delta1.set_size(28, 1);
delta2.set_size(28, 1);