Commit db0d2e4f authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

added support for cereal

parent a23f6ad7
...@@ -9,9 +9,6 @@ ...@@ -9,9 +9,6 @@
#include <thallium/margo_exception.hpp> #include <thallium/margo_exception.hpp>
#include <thallium/buffer.hpp> #include <thallium/buffer.hpp>
#include <thallium/packed_response.hpp> #include <thallium/packed_response.hpp>
#include <thallium/serialization/serialize.hpp>
#include <thallium/serialization/stl/vector.hpp>
#include <thallium/serialization/buffer_output_archive.hpp>
namespace thallium { namespace thallium {
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <margo.h> #include <margo.h>
#include <thallium/endpoint.hpp> #include <thallium/endpoint.hpp>
#include <thallium/margo_exception.hpp> #include <thallium/margo_exception.hpp>
#include <thallium/serialization/stl/vector.hpp>
namespace thallium { namespace thallium {
...@@ -335,10 +336,10 @@ public: ...@@ -335,10 +336,10 @@ public:
* @brief Function that serializes a bulk object into an archive. * @brief Function that serializes a bulk object into an archive.
* *
* @tparam A Archive type. * @tparam A Archive type.
* @param ar Input archive. * @param ar Output archive.
*/ */
template<typename A> template<typename A>
void save(A& ar) { void save(A& ar) const {
if(m_bulk == HG_BULK_NULL) { if(m_bulk == HG_BULK_NULL) {
std::vector<char> buf; std::vector<char> buf;
ar & buf; ar & buf;
...@@ -356,7 +357,7 @@ public: ...@@ -356,7 +357,7 @@ public:
* @brief Deserializes a bulk object from an output archive. * @brief Deserializes a bulk object from an output archive.
* *
* @tparam A Archive type. * @tparam A Archive type.
* @param ar Output archive. * @param ar Input archive.
*/ */
template<typename A> template<typename A>
void load(A& ar); void load(A& ar);
......
...@@ -11,18 +11,15 @@ ...@@ -11,18 +11,15 @@
#include <utility> #include <utility>
#include <chrono> #include <chrono>
#include <margo.h> #include <margo.h>
#include <thallium/config.hpp>
#include <thallium/buffer.hpp> #include <thallium/buffer.hpp>
#include <thallium/timeout.hpp> #include <thallium/timeout.hpp>
#include <thallium/packed_response.hpp> #include <thallium/packed_response.hpp>
#include <thallium/async_response.hpp> #include <thallium/async_response.hpp>
#include <thallium/margo_exception.hpp> #include <thallium/margo_exception.hpp>
#ifdef USE_CEREAL #include <thallium/serialization/serialize.hpp>
#include <thallium/serialization/cereal/archives.hpp> #include <thallium/serialization/buffer_output_archive.hpp>
#else #include <thallium/serialization/stl/vector.hpp>
#include <thallium/serialization/serialize.hpp>
#include <thallium/serialization/stl/vector.hpp>
#include <thallium/serialization/buffer_output_archive.hpp>
#endif
namespace thallium { namespace thallium {
...@@ -202,13 +199,8 @@ public: ...@@ -202,13 +199,8 @@ public:
template<typename ... T> template<typename ... T>
packed_response operator()(T&& ... args) const { packed_response operator()(T&& ... args) const {
buffer b; buffer b;
#ifdef USE_CEREAL
cereal_output_archive arch(b, *m_engine);
arch(std::forward<T>(args)...);
#else
buffer_output_archive arch(b, *m_engine); buffer_output_archive arch(b, *m_engine);
serialize_many(arch, std::forward<T>(args)...); arch(std::forward<T>(args)...);
#endif
return forward(b); return forward(b);
} }
...@@ -229,13 +221,8 @@ public: ...@@ -229,13 +221,8 @@ public:
template<typename R, typename P, typename ... T> template<typename R, typename P, typename ... T>
packed_response timed(const std::chrono::duration<R,P>& t, T&& ... args) const { packed_response timed(const std::chrono::duration<R,P>& t, T&& ... args) const {
buffer b; buffer b;
#ifdef USE_CEREAL
cereal_output_archive arch(b, *m_engine);
arch(std::forward<T>(args)...);
#else
buffer_output_archive arch(b, *m_engine); buffer_output_archive arch(b, *m_engine);
serialize_many(arch, std::forward<T>(args)...); arch(std::forward<T>(args)...);
#endif
std::chrono::duration<double, std::milli> fp_ms = t; std::chrono::duration<double, std::milli> fp_ms = t;
double timeout_ms = fp_ms.count(); double timeout_ms = fp_ms.count();
return forward(b, timeout_ms); return forward(b, timeout_ms);
...@@ -280,13 +267,8 @@ public: ...@@ -280,13 +267,8 @@ public:
template<typename ... T> template<typename ... T>
async_response async(T&& ... t) { async_response async(T&& ... t) {
buffer b; buffer b;
#ifdef USE_CEREAL
cereal_output_archive arch(b, *m_engine);
arch(std::forward<T>(t)...);
#else
buffer_output_archive arch(b, *m_engine); buffer_output_archive arch(b, *m_engine);
serialize_many(arch, std::forward<T>(t)...); arch(std::forward<T>(t)...);
#endif
return iforward(b); return iforward(b);
} }
...@@ -306,13 +288,8 @@ public: ...@@ -306,13 +288,8 @@ public:
template<typename R, typename P, typename ... T> template<typename R, typename P, typename ... T>
async_response timed_async(const std::chrono::duration<R,P>& t, T&& ... args) { async_response timed_async(const std::chrono::duration<R,P>& t, T&& ... args) {
buffer b; buffer b;
#ifdef USE_CEREAL
cereal_output_archive arch(b, *m_engine);
arch(std::forward<T>(t)...);
#else
buffer_output_archive arch(b, *m_engine); buffer_output_archive arch(b, *m_engine);
serialize_many(arch, std::forward<T>(args)...); arch(std::forward<T>(t)...);
#endif
std::chrono::duration<double, std::milli> fp_ms = t; std::chrono::duration<double, std::milli> fp_ms = t;
double timeout_ms = fp_ms.count(); double timeout_ms = fp_ms.count();
return iforward(b, timeout_ms); return iforward(b, timeout_ms);
......
#undef THALLIUM_USE_CEREAL
#undef ENABLE_CEREAL
#cmakedefine ENABLE_CEREAL #cmakedefine ENABLE_CEREAL
#ifdef ENABLE_CEREAL #ifdef ENABLE_CEREAL
#define USE_CEREAL #define THALLIUM_USE_CEREAL
#undef ENABLE_CEREAL
#endif #endif
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <vector> #include <vector>
#include <atomic> #include <atomic>
#include <margo.h> #include <margo.h>
#include <thallium/config.hpp>
#include <thallium/pool.hpp> #include <thallium/pool.hpp>
#include <thallium/tuple_util.hpp> #include <thallium/tuple_util.hpp>
#include <thallium/function_cast.hpp> #include <thallium/function_cast.hpp>
...@@ -320,9 +321,13 @@ public: ...@@ -320,9 +321,13 @@ public:
* *
* @return a remote_procedure object. * @return a remote_procedure object.
*/ */
template<typename ... Args> template<typename A1, typename ... Args>
remote_procedure define(const std::string& name,
const std::function<void(const request&, A1, Args...)>& fun,
uint16_t provider_id=0, const pool& p = pool());
remote_procedure define(const std::string& name, remote_procedure define(const std::string& name,
const std::function<void(const request&, Args...)>& fun, const std::function<void(const request&)>& fun,
uint16_t provider_id=0, const pool& p = pool()); uint16_t provider_id=0, const pool& p = pool());
/** /**
...@@ -391,19 +396,15 @@ public: ...@@ -391,19 +396,15 @@ public:
#include <thallium/remote_procedure.hpp> #include <thallium/remote_procedure.hpp>
#include <thallium/proc_buffer.hpp> #include <thallium/proc_buffer.hpp>
#ifdef USE_CEREAL #include <thallium/serialization/buffer_input_archive.hpp>
#include <thallium/serialization/cereal/archives.hpp> #include <thallium/serialization/buffer_output_archive.hpp>
#else #include <thallium/serialization/stl/tuple.hpp>
#include <thallium/serialization/stl/tuple.hpp>
#include <thallium/serialization/buffer_input_archive.hpp>
#include <thallium/serialization/buffer_output_archive.hpp>
#endif
namespace thallium { namespace thallium {
template<typename ... Args> template<typename A1, typename ... Args>
remote_procedure engine::define(const std::string& name, remote_procedure engine::define(const std::string& name,
const std::function<void(const request&, Args...)>& fun, const std::function<void(const request&, A1, Args...)>& fun,
uint16_t provider_id, const pool& p) { uint16_t provider_id, const pool& p) {
hg_id_t id = margo_provider_register_name(m_mid, name.c_str(), hg_id_t id = margo_provider_register_name(m_mid, name.c_str(),
...@@ -414,28 +415,13 @@ remote_procedure engine::define(const std::string& name, ...@@ -414,28 +415,13 @@ remote_procedure engine::define(const std::string& name,
p.native_handle()); p.native_handle());
m_rpcs[id] = [fun,this](const request& r, const buffer& b) { m_rpcs[id] = [fun,this](const request& r, const buffer& b) {
#ifdef USE_CEREAL std::function<void(A1, Args...)> call_function = [&fun, &r](A1&& a1, Args&&... args) {
std::function<void(Args...)> deserialize = [&b, this](Args&&... args) { fun(r, std::forward<A1>(a1), std::forward<Args>(args)...);
cereal_input_archive arch(b, *this);
arch(std::forward<Args>(args)...);
}; };
std::function<void(Args...)> call_function = [&fun, &r](Args&&... args) { std::tuple<typename std::decay<A1>::type, typename std::decay<Args>::type...> iargs;
fun(r, std::forward<Args>(args)...);
};
std::tuple<typename std::decay<Args>::type...> iargs;
apply_function_to_tuple(deserialize, iargs);
apply_function_to_tuple(call_function, iargs);
#else
std::function<void(Args...)> l = [&fun, &r](Args&&... args) {
fun(r, std::forward<Args>(args)...);
};
std::tuple<typename std::decay<Args>::type...> iargs;
if(sizeof...(Args) > 0) {
buffer_input_archive iarch(b, *this); buffer_input_archive iarch(b, *this);
iarch & iargs; iarch(iargs);
} apply_function_to_tuple(call_function, iargs);
apply_function_to_tuple(l,iargs);
#endif
}; };
rpc_callback_data* cb_data = new rpc_callback_data; rpc_callback_data* cb_data = new rpc_callback_data;
......
...@@ -7,12 +7,8 @@ ...@@ -7,12 +7,8 @@
#define __THALLIUM_PACKED_RESPONSE_HPP #define __THALLIUM_PACKED_RESPONSE_HPP
#include <thallium/buffer.hpp> #include <thallium/buffer.hpp>
#ifdef USE_CEREAL #include <thallium/serialization/serialize.hpp>
#include <thallium/serialization/cereal/archives.hpp> #include <thallium/serialization/buffer_input_archive.hpp>
#else
#include <thallium/serialization/serialize.hpp>
#include <thallium/serialization/buffer_input_archive.hpp>
#endif
namespace thallium { namespace thallium {
...@@ -56,13 +52,8 @@ public: ...@@ -56,13 +52,8 @@ public:
template<typename T> template<typename T>
T as() const { T as() const {
T t; T t;
#ifdef USE_CEREAL
cereal_input_archive iarch(m_buffer, *m_engine);
iarch(t);
#else
buffer_input_archive iarch(m_buffer, *m_engine); buffer_input_archive iarch(m_buffer, *m_engine);
iarch & t; iarch(t);
#endif
return t; return t;
} }
...@@ -86,18 +77,8 @@ public: ...@@ -86,18 +77,8 @@ public:
std::tuple<typename std::decay<T1>::type, std::tuple<typename std::decay<T1>::type,
typename std::decay<T2>::type, typename std::decay<T2>::type,
typename std::decay_t<Tn>::type...> t; typename std::decay_t<Tn>::type...> t;
#ifdef USE_CEREAL
std::function<void(T1, T2, Tn...)> deserialize = [this](T1&& t1, T2&& t2, Tn&&... tn) {
cereal_input_archive arch(m_buffer, *m_engine);
arch(std::forward<T1>(t1),
std::forward<T2>(t2),
std::forward<Tn>(tn)...);
};
apply_function_to_tuple(deserialize, t);
#else
buffer_input_archive iarch(m_buffer, *m_engine); buffer_input_archive iarch(m_buffer, *m_engine);
iarch & t; arch(t);
#endif
return t; return t;
} }
......
...@@ -8,12 +8,8 @@ ...@@ -8,12 +8,8 @@
#include <margo.h> #include <margo.h>
#include <thallium/margo_exception.hpp> #include <thallium/margo_exception.hpp>
#ifdef USE_CEREAL #include <thallium/serialization/serialize.hpp>
#include <thallium/serialization/cereal/archives.hpp> #include <thallium/serialization/buffer_output_archive.hpp>
#else
#include <thallium/serialization/serialize.hpp>
#include <thallium/serialization/buffer_output_archive.hpp>
#endif
namespace thallium { namespace thallium {
...@@ -117,13 +113,8 @@ public: ...@@ -117,13 +113,8 @@ public:
if(m_disable_response) return; // XXX throwing an exception? if(m_disable_response) return; // XXX throwing an exception?
if(m_handle != HG_HANDLE_NULL) { if(m_handle != HG_HANDLE_NULL) {
buffer b; buffer b;
#ifdef USE_CEREAL
cereal_output_archive arch(b, *m_engine);
arch(std::forward<T>(t)...);
#else
buffer_output_archive arch(b, *m_engine); buffer_output_archive arch(b, *m_engine);
serialize_many(arch, std::forward<T>(t)...); arch(std::forward<T>(t)...);
#endif
hg_return_t ret = margo_respond(m_handle, &b); hg_return_t ret = margo_respond(m_handle, &b);
MARGO_ASSERT(ret, margo_respond); MARGO_ASSERT(ret, margo_respond);
} }
......
...@@ -6,6 +6,21 @@ ...@@ -6,6 +6,21 @@
#ifndef __THALLIUM_BUFFER_INPUT_ARCHIVE_HPP #ifndef __THALLIUM_BUFFER_INPUT_ARCHIVE_HPP
#define __THALLIUM_BUFFER_INPUT_ARCHIVE_HPP #define __THALLIUM_BUFFER_INPUT_ARCHIVE_HPP
#include <thallium/config.hpp>
#ifdef THALLIUM_USE_CEREAL
#include <thallium/serialization/cereal/archives.hpp>
namespace thallium {
using buffer_input_archive = cereal_input_archive;
}
#else
#include <type_traits> #include <type_traits>
#include <stdexcept> #include <stdexcept>
#include <cstring> #include <cstring>
...@@ -133,3 +148,4 @@ public: ...@@ -133,3 +148,4 @@ public:
} }
#endif #endif
#endif
...@@ -6,6 +6,20 @@ ...@@ -6,6 +6,20 @@
#ifndef __THALLIUM_BUFFER_OUTPUT_ARCHIVE_HPP #ifndef __THALLIUM_BUFFER_OUTPUT_ARCHIVE_HPP
#define __THALLIUM_BUFFER_OUTPUT_ARCHIVE_HPP #define __THALLIUM_BUFFER_OUTPUT_ARCHIVE_HPP
#include <thallium/config.hpp>
#ifdef THALLIUM_USE_CEREAL
#include <thallium/serialization/cereal/archives.hpp>
namespace thallium {
using buffer_output_archive = cereal_output_archive;
}
#else
#include <type_traits> #include <type_traits>
#include <thallium/serialization/serialize.hpp> #include <thallium/serialization/serialize.hpp>
#include <thallium/buffer.hpp> #include <thallium/buffer.hpp>
...@@ -131,3 +145,4 @@ public: ...@@ -131,3 +145,4 @@ public:
} }
#endif #endif
#endif
...@@ -39,7 +39,7 @@ namespace thallium { ...@@ -39,7 +39,7 @@ namespace thallium {
~cereal_output_archive() = default; ~cereal_output_archive() = default;
inline void write(void* const data, size_t size) { inline void write(const void* data, size_t size) {
if(m_pos+size > m_buffer.size()) { if(m_pos+size > m_buffer.size()) {
if(m_pos+size > m_buffer.capacity()) { if(m_pos+size > m_buffer.capacity()) {
m_buffer.reserve(m_buffer.capacity()*2); m_buffer.reserve(m_buffer.capacity()*2);
......
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
#ifndef SERIALIZE_H #ifndef SERIALIZE_H
#define SERIALIZE_H #define SERIALIZE_H
#include <thallium/config.hpp>
#ifndef THALLIUM_USE_CEREAL
#include <utility> #include <utility>
#include <type_traits> #include <type_traits>
...@@ -205,3 +209,4 @@ inline void serialize_many(A& ar, T&& t) { ...@@ -205,3 +209,4 @@ inline void serialize_many(A& ar, T&& t) {
} }
#endif #endif
#endif
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
#ifndef __THALLIUM_ARRAY_SERIALIZATION_HPP #ifndef __THALLIUM_ARRAY_SERIALIZATION_HPP
#define __THALLIUM_ARRAY_SERIALIZATION_HPP #define __THALLIUM_ARRAY_SERIALIZATION_HPP
#include <thallium/config.hpp>
#ifdef THALLIUM_USE_CEREAL
#include <cereal/types/array.hpp>
#else
#include <type_traits> #include <type_traits>
#include <array> #include <array>
...@@ -52,3 +58,4 @@ inline void load(A& ar, std::array<T,N>& v) { ...@@ -52,3 +58,4 @@ inline void load(A& ar, std::array<T,N>& v) {
} // namespace thallium } // namespace thallium
#endif #endif
#endif
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
#ifndef __THALLIUM_COMPLEX_SERIALIZATION_HPP #ifndef __THALLIUM_COMPLEX_SERIALIZATION_HPP
#define __THALLIUM_COMPLEX_SERIALIZATION_HPP #define __THALLIUM_COMPLEX_SERIALIZATION_HPP
#include <thallium/config.hpp>
#ifdef THALLIUM_USE_CEREAL
#include <cereal/types/complex.hpp>
#else
#include <complex> #include <complex>
namespace thallium { namespace thallium {
...@@ -25,3 +31,4 @@ inline void load(A& ar, std::complex<T>& t) { ...@@ -25,3 +31,4 @@ inline void load(A& ar, std::complex<T>& t) {
} }
#endif #endif
#endif
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
#ifndef __THALLIUM_DEQUE_SERIALIZATION_HPP #ifndef __THALLIUM_DEQUE_SERIALIZATION_HPP
#define __THALLIUM_DEQUE_SERIALIZATION_HPP #define __THALLIUM_DEQUE_SERIALIZATION_HPP
#include <thallium/config.hpp>
#ifdef THALLIUM_USE_CEREAL
#include <cereal/types/deque.hpp>
#else
#include <deque> #include <deque>
namespace thallium { namespace thallium {
...@@ -33,3 +39,4 @@ inline void load(A& ar, std::deque<T,Alloc>& l) { ...@@ -33,3 +39,4 @@ inline void load(A& ar, std::deque<T,Alloc>& l) {
} }
#endif #endif
#endif
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
#ifndef __THALLIUM_FORWARD_LIST_SERIALIZATION_HPP #ifndef __THALLIUM_FORWARD_LIST_SERIALIZATION_HPP
#define __THALLIUM_FORWARD_LIST_SERIALIZATION_HPP #define __THALLIUM_FORWARD_LIST_SERIALIZATION_HPP
#include <thallium/config.hpp>
#ifdef THALLIUM_USE_CEREAL
#include <cereal/types/forward_list.hpp>
#else
#include <forward_list> #include <forward_list>
namespace thallium { namespace thallium {
...@@ -33,3 +39,4 @@ inline void load(A& ar, std::forward_list<T,Alloc>& l) { ...@@ -33,3 +39,4 @@ inline void load(A& ar, std::forward_list<T,Alloc>& l) {
} }
#endif #endif
#endif
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
#ifndef __THALLIUM_LIST_SERIALIZATION_HPP #ifndef __THALLIUM_LIST_SERIALIZATION_HPP