From 4fdfa202eef2419a9f043cd45a3075d6b5e3063f Mon Sep 17 00:00:00 2001
From: Claudius 'keldu' Holeksa <mail@keldu.de>
Date: Wed, 21 Aug 2024 18:01:16 +0200
Subject: Pulling out Storage template

---
 modules/remote-sycl/c++/rpc.hpp      |  4 ++--
 modules/remote-sycl/c++/transfer.hpp | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'modules/remote-sycl/c++')

diff --git a/modules/remote-sycl/c++/rpc.hpp b/modules/remote-sycl/c++/rpc.hpp
index 65e2df5..da2eeaa 100644
--- a/modules/remote-sycl/c++/rpc.hpp
+++ b/modules/remote-sycl/c++/rpc.hpp
@@ -10,8 +10,8 @@ namespace saw {
 /**
  * Remote data class for the Sycl backend.
  */
-template<typename T, typename Encoding, typename Storage>
-class remote_data<T, Encoding, Storage, rmt::Sycl> final {
+template<typename T, typename Encoding>
+class remote_data<T, Encoding, rmt::Sycl> final {
 private:
 	/**
 	 * An identifier to the data being held on the remote
diff --git a/modules/remote-sycl/c++/transfer.hpp b/modules/remote-sycl/c++/transfer.hpp
index a7f1b53..e39165b 100644
--- a/modules/remote-sycl/c++/transfer.hpp
+++ b/modules/remote-sycl/c++/transfer.hpp
@@ -88,9 +88,9 @@ public:
 	 * Get data which we will store.
 	 */
 	template<typename Sch>
-	error_or<void> send(const data<Sch, Encoding, storage::Default>& dat, id<Sch> store_id){
+	error_or<void> send(const data<Sch, Encoding>& dat, id<Sch> store_id){
 		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding,rmt::Sycl>>>(values_);
-		auto eoval = device_->template copy_to_device<Sch, Encoding, storage::Default>(dat);
+		auto eoval = device_->template copy_to_device<Sch, Encoding>(dat);
 		if(eoval.is_error()){
 			auto& err = eoval.get_error();
 			return std::move(err);
@@ -108,9 +108,9 @@ public:
 	}
 
 	template<typename Sch>
-	error_or<void> allocate(const data<typename meta_schema<Sch>::MetaSchema, Encoding, storage::Default>& dat, id<Sch> store_id){
-		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding,rmt::Sycl>>>(values_);
-		auto eoval = device_->template allocate_on_device<Sch, Encoding, storage::Default>(dat);
+	error_or<void> allocate(const data<typename meta_schema<Sch>::MetaSchema, Encoding>& dat, id<Sch> store_id){
+		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,encode::Sycl<Encoding>>>>(values_);
+		auto eoval = device_->template allocate_on_device<Sch, Encoding>(dat);
 		if(eoval.is_error()){
 			auto& err = eoval.get_error();
 			return std::move(err);
@@ -132,14 +132,14 @@ public:
 	 */
 	template<typename Sch>
 	error_or<data<Sch, Encoding, storage::Default>> receive(id<Sch> store_id){
-		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding,rmt::Sycl>>>(values_);
+		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()){
 			return make_error<err::not_found>();
 		}
 		auto& dat = find_res->second;
 
-		auto eoval = device_->template copy_to_host<Sch, Encoding, storage::Default>(dat);
+		auto eoval = device_->template copy_to_host<Sch, Encoding>(dat);
 		return eoval;
 	}
 
@@ -148,7 +148,7 @@ public:
 	 */
 	template<typename Sch>
 	error_or<void> erase(id<Sch> store_id){
-		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding,rmt::Sycl>>>(values_);
+		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding>>>(values_);
 		auto erase_op = vals.erase(store_id.get_value());
 		if(erase_op == 0u){
 			return make_error<err::not_found>();
@@ -161,8 +161,8 @@ public:
 	 * Insert operations may invalidate the pointer.
 	 */
 	template<typename Sch>
-	error_or<data<Sch, Encoding, rmt::Sycl>*> find(id<Sch> store_id){
-		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding,rmt::Sycl>>>(values_);
+	error_or<data<Sch, encode::Sycl<Encoding>>*> find(id<Sch> store_id){
+		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding>>>(values_);
 		auto find_res = vals.find(store_id.get_value());
 		if(find_res == vals.end()){
 			return make_error<err::not_found>();
@@ -200,7 +200,7 @@ public:
 	 * Send data to the remote.
 	 */
 	template<typename Sch>
-	error_or<id<Sch>> send(const data<Sch, Encoding, storage::Default>& dat){
+	error_or<id<Sch>> send(const data<Sch, Encoding>& dat){
 		id<Sch> dat_id{next_id_};
 		auto eov = srv_->send(dat, dat_id);
 		if(eov.is_error()){
@@ -216,7 +216,7 @@ public:
 	 * Receive data
 	 */
 	template<typename Sch>
-	conveyor<data<Sch, Encoding, storage::Default>> receive(id<Sch> dat_id){
+	conveyor<data<Sch, Encoding>> receive(id<Sch> dat_id){
 		auto eov = srv_->receive(dat_id);
 		if(eov.is_error()){
 			auto& err = eov.get_error();
-- 
cgit v1.2.3