From 028a1d3d9124caea1809e9bc3f8d072cdaccb2d8 Mon Sep 17 00:00:00 2001 From: Omar Shrit Date: Tue, 9 Jun 2020 22:17:11 +0200 Subject: [PATCH] BOOST::SERIALIZATION --> CEREAL in core/data Signed-off-by: Omar Shrit --- src/mlpack/core/data/dataset_mapper.hpp | 4 ++-- src/mlpack/core/data/image_info.hpp | 8 ++++---- .../core/data/scaler_methods/max_abs_scaler.hpp | 6 +++--- .../data/scaler_methods/mean_normalization.hpp | 8 ++++---- .../core/data/scaler_methods/min_max_scaler.hpp | 12 ++++++------ .../core/data/scaler_methods/pca_whitening.hpp | 8 ++++---- .../core/data/scaler_methods/standard_scaler.hpp | 4 ++-- .../core/data/scaler_methods/zca_whitening.hpp | 2 +- .../core/data/string_encoding_dictionary.hpp | 16 ++++++++-------- src/mlpack/core/data/string_encoding_impl.hpp | 4 ++-- .../tf_idf_encoding_policy.hpp | 4 ++-- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/mlpack/core/data/dataset_mapper.hpp b/src/mlpack/core/data/dataset_mapper.hpp index 697f4be4fd..7fada576bd 100644 --- a/src/mlpack/core/data/dataset_mapper.hpp +++ b/src/mlpack/core/data/dataset_mapper.hpp @@ -153,8 +153,8 @@ class DatasetMapper template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(types); - ar & BOOST_SERIALIZATION_NVP(maps); + ar & CEREAL_NVP(types); + ar & CEREAL_NVP(maps); } //! Return the policy of the mapper. diff --git a/src/mlpack/core/data/image_info.hpp b/src/mlpack/core/data/image_info.hpp index cf4b54ee36..182cea4136 100644 --- a/src/mlpack/core/data/image_info.hpp +++ b/src/mlpack/core/data/image_info.hpp @@ -73,10 +73,10 @@ class ImageInfo template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(width); - ar & BOOST_SERIALIZATION_NVP(channels); - ar & BOOST_SERIALIZATION_NVP(height); - ar & BOOST_SERIALIZATION_NVP(quality); + ar & CEREAL_NVP(width); + ar & CEREAL_NVP(channels); + ar & CEREAL_NVP(height); + ar & CEREAL_NVP(quality); } private: diff --git a/src/mlpack/core/data/scaler_methods/max_abs_scaler.hpp b/src/mlpack/core/data/scaler_methods/max_abs_scaler.hpp index 56372184f2..a9a8d32313 100644 --- a/src/mlpack/core/data/scaler_methods/max_abs_scaler.hpp +++ b/src/mlpack/core/data/scaler_methods/max_abs_scaler.hpp @@ -103,9 +103,9 @@ class MaxAbsScaler template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(itemMin); - ar & BOOST_SERIALIZATION_NVP(itemMax); - ar & BOOST_SERIALIZATION_NVP(scale); + ar & CEREAL_NVP(itemMin); + ar & CEREAL_NVP(itemMax); + ar & CEREAL_NVP(scale); } private: // Vector which holds minimum of each feature. diff --git a/src/mlpack/core/data/scaler_methods/mean_normalization.hpp b/src/mlpack/core/data/scaler_methods/mean_normalization.hpp index 6b005b8318..f8b339007c 100644 --- a/src/mlpack/core/data/scaler_methods/mean_normalization.hpp +++ b/src/mlpack/core/data/scaler_methods/mean_normalization.hpp @@ -106,10 +106,10 @@ class MeanNormalization template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(itemMin); - ar & BOOST_SERIALIZATION_NVP(itemMax); - ar & BOOST_SERIALIZATION_NVP(scale); - ar & BOOST_SERIALIZATION_NVP(itemMean); + ar & CEREAL_NVP(itemMin); + ar & CEREAL_NVP(itemMax); + ar & CEREAL_NVP(scale); + ar & CEREAL_NVP(itemMean); } private: diff --git a/src/mlpack/core/data/scaler_methods/min_max_scaler.hpp b/src/mlpack/core/data/scaler_methods/min_max_scaler.hpp index 00a5257a2d..8fa676d2a1 100644 --- a/src/mlpack/core/data/scaler_methods/min_max_scaler.hpp +++ b/src/mlpack/core/data/scaler_methods/min_max_scaler.hpp @@ -130,12 +130,12 @@ class MinMaxScaler template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(itemMin); - ar & BOOST_SERIALIZATION_NVP(itemMax); - ar & BOOST_SERIALIZATION_NVP(scale); - ar & BOOST_SERIALIZATION_NVP(scaleMin); - ar & BOOST_SERIALIZATION_NVP(scaleMax); - ar & BOOST_SERIALIZATION_NVP(scalerowmin); + ar & CEREAL_NVP(itemMin); + ar & CEREAL_NVP(itemMax); + ar & CEREAL_NVP(scale); + ar & CEREAL_NVP(scaleMin); + ar & CEREAL_NVP(scaleMax); + ar & CEREAL_NVP(scalerowmin); } private: diff --git a/src/mlpack/core/data/scaler_methods/pca_whitening.hpp b/src/mlpack/core/data/scaler_methods/pca_whitening.hpp index 5c9cecb73d..2e2ce1b8ce 100644 --- a/src/mlpack/core/data/scaler_methods/pca_whitening.hpp +++ b/src/mlpack/core/data/scaler_methods/pca_whitening.hpp @@ -123,10 +123,10 @@ class PCAWhitening template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(eigenValues); - ar & BOOST_SERIALIZATION_NVP(eigenVectors); - ar & BOOST_SERIALIZATION_NVP(itemMean); - ar & BOOST_SERIALIZATION_NVP(epsilon); + ar & CEREAL_NVP(eigenValues); + ar & CEREAL_NVP(eigenVectors); + ar & CEREAL_NVP(itemMean); + ar & CEREAL_NVP(epsilon); } private: diff --git a/src/mlpack/core/data/scaler_methods/standard_scaler.hpp b/src/mlpack/core/data/scaler_methods/standard_scaler.hpp index 1ec3aa6277..1f0adc518f 100644 --- a/src/mlpack/core/data/scaler_methods/standard_scaler.hpp +++ b/src/mlpack/core/data/scaler_methods/standard_scaler.hpp @@ -101,8 +101,8 @@ class StandardScaler template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(itemMean); - ar & BOOST_SERIALIZATION_NVP(itemStdDev); + ar & CEREAL_NVP(itemMean); + ar & CEREAL_NVP(itemStdDev); } private: diff --git a/src/mlpack/core/data/scaler_methods/zca_whitening.hpp b/src/mlpack/core/data/scaler_methods/zca_whitening.hpp index fb6b58cc8c..934aaa578d 100644 --- a/src/mlpack/core/data/scaler_methods/zca_whitening.hpp +++ b/src/mlpack/core/data/scaler_methods/zca_whitening.hpp @@ -104,7 +104,7 @@ class ZCAWhitening template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(pca); + ar & CEREAL_NVP(pca); } private: diff --git a/src/mlpack/core/data/string_encoding_dictionary.hpp b/src/mlpack/core/data/string_encoding_dictionary.hpp index 1976187324..2a056d1c1e 100644 --- a/src/mlpack/core/data/string_encoding_dictionary.hpp +++ b/src/mlpack/core/data/string_encoding_dictionary.hpp @@ -96,7 +96,7 @@ class StringEncodingDictionary template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(mapping); + ar & CEREAL_NVP(mapping); } private: @@ -217,7 +217,7 @@ class StringEncodingDictionary { size_t numTokens = tokens.size(); - ar & BOOST_SERIALIZATION_NVP(numTokens); + ar & CEREAL_NVP(numTokens); if (Archive::is_loading::value) { @@ -225,10 +225,10 @@ class StringEncodingDictionary for (std::string& token : tokens) { - ar & BOOST_SERIALIZATION_NVP(token); + ar & CEREAL_NVP(token); size_t tokenValue = 0; - ar & BOOST_SERIALIZATION_NVP(tokenValue); + ar & CEREAL_NVP(tokenValue); mapping[token] = tokenValue; } } @@ -236,10 +236,10 @@ class StringEncodingDictionary { for (std::string& token : tokens) { - ar & BOOST_SERIALIZATION_NVP(token); + ar & CEREAL_NVP(token); size_t tokenValue = mapping.at(token); - ar & BOOST_SERIALIZATION_NVP(tokenValue); + ar & CEREAL_NVP(tokenValue); } } } @@ -330,8 +330,8 @@ class StringEncodingDictionary template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(mapping); - ar & BOOST_SERIALIZATION_NVP(size); + ar & CEREAL_NVP(mapping); + ar & CEREAL_NVP(size); } private: diff --git a/src/mlpack/core/data/string_encoding_impl.hpp b/src/mlpack/core/data/string_encoding_impl.hpp index 41b3b5c2c4..a08d1ee36e 100644 --- a/src/mlpack/core/data/string_encoding_impl.hpp +++ b/src/mlpack/core/data/string_encoding_impl.hpp @@ -201,8 +201,8 @@ template void StringEncoding::serialize( Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(encodingPolicy); - ar & BOOST_SERIALIZATION_NVP(dictionary); + ar & CEREAL_NVP(encodingPolicy); + ar & CEREAL_NVP(dictionary); } } // namespace data diff --git a/src/mlpack/core/data/string_encoding_policies/tf_idf_encoding_policy.hpp b/src/mlpack/core/data/string_encoding_policies/tf_idf_encoding_policy.hpp index d00a51ddfa..f3ebe83ac9 100644 --- a/src/mlpack/core/data/string_encoding_policies/tf_idf_encoding_policy.hpp +++ b/src/mlpack/core/data/string_encoding_policies/tf_idf_encoding_policy.hpp @@ -259,8 +259,8 @@ class TfIdfEncodingPolicy template void serialize(Archive& ar, const unsigned int /* version */) { - ar & BOOST_SERIALIZATION_NVP(tfType); - ar & BOOST_SERIALIZATION_NVP(smoothIdf); + ar & CEREAL_NVP(tfType); + ar & CEREAL_NVP(smoothIdf); } private: