From 80b706332a48f54ae289093ee11b17f20ab2dc2e Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 18 Jun 2024 16:35:39 +0200
Subject: Changed some setup designs

---
 modules/remote-sycl/examples/sycl_basic.cpp        | 4 +++-
 modules/remote-sycl/examples/sycl_basic.hpp        | 2 +-
 modules/remote-sycl/examples/sycl_basic_kernel.cpp | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules/remote-sycl/examples')

diff --git a/modules/remote-sycl/examples/sycl_basic.cpp b/modules/remote-sycl/examples/sycl_basic.cpp
index 486aca1..bc4d997 100644
--- a/modules/remote-sycl/examples/sycl_basic.cpp
+++ b/modules/remote-sycl/examples/sycl_basic.cpp
@@ -18,7 +18,9 @@ int main(){
 		return -1;
 	}
 
-	auto rpc_server = listen_basic_sycl(remote_ctx, *rmt_addr);
+	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::id<schema::Array<schema::UInt64>> id_zero{0u};
diff --git a/modules/remote-sycl/examples/sycl_basic.hpp b/modules/remote-sycl/examples/sycl_basic.hpp
index 6932184..b250d8c 100644
--- a/modules/remote-sycl/examples/sycl_basic.hpp
+++ b/modules/remote-sycl/examples/sycl_basic.hpp
@@ -10,4 +10,4 @@ using BasicInterface = Interface<
 >;
 }
 
-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::rpc_server<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::device<saw::rmt::Sycl>& dev, 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 03f0bac..6481eb9 100644
--- a/modules/remote-sycl/examples/sycl_basic_kernel.cpp
+++ b/modules/remote-sycl/examples/sycl_basic_kernel.cpp
@@ -1,6 +1,6 @@
 #include "sycl_basic.hpp"
 
-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::rpc_server<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> listen_basic_sycl(saw::remote<saw::rmt::Sycl>& ctx, saw::device<saw::rmt::Sycl>& dev, 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> {
@@ -13,7 +13,7 @@ saw::rpc_server<schema::BasicInterface, saw::encode::Native, saw::rmt::Sycl> lis
 			return in;
 		}
 	};
-	auto rpc_server = ctx.template listen<schema::BasicInterface, saw::encode::Native>(addr, std::move(iface));
+	auto rpc_server = ctx.template listen<schema::BasicInterface, saw::encode::Native>(dev, std::move(iface));
 	
 	return rpc_server;
 }
-- 
cgit v1.2.3