wip

2 files changed, 14 insertions, 11 deletions

diff --git a/modules/remote-sycl/tests/data.cpp b/modules/remote-sycl/tests/data.cpp
index de09c92..027f277 100644
--- a/modules/remote-sycl/tests/data.cpp
+++ b/modules/remote-sycl/tests/data.cpp
@@ -1,5 +1,6 @@
 #include <forstio/test/suite.hpp>
 
+#include "../c++/transfer.hpp"
 #include "../c++/remote.hpp"
 
 namespace {
@@ -41,10 +42,10 @@ SAW_TEST("SYCL Data Management"){
 	wait.poll();
 	SAW_EXPECT(rmt_addr, "Remote address hasn't been filled");
 
-	auto device = rmt_addr->copy_device_reference();
-
-	auto data_srv = data_server<tmpl_group<schema::TestStruct>, encode::Native, rmt::Sycl>{device};
+	auto our_device = share<device<rmt::Sycl>>();
+	auto& device = *our_device;
 
+	auto data_srv = data_server<tmpl_group<schema::TestStruct>, encode::Native, rmt::Sycl>{our_device};
 	auto data_cl = data_client<tmpl_group<schema::TestStruct>, encode::Native, rmt::Sycl>{data_srv};
 
 	auto eov = data_cl.send(host_data);
diff --git a/modules/remote-sycl/tests/mixed_precision.cpp b/modules/remote-sycl/tests/mixed_precision.cpp
index 5b4b86e..7f5a78d 100644
--- a/modules/remote-sycl/tests/mixed_precision.cpp
+++ b/modules/remote-sycl/tests/mixed_precision.cpp
@@ -1,5 +1,6 @@
 #include <forstio/test/suite.hpp>
 
+#include "../c++/data.hpp"
 #include "../c++/remote.hpp"
 
 #include <random>
@@ -62,12 +63,12 @@ SAW_TEST("SYCL Mixed Test"){
 	wait.poll();
 	SAW_EXPECT(rmt_addr, "Remote address hasn't been filled");
 	
-	data<schema::TestMixedArray, encode::Native, rmt::Sycl> device_data{host_data};
+	data<schema::TestMixedArray, encode::Sycl<encode::Native>> device_data{host_data};
 	
 	cl::sycl::event ev;
 
-	interface<schema::MixedFoo, encode::Native,rmt::Sycl, cl::sycl::queue*> cl_iface {
-[&](data<schema::TestMixedArray, encode::Native, rmt::Sycl>& in, cl::sycl::queue* cmd) -> error_or<void> {
+	interface<schema::MixedFoo, encode::Sycl<encode::Native>, cl::sycl::queue*> cl_iface {
+[&](data<schema::TestMixedArray, encode::Sycl<encode::Native>>& in, cl::sycl::queue* cmd) -> error_or<void> {
 	
 			ev = cmd->submit([&](cl::sycl::handler& h){
 
@@ -80,7 +81,8 @@ SAW_TEST("SYCL Mixed Test"){
 			return saw::void_t{};
 		}
 	};
-	auto& device = rmt_addr->get_device();
+	auto our_device = share<device<rmt::Sycl>>();
+	auto& device = *our_device;
 	
 	cl_iface.template call <"foo">(device_data, &(device.get_handle()));
 	device.get_handle().wait();
@@ -120,12 +122,12 @@ SAW_TEST("SYCL Float Test"){
 	wait.poll();
 	SAW_EXPECT(rmt_addr, "Remote address hasn't been filled");
 	
-	data<schema::TestFloatArray, encode::Native, rmt::Sycl> device_data{host_data};
+	data<schema::TestFloatArray, encode::Sycl<encode::Native>> device_data{host_data};
 
 	cl::sycl::event ev;
 
 	interface<schema::FloatFoo, encode::Native,rmt::Sycl, cl::sycl::queue*> cl_iface {
-[&](data<schema::TestFloatArray, encode::Native, rmt::Sycl>& in, cl::sycl::queue* cmd) -> error_or<void> {
+[&](data<schema::TestFloatArray, encode::Sycl<encode::Native>>& in, cl::sycl::queue* cmd) -> error_or<void> {
 	
 			ev = cmd->submit([&](cl::sycl::handler& h){
 
@@ -178,12 +180,12 @@ SAW_TEST("SYCL Double Test"){
 	wait.poll();
 	SAW_EXPECT(rmt_addr, "Remote address hasn't been filled");
 	
-	data<schema::TestDoubleArray, encode::Native, rmt::Sycl> device_data{host_data};
+	data<schema::TestDoubleArray, encode::Sycl<encode::Native>> device_data{host_data};
 	
 	cl::sycl::event ev;
 
 	interface<schema::DoubleFoo, encode::Native,rmt::Sycl, cl::sycl::queue*> cl_iface {
-[&](data<schema::TestDoubleArray, encode::Native, rmt::Sycl>& in, cl::sycl::queue* cmd) -> error_or<void> {
+[&](data<schema::TestDoubleArray, encode::Sycl<encode::Native>>& in, cl::sycl::queue* cmd) -> error_or<void> {
 	
 			ev = cmd->submit([&](cl::sycl::handler& h){