diff --git a/src/mlpack/methods/hmm/hmm.hpp b/src/mlpack/methods/hmm/hmm.hpp index adf1e7b139..ef060765fe 100644 --- a/src/mlpack/methods/hmm/hmm.hpp +++ b/src/mlpack/methods/hmm/hmm.hpp @@ -365,9 +365,6 @@ class HMM template void save(Archive& ar, const unsigned int version) const; - CEREAL_SPLIT_MEMBER(); - - protected: // Helper functions. /** diff --git a/src/mlpack/tests/CMakeLists.txt b/src/mlpack/tests/CMakeLists.txt index 1d000710b4..2259903d04 100644 --- a/src/mlpack/tests/CMakeLists.txt +++ b/src/mlpack/tests/CMakeLists.txt @@ -36,8 +36,8 @@ add_executable(mlpack_test facilities_test.cpp # feedforward_network_test.cpp # gan_test.cpp -### gmm_test.cpp recompile alone -### hmm_test.cpp + gmm_test.cpp + hmm_test.cpp ### hoeffding_tree_test.cpp hpt_test.cpp hyperplane_test.cpp diff --git a/src/mlpack/tests/hmm_test.cpp b/src/mlpack/tests/hmm_test.cpp index 60b78b5ef7..7203c03a64 100644 --- a/src/mlpack/tests/hmm_test.cpp +++ b/src/mlpack/tests/hmm_test.cpp @@ -1080,7 +1080,7 @@ BOOST_AUTO_TEST_CASE(GMMHMMLoadSaveTest) // Save the HMM. { std::ofstream ofs("test-hmm-save.xml"); - boost::archive::xml_oarchive ar(ofs); + cereal::XMLOutputArchive ar(ofs); ar << CEREAL_NVP(hmm); } @@ -1088,7 +1088,7 @@ BOOST_AUTO_TEST_CASE(GMMHMMLoadSaveTest) HMM hmm2(3, GMM(4, 3)); { std::ifstream ifs("test-hmm-save.xml"); - boost::archive::xml_iarchive ar(ifs); + cereal::XMLInputArchive ar(ifs); ar >> CEREAL_NVP(hmm2); } @@ -1145,7 +1145,7 @@ BOOST_AUTO_TEST_CASE(GaussianHMMLoadSaveTest) // Save the HMM. { std::ofstream ofs("test-hmm-save.xml"); - boost::archive::xml_oarchive ar(ofs); + cereal::XMLOutputArchive ar(ofs); ar << CEREAL_NVP(hmm); } @@ -1153,7 +1153,7 @@ BOOST_AUTO_TEST_CASE(GaussianHMMLoadSaveTest) HMM hmm2(3, GaussianDistribution(2)); { std::ifstream ifs("test-hmm-save.xml"); - boost::archive::xml_iarchive ar(ifs); + cereal::XMLInputArchive ar(ifs); ar >> CEREAL_NVP(hmm2); } @@ -1208,7 +1208,7 @@ BOOST_AUTO_TEST_CASE(DiscreteHMMLoadSaveTest) // Save the HMM. { std::ofstream ofs("test-hmm-save.xml"); - boost::archive::xml_oarchive ar(ofs); + cereal::XMLOutputArchive ar(ofs); ar << CEREAL_NVP(hmm); } @@ -1216,7 +1216,7 @@ BOOST_AUTO_TEST_CASE(DiscreteHMMLoadSaveTest) HMM hmm2(3, DiscreteDistribution(3)); { std::ifstream ifs("test-hmm-save.xml"); - boost::archive::xml_iarchive ar(ifs); + cereal::XMLInputArchive ar(ifs); ar >> CEREAL_NVP(hmm2); } @@ -1809,7 +1809,7 @@ BOOST_AUTO_TEST_CASE(DiagonalGMMHMMLoadSaveTest) // Save the HMM. { std::ofstream ofs("test-hmm-save.xml"); - boost::archive::xml_oarchive ar(ofs); + cereal::XMLOutputArchive ar(ofs); ar << CEREAL_NVP(hmm); } @@ -1817,7 +1817,7 @@ BOOST_AUTO_TEST_CASE(DiagonalGMMHMMLoadSaveTest) HMM hmm2(3, DiagonalGMM(4, 3)); { std::ifstream ifs("test-hmm-save.xml"); - boost::archive::xml_iarchive ar(ifs); + cereal::XMLInputArchive ar(ifs); ar >> CEREAL_NVP(hmm2); }