Working on reference types in std::function deduction

3 files changed, 13 insertions, 15 deletions

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;
 }