From 035fc14a8cba46eb1b13957e16141b57f3979159 Mon Sep 17 00:00:00 2001 From: Marcus Edel Date: Sun, 1 Jul 2018 13:40:00 +0200 Subject: [PATCH 1/2] Serialize merge layer parameter. --- src/mlpack/methods/ann/layer/add_merge_impl.hpp | 5 +++++ src/mlpack/methods/ann/layer/multiply_merge_impl.hpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/mlpack/methods/ann/layer/add_merge_impl.hpp b/src/mlpack/methods/ann/layer/add_merge_impl.hpp index 71437d6859..f1b5376477 100644 --- a/src/mlpack/methods/ann/layer/add_merge_impl.hpp +++ b/src/mlpack/methods/ann/layer/add_merge_impl.hpp @@ -115,10 +115,15 @@ template void AddMerge::serialize( Archive& ar, const unsigned int /* version */) { + + // Be sure to clear other layers before loading. if (Archive::is_loading::value) network.clear(); ar & BOOST_SERIALIZATION_NVP(network); + ar & BOOST_SERIALIZATION_NVP(model); + ar & BOOST_SERIALIZATION_NVP(run); + ar & BOOST_SERIALIZATION_NVP(ownsLayer); } } // namespace ann diff --git a/src/mlpack/methods/ann/layer/multiply_merge_impl.hpp b/src/mlpack/methods/ann/layer/multiply_merge_impl.hpp index 19d670d113..12ff210292 100644 --- a/src/mlpack/methods/ann/layer/multiply_merge_impl.hpp +++ b/src/mlpack/methods/ann/layer/multiply_merge_impl.hpp @@ -115,10 +115,14 @@ template void MultiplyMerge::serialize( Archive& ar, const unsigned int /* version */) { + // Be sure to clear other layers before loading. if (Archive::is_loading::value) network.clear(); ar & BOOST_SERIALIZATION_NVP(network); + ar & BOOST_SERIALIZATION_NVP(model); + ar & BOOST_SERIALIZATION_NVP(run); + ar & BOOST_SERIALIZATION_NVP(ownsLayer); } } // namespace ann From 328b803b407ad61769f18d9be09d3870649497a8 Mon Sep 17 00:00:00 2001 From: Marcus Edel Date: Sun, 1 Jul 2018 13:47:39 +0200 Subject: [PATCH 2/2] Minor style fix (remove whitespace). --- src/mlpack/methods/ann/layer/add_merge_impl.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mlpack/methods/ann/layer/add_merge_impl.hpp b/src/mlpack/methods/ann/layer/add_merge_impl.hpp index f1b5376477..6d1db08cd5 100644 --- a/src/mlpack/methods/ann/layer/add_merge_impl.hpp +++ b/src/mlpack/methods/ann/layer/add_merge_impl.hpp @@ -115,7 +115,6 @@ template void AddMerge::serialize( Archive& ar, const unsigned int /* version */) { - // Be sure to clear other layers before loading. if (Archive::is_loading::value) network.clear();