Skip to content

Commit 2c035b5

Browse files
rcurtinrcurtin
committed
Convert system-specific .arm binary file to .csv.
1 parent b6ac548 commit 2c035b5

10 files changed

+27
-27
lines changed

‎src/mlpack/tests/ann/convolutional_network_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void CheckMoveFunction(ModelType* network1,
7171
TEST_CASE("PaddingTest", "[ConvolutionalNetworktest]")
7272
{
7373
arma::mat X;
74-
X.load("mnist_first250_training_4s_and_9s.arm");
74+
X.load("mnist_first250_training_4s_and_9s.csv");
7575

7676
// Create the network.
7777
FFN<NegativeLogLikelihood, RandomInitialization> model;
@@ -148,7 +148,7 @@ TEST_CASE("MaxPoolingTest", "[ConvolutionalNetworkTest]")
148148
TEST_CASE("VanillaNetworkTest", "[ConvolutionalNetworkTest]")
149149
{
150150
arma::mat X;
151-
X.load("mnist_first250_training_4s_and_9s.arm");
151+
X.load("mnist_first250_training_4s_and_9s.csv");
152152

153153
// Normalize each point since these are images.
154154
arma::uword nPoints = X.n_cols;
@@ -264,7 +264,7 @@ TEST_CASE("VanillaNetworkBatchSizeTest", "[ConvolutionalNetworkTest]")
264264
model.InputDimensions() = std::vector<size_t>({ 28, 28 });
265265

266266
arma::mat X;
267-
X.load("mnist_first250_training_4s_and_9s.arm");
267+
X.load("mnist_first250_training_4s_and_9s.csv");
268268

269269
// Normalize each point since these are images.
270270
arma::uword nPoints = X.n_cols;
@@ -347,7 +347,7 @@ TEST_CASE("VanillaNetworkBatchSizeTest", "[ConvolutionalNetworkTest]")
347347
TEST_CASE("CheckCopyVanillaNetworkTest", "[ConvolutionalNetworkTest]")
348348
{
349349
arma::mat X;
350-
X.load("mnist_first250_training_4s_and_9s.arm");
350+
X.load("mnist_first250_training_4s_and_9s.csv");
351351

352352
// Normalize each point since these are images.
353353
arma::uword nPoints = X.n_cols;

‎src/mlpack/tests/ann/feedforward_network_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ TEST_CASE("FFVanillaNetworkTest", "[FeedForwardNetworkTest]")
400400
TestNetwork<>(model, trainData, trainLabels, testData, testLabels, 10, 0.1);
401401

402402
arma::mat dataset;
403-
dataset.load("mnist_first250_training_4s_and_9s.arm");
403+
dataset.load("mnist_first250_training_4s_and_9s.csv");
404404

405405
// Normalize each point since these are images.
406406
for (size_t i = 0; i < dataset.n_cols; ++i)
@@ -421,7 +421,7 @@ TEST_CASE("FFVanillaNetworkTest", "[FeedForwardNetworkTest]")
421421
TEST_CASE("ForwardBackwardTest", "[FeedForwardNetworkTest]")
422422
{
423423
arma::mat dataset;
424-
dataset.load("mnist_first250_training_4s_and_9s.arm");
424+
dataset.load("mnist_first250_training_4s_and_9s.csv");
425425

426426
// Normalize each point since these are images.
427427
for (size_t i = 0; i < dataset.n_cols; ++i)
@@ -548,7 +548,7 @@ TEST_CASE("DropoutNetworkTest", "[FeedForwardNetworkTest]")
548548
// network must be significant better than 92%.
549549
TestNetwork<>(model, trainData, trainLabels, testData, testLabels, 10, 0.1);
550550
arma::mat dataset;
551-
dataset.load("mnist_first250_training_4s_and_9s.arm");
551+
dataset.load("mnist_first250_training_4s_and_9s.csv");
552552

553553
// Normalize each point since these are images.
554554
for (size_t i = 0; i < dataset.n_cols; ++i)
@@ -627,7 +627,7 @@ TEST_CASE("DropConnectNetworkTest", "[FeedForwardNetworkTest]")
627627
TestNetwork(model, trainData, trainLabels, testData, testLabels, 10, 0.1);
628628

629629
arma::mat dataset;
630-
dataset.load("mnist_first250_training_4s_and_9s.arm");
630+
dataset.load("mnist_first250_training_4s_and_9s.csv");
631631

632632
// Normalize each point since these are images.
633633
for (size_t i = 0; i < dataset.n_cols; ++i)
@@ -952,7 +952,7 @@ TEST_CASE("RBFNetworkTest", "[FeedForwardNetworkTest]")
952952
TestNetwork<>(model, trainData, trainLabels1, testData, testLabels, 10, 0.1);
953953

954954
arma::mat dataset;
955-
dataset.load("mnist_first250_training_4s_and_9s.arm");
955+
dataset.load("mnist_first250_training_4s_and_9s.csv");
956956

957957
// Normalize each point since these are images.
958958
for (size_t i = 0; i < dataset.n_cols; ++i)

‎src/mlpack/tests/ann/not_adapted/dcgan_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ TEST_CASE("DCGANMNISTTest", "[DCGANNetworkTest]")
5353
<< " shuffle = " << shuffle << std::endl;
5454

5555
arma::mat trainData;
56-
trainData.load("mnist_first250_training_4s_and_9s.arm");
56+
trainData.load("mnist_first250_training_4s_and_9s.csv");
5757
Log::Info << arma::size(trainData) << std::endl;
5858

5959
trainData = trainData.cols(0, datasetMaxCols - 1);
@@ -212,7 +212,7 @@ TEST_CASE("DCGANMNISTTest", "[DCGANNetworkTest]")
212212
<< " shuffle = " << shuffle << std::endl;
213213
214214
arma::mat trainData;
215-
trainData.load("mnist_first250_training_4s_and_9s.arm");
215+
trainData.load("mnist_first250_training_4s_and_9s.csv");
216216
Log::Info << arma::size(trainData) << std::endl;
217217
218218
// trainData = trainData.cols(0, datasetMaxCols - 1);

‎src/mlpack/tests/ann/not_adapted/feedforward_network_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ TEST_CASE("CheckCopyMovingReparametrizationNetworkTest",
134134
TEST_CASE("HighwayNetworkTest", "[FeedForwardNetworkTest]")
135135
{
136136
arma::mat dataset;
137-
dataset.load("mnist_first250_training_4s_and_9s.arm");
137+
dataset.load("mnist_first250_training_4s_and_9s.csv");
138138
139139
// Normalize each point since these are images.
140140
for (size_t i = 0; i < dataset.n_cols; ++i)

‎src/mlpack/tests/ann/not_adapted/gan_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ TEST_CASE("GANMNISTTest", "[GANNetworkTest]")
156156
<< " shuffle = " << shuffle << std::endl;
157157

158158
arma::mat trainData;
159-
trainData.load("mnist_first250_training_4s_and_9s.arm");
159+
trainData.load("mnist_first250_training_4s_and_9s.csv");
160160
Log::Info << arma::size(trainData) << std::endl;
161161

162162
trainData = trainData.cols(0, datasetMaxCols - 1);

‎src/mlpack/tests/ann/not_adapted/wgan_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ TEST_CASE("WGANMNISTTest", "[WGANNetworkTest]")
6060
<< " shuffle = " << shuffle << std::endl;
6161

6262
arma::mat trainData;
63-
trainData.load("mnist_first250_training_4s_and_9s.arm");
63+
trainData.load("mnist_first250_training_4s_and_9s.csv");
6464
Log::Info << arma::size(trainData) << std::endl;
6565

6666
trainData = trainData.cols(0, datasetMaxCols - 1);
@@ -222,7 +222,7 @@ TEST_CASE("WGANGPMNISTTest", "[WGANNetworkTest]")
222222
<< " shuffle = " << shuffle << std::endl;
223223

224224
arma::mat trainData;
225-
trainData.load("mnist_first250_training_4s_and_9s.arm");
225+
trainData.load("mnist_first250_training_4s_and_9s.csv");
226226
Log::Info << arma::size(trainData) << std::endl;
227227

228228
trainData = trainData.cols(0, datasetMaxCols - 1);

‎src/mlpack/tests/data/mnist_first250_training_4s_and_9s.tar.bz2‎

21.1 KB
Binary file not shown.

‎src/mlpack/tests/local_coordinate_coding_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TEMPLATE_TEST_CASE("LocalCoordinateCodingTestCodingStep",
5656
uword nAtoms = 10;
5757

5858
mat inX; // The .arm file is saved as an arma::mat.
59-
inX.load("mnist_first250_training_4s_and_9s.arm");
59+
inX.load("mnist_first250_training_4s_and_9s.csv");
6060
MatType X = arma::conv_to<MatType>::from(inX);
6161
uword nPoints = X.n_cols;
6262

@@ -98,7 +98,7 @@ TEMPLATE_TEST_CASE("LocalCoordinateCodingTestDictionaryStep",
9898
uword nAtoms = 10;
9999

100100
mat inX; // File is saved as an arma::mat.
101-
inX.load("mnist_first250_training_4s_and_9s.arm");
101+
inX.load("mnist_first250_training_4s_and_9s.csv");
102102
MatType X = arma::conv_to<MatType>::from(inX);
103103
uword nPoints = X.n_cols;
104104

@@ -189,7 +189,7 @@ TEMPLATE_TEST_CASE("LocalCoordinateCodingTrainReturnObjective",
189189
uword nAtoms = 10;
190190

191191
mat inX; // File is saved as arma::mat.
192-
inX.load("mnist_first250_training_4s_and_9s.arm");
192+
inX.load("mnist_first250_training_4s_and_9s.csv");
193193
MatType X = arma::conv_to<MatType>::from(inX);
194194
uword nPoints = X.n_cols;
195195

‎src/mlpack/tests/main_tests/local_coordinate_coding_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TEST_CASE_METHOD(LCCTestFixture, "LCCDimensionsTest",
3232
"[LCCMainTest][BindingTests]")
3333
{
3434
arma::mat x;
35-
x.load("mnist_first250_training_4s_and_9s.arm");
35+
x.load("mnist_first250_training_4s_and_9s.csv");
3636
int rows = x.n_rows, cols = x.n_cols;
3737
arma::mat t = x;
3838
int atoms = 10;
@@ -58,7 +58,7 @@ TEST_CASE_METHOD(LCCTestFixture, "LCCOutputModelTest",
5858
"[LCCMainTest][BindingTests]")
5959
{
6060
arma::mat x;
61-
x.load("mnist_first250_training_4s_and_9s.arm");
61+
x.load("mnist_first250_training_4s_and_9s.csv");
6262
arma::mat t = x;
6363

6464
SetInputParam("training", std::move(x));
@@ -129,7 +129,7 @@ TEST_CASE_METHOD(LCCTestFixture, "LCCTrainAndTestDataDimTest",
129129
"[LCCMainTest][BindingTests]")
130130
{
131131
arma::mat x;
132-
x.load("mnist_first250_training_4s_and_9s.arm");
132+
x.load("mnist_first250_training_4s_and_9s.csv");
133133
arma::mat t = x;
134134

135135
t.shed_rows(1, 2);
@@ -150,7 +150,7 @@ TEST_CASE_METHOD(LCCTestFixture, "LCCTrainAndInputModelTest",
150150
"[LCCMainTest][BindingTests]")
151151
{
152152
arma::mat x;
153-
x.load("mnist_first250_training_4s_and_9s.arm");
153+
x.load("mnist_first250_training_4s_and_9s.csv");
154154

155155
SetInputParam("training", x);
156156
SetInputParam("atoms", (int) 10);
@@ -175,7 +175,7 @@ TEST_CASE_METHOD(LCCTestFixture, "LCCTrainedModelDimTest",
175175
"[LCCMainTest][BindingTests]")
176176
{
177177
arma::mat x;
178-
x.load("mnist_first250_training_4s_and_9s.arm");
178+
x.load("mnist_first250_training_4s_and_9s.csv");
179179
arma:: mat t = x;
180180
t.shed_rows(1, 2);
181181

‎src/mlpack/tests/sparse_coding_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ TEMPLATE_TEST_CASE("SparseCodingTestCodingStepLasso", "[SparseCodingTest]",
5757
uword nAtoms = 25;
5858

5959
arma::mat inX; // The .arm file contains an arma::mat.
60-
inX.load("mnist_first250_training_4s_and_9s.arm");
60+
inX.load("mnist_first250_training_4s_and_9s.csv");
6161
MatType X = arma::conv_to<MatType>::from(inX);
6262
uword nPoints = X.n_cols;
6363

@@ -92,7 +92,7 @@ TEMPLATE_TEST_CASE("SparseCodingTestCodingStepElasticNet", "[SparseCodingTest]",
9292
uword nAtoms = 25;
9393

9494
arma::mat inX; // The .arm file contains an arma::mat.
95-
inX.load("mnist_first250_training_4s_and_9s.arm");
95+
inX.load("mnist_first250_training_4s_and_9s.csv");
9696
MatType X = arma::conv_to<MatType>::from(inX);
9797
uword nPoints = X.n_cols;
9898

@@ -129,7 +129,7 @@ TEMPLATE_TEST_CASE("SparseCodingTestDictionaryStep", "[SparseCodingTest]",
129129
uword nAtoms = 25;
130130

131131
arma::mat inX; // The .arm file contains an arma::mat.
132-
inX.load("mnist_first250_training_4s_and_9s.arm");
132+
inX.load("mnist_first250_training_4s_and_9s.csv");
133133
MatType X = arma::conv_to<MatType>::from(inX);
134134
uword nPoints = X.n_cols;
135135

@@ -222,7 +222,7 @@ TEMPLATE_TEST_CASE("SparseCodingTrainReturnObjective", "[SparseCodingTest]",
222222
uword nAtoms = 25;
223223

224224
arma::mat inX; // The .arm file contains an arma::mat.
225-
inX.load("mnist_first250_training_4s_and_9s.arm");
225+
inX.load("mnist_first250_training_4s_and_9s.csv");
226226
MatType X = arma::conv_to<MatType>::from(inX);
227227
uword nPoints = X.n_cols;
228228

0 commit comments

Comments
 (0)