Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid deprecation warnings in Armadillo 11.4.4+ #3405

Merged
merged 3 commits into from
Feb 10, 2023
Merged

avoid deprecation warnings in Armadillo 11.4.4+ #3405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9c6c91
change deprecated .quiet_save() to .save()
conradsnicta Feb 9, 2023
78d07bd
change deprecated .quiet_save() to .save()
conradsnicta Feb 9, 2023
753af5c
update HISTORY.md
conradsnicta Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

* Fix DBSCAN handling of non-core points (#3346).

* Avoid deprecation warnings in Armadillo 11.4.4+ (#3405).

### mlpack 4.0.1
###### 2022-12-23
* Fix mapping of categorical data for Julia bindings (#3305).
Expand Down
14 changes: 7 additions & 7 deletions src/mlpack/core/data/save_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ bool Save(const std::string& filename,
#ifdef ARMA_USE_HDF5
// We can't save with streams for HDF5.
const bool success = (saveType == FileType::HDF5Binary) ?
tmp.quiet_save(filename, ToArmaFileType(saveType)) :
tmp.quiet_save(stream, ToArmaFileType(saveType));
tmp.save(filename, ToArmaFileType(saveType)) :
tmp.save(stream, ToArmaFileType(saveType));
#else
const bool success = tmp.quiet_save(stream, ToArmaFileType(saveType));
const bool success = tmp.save(stream, ToArmaFileType(saveType));
#endif
if (!success)
{
Expand All @@ -122,10 +122,10 @@ bool Save(const std::string& filename,
#ifdef ARMA_USE_HDF5
// We can't save with streams for HDF5.
const bool success = (saveType == FileType::HDF5Binary) ?
matrix.quiet_save(filename, ToArmaFileType(saveType)) :
matrix.quiet_save(stream, ToArmaFileType(saveType));
matrix.save(filename, ToArmaFileType(saveType)) :
matrix.save(stream, ToArmaFileType(saveType));
#else
const bool success = matrix.quiet_save(stream, ToArmaFileType(saveType));
const bool success = matrix.save(stream, ToArmaFileType(saveType));
#endif
if (!success)
{
Expand Down Expand Up @@ -236,7 +236,7 @@ bool Save(const std::string& filename,
tmp = trans(matrix);
}

const bool success = tmp.quiet_save(stream, ToArmaFileType(saveType));
const bool success = tmp.save(stream, ToArmaFileType(saveType));
if (!success)
{
Timer::Stop("saving_data");
Expand Down
18 changes: 9 additions & 9 deletions src/mlpack/tests/load_save_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ TEST_CASE("WrongExtensionWrongLoad", "[LoadSaveTest]")
"4 8;";

arma::mat testTrans = trans(test);
REQUIRE(testTrans.quiet_save("test_file.csv", arma::arma_binary) == true);
REQUIRE(testTrans.save("test_file.csv", arma::arma_binary) == true);

// Now reload through our interface.
REQUIRE(data::Load("test_file.csv", test) == false);
Expand All @@ -79,7 +79,7 @@ TEST_CASE("WrongExtensionCorrectLoad", "[LoadSaveTest]")
"4 8;";

arma::mat testTrans = trans(test);
REQUIRE(testTrans.quiet_save("test_file.csv", arma::arma_binary) == true);
REQUIRE(testTrans.save("test_file.csv", arma::arma_binary) == true);

// Now reload through our interface.
REQUIRE(
Expand Down Expand Up @@ -924,7 +924,7 @@ TEST_CASE("LoadArmaBinaryTest", "[LoadSaveTest]")
"4 8;";

arma::mat testTrans = trans(test);
REQUIRE(testTrans.quiet_save("test_file.bin", arma::arma_binary)
REQUIRE(testTrans.save("test_file.bin", arma::arma_binary)
== true);

// Now reload through our interface.
Expand Down Expand Up @@ -1001,7 +1001,7 @@ TEST_CASE("LoadRawBinaryTest", "[LoadSaveTest]")
"7 8;";

arma::mat testTrans = trans(test);
REQUIRE(testTrans.quiet_save("test_file.bin", arma::raw_binary)
REQUIRE(testTrans.save("test_file.bin", arma::raw_binary)
== true);

// Now reload through our interface.
Expand All @@ -1028,7 +1028,7 @@ TEST_CASE("LoadPGMBinaryTest", "[LoadSaveTest]")
"4 8;";

arma::mat testTrans = trans(test);
REQUIRE(testTrans.quiet_save("test_file.pgm", arma::pgm_binary)
REQUIRE(testTrans.save("test_file.pgm", arma::pgm_binary)
== true);

// Now reload through our interface.
Expand Down Expand Up @@ -1080,13 +1080,13 @@ TEST_CASE("LoadHDF5Test", "[LoadSaveTest]")
"3 7;"
"4 8;";
arma::mat testTrans = trans(test);
REQUIRE(testTrans.quiet_save("test_file.h5", arma::hdf5_binary)
REQUIRE(testTrans.save("test_file.h5", arma::hdf5_binary)
== true);
REQUIRE(testTrans.quiet_save("test_file.hdf5", arma::hdf5_binary)
REQUIRE(testTrans.save("test_file.hdf5", arma::hdf5_binary)
== true);
REQUIRE(testTrans.quiet_save("test_file.hdf", arma::hdf5_binary)
REQUIRE(testTrans.save("test_file.hdf", arma::hdf5_binary)
== true);
REQUIRE(testTrans.quiet_save("test_file.he5", arma::hdf5_binary)
REQUIRE(testTrans.save("test_file.he5", arma::hdf5_binary)
== true);

// Now reload through our interface.
Expand Down