summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/codec/c++/id_map.hpp8
-rw-r--r--modules/codec/c++/interface.hpp11
-rw-r--r--modules/io_codec/c++/rpc.hpp30
-rw-r--r--modules/remote-sycl/c++/remote.hpp79
-rw-r--r--modules/remote-sycl/examples/sycl_basic.cpp4
-rw-r--r--modules/remote-sycl/examples/sycl_basic.hpp4
-rw-r--r--modules/remote-sycl/examples/sycl_basic_kernel.cpp20
7 files changed, 88 insertions, 68 deletions
diff --git a/modules/codec/c++/id_map.hpp b/modules/codec/c++/id_map.hpp
index bb31846..84c04e7 100644
--- a/modules/codec/c++/id_map.hpp
+++ b/modules/codec/c++/id_map.hpp
@@ -13,13 +13,13 @@ namespace saw {
* Insert - O(1)
* Erase - O(n) ? Dunno
*/
-template<typename T, typename Encoding>
+template<typename T, typename Encoding, typename Storage>
class id_map final {
private:
/**
* Container which stores the primary data
*/
- std::vector<data<T,Encoding>> data_;
+ std::vector<data<T,Encoding,Storage>> data_;
/**
* Container which tracks free'd/fragmented elements within the
* main container
@@ -65,7 +65,7 @@ public:
* Inserts an element into the container and returns either an id on success
* or an error on failure.
*/
- error_or<id<T>> insert(data<T,Encoding> val) noexcept {
+ error_or<id<T>> insert(data<T,Encoding,Storage> val) noexcept {
/// @todo Fix size_t and id base type
if(free_ids_.empty()){
try {
@@ -145,7 +145,7 @@ public:
* Returns an error on failure and returns
* a value pointer on success.
*/
- error_or<data<T,Encoding>*> find(const id<T>& val){
+ error_or<data<T,Encoding,Storage>*> find(const id<T>& val){
if(val.get_value() >= data_.size()){
return make_error<err::not_found>("ID is too large");
}
diff --git a/modules/codec/c++/interface.hpp b/modules/codec/c++/interface.hpp
index d55b415..0186f09 100644
--- a/modules/codec/c++/interface.hpp
+++ b/modules/codec/c++/interface.hpp
@@ -33,7 +33,16 @@ public:
func_{std::move(func)}
{}
- error_or<data<Response, Encode, Storage>> call(data<Request, Encode, Storage> req, Context ctx = {}){
+ error_or<data<Response, Encode, Storage>> call(data<Request, Encode, Storage>& req, Context ctx = {}){
+ if constexpr (std::is_same_v<Context, void_t>){
+ (void) ctx;
+ return func_(req);
+ } else {
+ return func_(req, ctx);
+ }
+ }
+
+ error_or<data<Response, Encode, Storage>> call(data<Request, Encode, Storage>&& req, Context ctx = {}){
if constexpr (std::is_same_v<Context, void_t>){
(void) ctx;
return func_(std::move(req));
diff --git a/modules/io_codec/c++/rpc.hpp b/modules/io_codec/c++/rpc.hpp
index 04293cd..f01ebd5 100644
--- a/modules/io_codec/c++/rpc.hpp
+++ b/modules/io_codec/c++/rpc.hpp
@@ -13,13 +13,13 @@ namespace saw {
/**
* This class acts as a helper for rpc calls and representing data on the remote.
*/
-template<typename T, typename Encoding>
+template<typename T, typename Encoding, typename Storage>
class data_or_id {
private:
/**
* Variant representing the either id or data class.
*/
- std::variant<id<T>, data<T,Encoding>> doi_;
+ std::variant<id<T>, data<T,Encoding, Storage>> doi_;
public:
/**
* Constructor for instantiating.
@@ -31,7 +31,7 @@ public:
/**
* Constructor for instantiating.
*/
- data_or_id(data<T,Encoding> val):
+ data_or_id(data<T,Encoding, Storage> val):
doi_{std::move(val)}
{}
@@ -46,7 +46,7 @@ public:
* Check if this class holds data.
*/
bool is_data() const {
- return std::holds_alternative<data<T,Encoding>>(doi_);
+ return std::holds_alternative<data<T,Encoding,Storage>>(doi_);
}
/**
@@ -59,22 +59,22 @@ public:
/**
* Return a data reference.
*/
- data<T,Encoding>& get_data(){
- return std::get<data<T,Encoding>>(doi_);
+ data<T,Encoding, Storage>& get_data(){
+ return std::get<data<T,Encoding, Storage>>(doi_);
}
/**
* Return a data reference.
*/
- const data<T,Encoding>& get_data() const {
- return std::get<data<T,Encoding>>(doi_);
+ const data<T,Encoding,Storage>& get_data() const {
+ return std::get<data<T,Encoding,Storage>>(doi_);
}
};
/**
* Representing data on the remote
*/
-template<typename T, typename Encoding, typename Remote>
+template<typename T, typename Encoding, typename Storage, typename Remote>
class remote_data {
private:
id<T> id_;
@@ -86,24 +86,24 @@ public:
/**
* Wait until data arrives
*/
- error_or<data<T, Encoding>> wait(wait_scope& wait);
+ error_or<data<T, Encoding, Storage>> wait(wait_scope& wait);
/**
* Asynchronously wait for a result
*/
- conveyor<data<T, Encoding>> on_receive();
+ conveyor<data<T, Encoding, Storage>> on_receive();
};
/**
* Client RPC reference structure
*/
-template<typename Iface, typename Encoding, typename Remote>
+template<typename Iface, typename Encoding, typename Storage, typename Remote>
class rpc_client {
/**
* request the data from the remote
*/
template<typename IdT>
- remote_data<IdT, Encoding, Remote> request_data(id<IdT> data);
+ remote_data<IdT, Encoding, Storage, Remote> request_data(id<IdT> data);
/** @todo
* Determine type based on Name
@@ -157,8 +157,8 @@ class remote {
/**
* Connect to a remote
*/
- template<typename Iface, typename Encode>
- conveyor<rpc_client<Iface, Encode, Remote>> connect(const remote_address<Remote>& addr);
+ template<typename Iface, typename Encode, typename Storage>
+ conveyor<rpc_client<Iface, Encode, Storage, Remote>> connect(const remote_address<Remote>& addr);
/**
* Start listening
diff --git a/modules/remote-sycl/c++/remote.hpp b/modules/remote-sycl/c++/remote.hpp
index d956314..a2b5a87 100644
--- a/modules/remote-sycl/c++/remote.hpp
+++ b/modules/remote-sycl/c++/remote.hpp
@@ -17,16 +17,16 @@ class remote<rmt::Sycl>;
/**
* Remote data class for the Sycl backend.
*/
-template<typename T, typename Encoding>
-class remote_data<T, Encoding, rmt::Sycl> {
+template<typename T, typename Encoding, typename Storage>
+class remote_data<T, Encoding, Storage, rmt::Sycl> {
private:
id<T> id_;
- id_map<T,Encoding>* map_;
+ id_map<T,Encoding,rmt::Sycl>* map_;
public:
/**
* Main constructor
*/
- remote_data(const id<T>& id, id_map<T, Encoding>& map):
+ remote_data(const id<T>& id, id_map<T, Encoding, rmt::Sycl>& map):
id_{id},
map_{&map}
{}
@@ -34,14 +34,14 @@ public:
/**
* Request data asynchronously
*/
- conveyor<data<T,Encoding>> on_receive(); /// Stopped here
+ conveyor<data<T,Encoding,Storage>> on_receive(); /// Stopped here
};
/**
*
*/
template<typename T, uint64_t N>
-class data<schema::Primitive<T,N>, encode::Native<rmt::Sycl>> {
+class data<schema::Primitive<T,N>, encode::Native, rmt::Sycl> {
public:
using Schema = schema::Primitive<T,N>;
using NativeType = typename native_data_type<Schema>::type;
@@ -64,7 +64,7 @@ public:
};
template<typename T, uint64_t D>
-class data<schema::Array<T,D>, encode::Native<rmt::Sycl>> {
+class data<schema::Array<T,D>, encode::Native, rmt::Sycl> {
public:
using Schema = schema::Array<T,D>;
private:
@@ -86,8 +86,8 @@ public:
}
}
- template<typename Encoding>
- data(const data<Schema, Encoding>& from, cl::sycl::queue& q__):
+ template<typename Encoding, typename Storage>
+ data(const data<Schema, Encoding, Storage>& from, cl::sycl::queue& q__):
total_length_{from.size()},
device_data_{cl::sycl::malloc_device<typename native_data_type<T>::type>(from.size(), q__)},
queue_{&q__}
@@ -105,28 +105,32 @@ public:
}
}
- data<T,encode::Native<rmt::Sycl>>& at(uint64_t i){
+ // data<T,encode::Native,rmt::Sycl>& at(uint64_t i){
+ typename native_data_type<T>::type& at(uint64_t i){
return device_data_[i];
}
+
+ uint64_t size() const {
+ return total_length_;
+ }
};
namespace impl {
-
-template<typename Iface, typename Encoding>
+template<typename Iface, typename Encoding, typename Storage>
struct rpc_id_map_helper {
- static_assert(always_false<Iface, Encoding>, "Only support Interface schema types.");
+ static_assert(always_false<Iface, Encoding,Storage>, "Only supports Interface schema types.");
};
-template<typename... Members, typename Encoding>
-struct rpc_id_map_helper<schema::Interface<Members...>, Encoding> {
- std::tuple<id_map<typename Members::ValueType::ResponseT, Encoding>...> maps;
+template<typename... Members, typename Encoding, typename Storage>
+struct rpc_id_map_helper<schema::Interface<Members...>, Encoding, Storage> {
+ std::tuple<id_map<typename Members::ValueType::ResponseT, Encoding, Storage>...> maps;
};
}
/**
* Rpc Client class for the Sycl backend.
*/
-template<typename Iface, typename Encoding>
-class rpc_client<Iface, Encoding, rmt::Sycl> {
+template<typename Iface, typename Encoding, typename Storage>
+class rpc_client<Iface, Encoding, Storage, rmt::Sycl> {
public:
private:
/**
@@ -141,12 +145,13 @@ public:
/**
* Rpc call
*/
- template<string_literal Name, typename ClientEncoding>
+ template<string_literal Name>
error_or<
id<
typename schema_member_type<Name, Iface>::type::ResponseT
>
- > call(data_or_id<typename schema_member_type<Name, Iface>::type::RequestT, ClientEncoding> input){
+ > call(data_or_id<typename schema_member_type<Name, Iface>::type::RequestT, Encoding, Storage> input){
+ (void) input;
return make_error<err::not_implemented>("RpcClient side is not implemented");
}
@@ -159,7 +164,7 @@ template<typename Iface, typename Encoding>
class rpc_server<Iface, Encoding, rmt::Sycl> {
public:
using InterfaceCtxT = cl::sycl::queue*;
- using InterfaceT = interface<Iface, Encoding, InterfaceCtxT>;
+ using InterfaceT = interface<Iface, Encoding, rmt::Sycl, InterfaceCtxT>;
private:
/**
* Command queue for the sycl backend
@@ -169,22 +174,23 @@ private:
/**
* The interface including the relevant context class.
*/
- interface<Iface, Encoding, InterfaceCtxT> cl_interface_;
+ interface<Iface, Encoding, rmt::Sycl, InterfaceCtxT> cl_interface_;
/**
* Basic storage for response data.
*/
- impl::rpc_id_map_helper<Iface, Encoding> storage_;
+ impl::rpc_id_map_helper<Iface, Encoding, rmt::Sycl> storage_;
public:
- rpc_server(interface<Iface, Encoding, InterfaceCtxT> cl_iface):
+ rpc_server(interface<Iface, Encoding, rmt::Sycl, InterfaceCtxT> cl_iface):
cmd_queue_{},
cl_interface_{std::move(cl_iface)},
storage_{}
{}
- template<typename IdT>
- remote_data<IdT, Encoding, rmt::Sycl> request_data(id<IdT> dat){
- return {dat, std::get<id_map<IdT, Encoding>>(storage_.maps)};
+ template<typename IdT, typename Storage>
+ remote_data<IdT, Encoding, Storage, rmt::Sycl> request_data(id<IdT> dat){
+ /// @TODO Fix so I can receive data
+ return {dat, std::get<id_map<IdT, Encoding,rmt::Sycl>>(storage_.maps)};
}
/**
@@ -195,23 +201,30 @@ public:
id<
typename schema_member_type<Name, Iface>::type::ResponseT
>
- > call(data_or_id<typename schema_member_type<Name, Iface>::type::RequestT, ClientAllocation> input){
+ > call(data_or_id<typename schema_member_type<Name, Iface>::type::RequestT, Encoding, ClientAllocation> input){
+ using FuncT = typename schema_member_type<Name, Iface>::type;
/**
+ * Object needed if and only if the provided data type is not an id
+ */
+ own<data<typename FuncT::RequestT, Encoding, rmt::Sycl>> dev_tmp_inp = nullptr;
+ /**
* First check if it's data or an id.
* If it's an id, check if it's registered within the storage and retrieve it.
*/
- auto eoinp = [&,this]() -> error_or<data<typename schema_member_type<Name, Iface>::type::RequestT, Encoding>* > {
+ auto eoinp = [&,this]() -> error_or<data<typename FuncT::RequestT, Encoding, rmt::Sycl>* > {
if(input.is_id()){
// storage_.maps
- auto& inner_map = std::get<id_map<typename schema_member_type<Name, Iface>::type::RequestT, Encoding >> (storage_.maps);
+ auto& inner_map = std::get<id_map<typename FuncT::RequestT, Encoding, rmt::Sycl>> (storage_.maps);
auto eov = inner_map.find(input.get_id());
if(eov.is_error()){
return std::move(eov.get_error());
}
return eov.get_value();
} else {
- return &input.get_data();
+ auto& client_data = input.get_data();
+ dev_tmp_inp = heap<data<typename FuncT::RequestT, Encoding, rmt::Sycl>>(client_data, cmd_queue_);
+ return dev_tmp_inp.get();
}
}();
if(eoinp.is_error()){
@@ -219,7 +232,7 @@ public:
}
auto& inp = *(eoinp.get_value());
- auto eod = cl_interface_.template call<Name>(std::move(inp), &cmd_queue_);
+ auto eod = cl_interface_.template call<Name>(inp, &cmd_queue_);
if(eod.is_error()){
return std::move(eod.get_error());
@@ -229,7 +242,7 @@ public:
* Store returned data in rpc storage
*/
auto& val = eod.get_value();
- auto& inner_map = std::get<id_map<typename schema_member_type<Name, Iface>::type::RequestT, Encoding >> (storage_.maps);
+ auto& inner_map = std::get<id_map<typename schema_member_type<Name, Iface>::type::RequestT, Encoding,rmt::Sycl>> (storage_.maps);
auto eoid = inner_map.insert(std::move(val));
if(eoid.is_error()){
return std::move(eoid.get_error());
diff --git a/modules/remote-sycl/examples/sycl_basic.cpp b/modules/remote-sycl/examples/sycl_basic.cpp
index 41aa2a1..677fd29 100644
--- a/modules/remote-sycl/examples/sycl_basic.cpp
+++ b/modules/remote-sycl/examples/sycl_basic.cpp
@@ -23,7 +23,7 @@ int main(){
saw::id<schema::Array<schema::UInt64>> next_id{0u};
{
- auto eov = rpc_server.template call<"increment">(saw::data<schema::Array<schema::UInt64>, saw::encode::Native<saw::rmt::Sycl>>{1u});
+ auto eov = rpc_server.template call<"increment", saw::storage::Default>(saw::data<schema::Array<schema::UInt64>, saw::encode::Native>{1u});
if(eov.is_error()){
auto& err = eov.get_error();
std::cerr<<"Error: "<<err.get_category()<<" : "<<err.get_message()<<std::endl;
@@ -32,7 +32,7 @@ int main(){
next_id = eov.get_value();
}
{
- auto eov = rpc_server.template call<"increment">(next_id);
+ auto eov = rpc_server.template call<"increment", saw::storage::Default>(next_id);
if(eov.is_error()){
auto& err = eov.get_error();
std::cerr<<"Error: "<<err.get_category()<<" : "<<err.get_message()<<std::endl;
diff --git a/modules/remote-sycl/examples/sycl_basic.hpp b/modules/remote-sycl/examples/sycl_basic.hpp
index c7cfadc..6932184 100644
--- a/modules/remote-sycl/examples/sycl_basic.hpp
+++ b/modules/remote-sycl/examples/sycl_basic.hpp
@@ -6,8 +6,8 @@ namespace schema {
using namespace saw::schema;
using BasicInterface = Interface<
- Member<Function<Array<UInt64>, UInt64>, "increment">
+ Member<Function<Array<UInt64>, Array<UInt64>>, "increment">
>;
}
-saw::rpc_server<schema::BasicInterface, saw::encode::Native<saw::rmt::Sycl>, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::remote_address<saw::rmt::Sycl>& addr);
+saw::rpc_server<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::remote_address<saw::rmt::Sycl>& addr);
diff --git a/modules/remote-sycl/examples/sycl_basic_kernel.cpp b/modules/remote-sycl/examples/sycl_basic_kernel.cpp
index 86e73b5..94583b9 100644
--- a/modules/remote-sycl/examples/sycl_basic_kernel.cpp
+++ b/modules/remote-sycl/examples/sycl_basic_kernel.cpp
@@ -1,22 +1,20 @@
#include "sycl_basic.hpp"
-saw::rpc_server<schema::BasicInterface, saw::encode::Native<saw::rmt::Sycl>, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::remote_address<saw::rmt::Sycl>& addr){
- saw::interface<schema::BasicInterface, saw::encode::Native<saw::rmt::Sycl>, cl::sycl::queue*> iface{
- [](saw::data<saw::schema::Array<saw::schema::UInt64>, saw::encode::Native<saw::rmt::Sycl>> in, cl::sycl::queue* q) -> saw::data<saw::schema::UInt64, saw::encode::Native<saw::rmt::Sycl>> {
- uint64_t inr = in.size();
- cl::sycl::buffer<uint64_t,1> d_inc{ &inr, 1u };
- q->submit([&](cl::sycl::handler& h){
- auto a_inc = d_inc.get_access<cl::sycl::access::mode::read_write>(h);
+saw::rpc_server<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::remote_address<saw::rmt::Sycl>& addr){
+ saw::interface<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl, cl::sycl::queue*> iface{
+
+ [](saw::data<saw::schema::Array<saw::schema::UInt64>, saw::encode::Native, saw::rmt::Sycl> in, cl::sycl::queue* q) -> saw::data<saw::schema::Array<saw::schema::UInt64>, saw::encode::Native, saw::rmt::Sycl> {
- h.parallel_for(cl::sycl::range<1>(1u), [=] (cl::sycl::id<1> it){
- a_inc[0] += 1u;
+ q->submit([&](cl::sycl::handler& h){
+ h.parallel_for(cl::sycl::range<1>(1u), [&] (cl::sycl::id<1> it){
+ in.at(0u) += 1u;
});
});
q->wait();
- return {inr};
+ return in;
}
};
- auto rpc_server = ctx.template listen<schema::BasicInterface, saw::encode::Native<saw::rmt::Sycl>>(addr, std::move(iface));
+ auto rpc_server = ctx.template listen<schema::BasicInterface, saw::encode::Native>(addr, std::move(iface));
return rpc_server;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-17 04:49:29 +0000