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

BOOST::SERIALIZATION --> CEREAL in core/data

Browse Source 
Signed-off-by: Omar Shrit <omar@shrit.me>
This commit is contained in:
Omar Shrit
2020-06-30 19:11:44 +02:00
parent 4443f0ebc0
commit 028a1d3d91
11 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mlpack/core/data/dataset_mapper.hpp
+2 -2
View File
@@ -153,8 +153,8 @@ class DatasetMapper
template<typename Archive>
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.
src/mlpack/core/data/image_info.hpp
+4 -4
View File
@@ -73,10 +73,10 @@ class ImageInfo
template<typename Archive>
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:
src/mlpack/core/data/scaler_methods/max_abs_scaler.hpp
+3 -3
View File
@@ -103,9 +103,9 @@ class MaxAbsScaler
template<typename Archive>
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.
src/mlpack/core/data/scaler_methods/mean_normalization.hpp
+4 -4
View File
@@ -106,10 +106,10 @@ class MeanNormalization
template<typename Archive>
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:
src/mlpack/core/data/scaler_methods/min_max_scaler.hpp
+6 -6
View File
@@ -130,12 +130,12 @@ class MinMaxScaler
template<typename Archive>
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:
src/mlpack/core/data/scaler_methods/pca_whitening.hpp
+4 -4
View File
@@ -123,10 +123,10 @@ class PCAWhitening
template<typename Archive>
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:
src/mlpack/core/data/scaler_methods/standard_scaler.hpp
+2 -2
View File
@@ -101,8 +101,8 @@ class StandardScaler
template<typename Archive>
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:
src/mlpack/core/data/scaler_methods/zca_whitening.hpp
+1 -1
View File
@@ -104,7 +104,7 @@ class ZCAWhitening
template<typename Archive>
void serialize(Archive& ar, const unsigned int /* version */)
{
ar & BOOST_SERIALIZATION_NVP(pca);
ar & CEREAL_NVP(pca);
}
private:
src/mlpack/core/data/string_encoding_dictionary.hpp
+8 -8
View File
@@ -96,7 +96,7 @@ class StringEncodingDictionary
template<typename Archive>
void serialize(Archive& ar, const unsigned int /* version */)
{
ar & BOOST_SERIALIZATION_NVP(mapping);
ar & CEREAL_NVP(mapping);
}
private:
@@ -217,7 +217,7 @@ class StringEncodingDictionary<boost::string_view>
{
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<boost::string_view>
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<boost::string_view>
{
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<int>
template<typename Archive>
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:
src/mlpack/core/data/string_encoding_impl.hpp
+2 -2
View File
@@ -201,8 +201,8 @@ template<typename Archive>
void StringEncoding<EncodingPolicyType, DictionaryType>::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
src/mlpack/core/data/string_encoding_policies/tf_idf_encoding_policy.hpp
+2 -2
View File
@@ -259,8 +259,8 @@ class TfIdfEncodingPolicy
template<typename Archive>
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: