From 1fb10980808d66dfa6dec4ac87857d5c13bf7298 Mon Sep 17 00:00:00 2001
From: Claudius 'keldu' Holeksa <mail@keldu.de>
Date: Thu, 22 Aug 2024 11:45:47 +0200
Subject: Removing storage as a parameter

---
 modules/remote-sycl/c++/device.hpp          |  2 +-
 modules/remote-sycl/c++/rpc.hpp             | 10 +++++-----
 modules/remote-sycl/c++/transfer.hpp        |  2 +-
 modules/remote-sycl/examples/sycl_basic.cpp |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'modules/remote-sycl')

diff --git a/modules/remote-sycl/c++/device.hpp b/modules/remote-sycl/c++/device.hpp
index 6d4dbbf..a050078 100644
--- a/modules/remote-sycl/c++/device.hpp
+++ b/modules/remote-sycl/c++/device.hpp
@@ -37,7 +37,7 @@ public:
 	template<typename Schema, typename Encoding>
 	error_or<data<Schema, Encoding>> copy_to_host(data<Schema, encode::Sycl<Encoding>>& dev_data){
 		/**
-		data<Schema,Encoding, Storage> host_data;
+		data<Schema,Encoding> host_data;
 		cmd_queue_.submit([&](cl::sycl::handler& h){
 			auto acc_buff = dev_data.template access<cl::sycl::access::mode::read>(h);
 			h.copy(acc_buff, &host_data);
diff --git a/modules/remote-sycl/c++/rpc.hpp b/modules/remote-sycl/c++/rpc.hpp
index da2eeaa..8cb4d8d 100644
--- a/modules/remote-sycl/c++/rpc.hpp
+++ b/modules/remote-sycl/c++/rpc.hpp
@@ -48,14 +48,14 @@ public:
 	/**
 	 * Wait for the data
 	 */
-	error_or<data<T,Encoding,Storage>> wait(){
+	error_or<data<T,Encoding>> wait(){
 		return make_error<err::not_implemented>();
 	}
 
 	/**
 	 * Request data asynchronously
 	 */
-	// conveyor<data<T,Encoding,Storage>> on_receive(); /// Stopped here
+	// conveyor<data<T,Encoding>> on_receive(); /// Stopped here
 };
 
 /**
@@ -151,7 +151,7 @@ public:
 		>
 	> call(const data_or_id<typename schema_member_type<Name, Iface>::type::RequestT, Encoding>& input){
 		auto next_free_id = srv_->template next_free_id<typename schema_member_type<Name, Iface>::type::ResponseT>();
-		return srv_->template call<Name, Storage>(input, next_free_id);
+		return srv_->template call<Name>(input, next_free_id);
 	}
 
 };
@@ -180,7 +180,7 @@ private:
 	/**
 	 * The interface including the relevant context class.
 	 */
-	interface<Iface, Encoding, storage::Default, InterfaceCtxT> cl_interface_;
+	interface<Iface, Encoding, InterfaceCtxT> cl_interface_;
 
 public:
 
@@ -205,7 +205,7 @@ public:
 
 	/**
 	template<typename IdT, typename Storage>
-	remote_data<IdT, Encoding, Storage, rmt::Sycl> request_data(id<IdT> dat_id){
+	remote_data<IdT, Encoding, rmt::Sycl> request_data(id<IdT> dat_id){
 		return {dat_id, std::get<id_map<IdT,Encoding,rmt::Sycl>>(storage_.maps), device_->get_handle()};
 	}
 	*/
diff --git a/modules/remote-sycl/c++/transfer.hpp b/modules/remote-sycl/c++/transfer.hpp
index e39165b..b6a21f0 100644
--- a/modules/remote-sycl/c++/transfer.hpp
+++ b/modules/remote-sycl/c++/transfer.hpp
@@ -131,7 +131,7 @@ public:
 	 * Requests data from the server
 	 */
 	template<typename Sch>
-	error_or<data<Sch, Encoding, storage::Default>> receive(id<Sch> store_id){
+	error_or<data<Sch, Encoding>> receive(id<Sch> store_id){
 		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,encode::Sycl<Encoding>>>>(values_);
 		auto find_res = vals.find(store_id.get_value());
 		if(find_res == vals.end()){
diff --git a/modules/remote-sycl/examples/sycl_basic.cpp b/modules/remote-sycl/examples/sycl_basic.cpp
index bc4d997..a4bc595 100644
--- a/modules/remote-sycl/examples/sycl_basic.cpp
+++ b/modules/remote-sycl/examples/sycl_basic.cpp
@@ -21,7 +21,7 @@ int main(){
 	auto device = remote_ctx.connect_device(*rmt_addr);
 
 	auto rpc_server = listen_basic_sycl(remote_ctx, device, *rmt_addr);
-	saw::rpc_client<schema::BasicInterface, saw::encode::Native, saw::storage::Default, saw::rmt::Sycl> client{rpc_server};
+	saw::rpc_client<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> client{rpc_server};
 
 	saw::id<schema::Array<schema::UInt64>> id_zero{0u};
 	saw::data<schema::Array<schema::UInt64>, saw::encode::Native> ex_data{1u};
@@ -38,7 +38,7 @@ int main(){
 		id_zero = eov.get_value();
 	}
 	{
-		auto rmt_data = rpc_server.request_data<schema::Array<schema::UInt64>, saw::storage::Default>(id_zero);
+		auto rmt_data = rpc_server.request_data<schema::Array<schema::UInt64>>(id_zero);
 		auto eo_rd = rmt_data.wait();
 		if(eo_rd.is_error()){
 			auto& err = eo_rd.get_error();
@@ -64,7 +64,7 @@ int main(){
 		id_one = eov.get_value();
 	}
 	{
-		auto rmt_data = rpc_server.request_data<schema::Array<schema::UInt64>, saw::storage::Default>(id_one);
+		auto rmt_data = rpc_server.request_data<schema::Array<schema::UInt64>>(id_one);
 		auto eo_rd = rmt_data.wait();
 		if(eo_rd.is_error()){
 			auto& err = eo_rd.get_error();
-- 
cgit v1.2.3