Moved device to a internal class which will be supposed to be discoverable

2 files changed, 3 insertions, 4 deletions

diff --git a/modules/remote-sycl/tests/data.cpp b/modules/remote-sycl/tests/data.cpp
index dff19fb..de09c92 100644
--- a/modules/remote-sycl/tests/data.cpp
+++ b/modules/remote-sycl/tests/data.cpp
@@ -41,7 +41,7 @@ SAW_TEST("SYCL Data Management"){
 	wait.poll();
 	SAW_EXPECT(rmt_addr, "Remote address hasn't been filled");
 
-	auto device = rmt.connect_device(*rmt_addr);
+	auto device = rmt_addr->copy_device_reference();
 
 	auto data_srv = data_server<tmpl_group<schema::TestStruct>, encode::Native, rmt::Sycl>{device};
 
diff --git a/modules/remote-sycl/tests/sycl_basics.cpp b/modules/remote-sycl/tests/sycl_basics.cpp
index 90da299..61e0d87 100644
--- a/modules/remote-sycl/tests/sycl_basics.cpp
+++ b/modules/remote-sycl/tests/sycl_basics.cpp
@@ -46,8 +46,6 @@ SAW_TEST("SYCL Test Setup"){
 	wait.poll();
 	SAW_EXPECT(rmt_addr, "Remote Address class hasn't been filled");
 
-	auto device = rmt.connect_device(*rmt_addr);
-
 	data<schema::TestStruct, encode::Native, rmt::Sycl> device_data{host_data};
 
 	interface<schema::Foo, encode::Native,rmt::Sycl, cl::sycl::queue*> cl_iface {
@@ -80,8 +78,9 @@ SAW_TEST("SYCL Test Setup"){
 			return saw::void_t{};
 		}
 	};
+	auto& device = rmt_addr->get_device();
 	
-	cl_iface.template call <"foo">(device_data, &device.get_handle());
+	cl_iface.template call <"foo">(device_data, &(device.get_handle()));
 	device.get_handle().wait();
 }
 }